[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#362788: marked as done (Patch for Xorg 7)

Your message dated Wed, 26 Apr 2006 07:47:03 -0700
with message-id <E1FYlIF-0005K0-IB@spohr.debian.org>
and subject line Bug#362788: fixed in xfonts-artwiz 1:1.3-4
has caused the attached Bug report to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what I am
talking about this indicates a serious mail system misconfiguration
somewhere.  Please contact me immediately.)

Debian bug tracking system administrator
(administrator, Debian Bugs database)
--- Begin Message --- 
Package: xfonts-artwiz
Version: 1:1.3-3
Patch:

Here is a patch for compatibily with Xorg 7. 

Xfonts-artwiz now depends on x11-common and xfonts-utils (like
xfonts-base). And I move some files from : 
- /usr/X11R6/lib/X11/fonts/misc to/usr/share/fonts/X11/misc 

- /etc/X11/fonts/misc to /etc/X11/fonts/X11R7/misc.


-- 
JASKULA Jean-Christophe ( jean.christophe.jaskula@wanadoo.fr )

diff -ur xfonts-artwiz-1.3/debian/artwiz-cursor.dirs xfonts-artwiz-1.3-4/debian/artwiz-cursor.dirs
--- xfonts-artwiz-1.3/debian/artwiz-cursor.dirs	2006-04-15 16:42:33.000000000 +0200
+++ xfonts-artwiz-1.3-4/debian/artwiz-cursor.dirs	2006-04-15 14:34:27.000000000 +0200
@@ -1,3 +1,3 @@
-usr/X11R6/lib/X11/fonts/misc/
+usr/share/fonts/X11/misc/
 usr/share/lintian/overrides/
-etc/X11/fonts/misc/
+etc/X11/fonts/X11R7/misc/
diff -ur xfonts-artwiz-1.3/debian/artwiz-cursor.lintian xfonts-artwiz-1.3-4/debian/artwiz-cursor.lintian
--- xfonts-artwiz-1.3/debian/artwiz-cursor.lintian	2006-04-15 16:42:33.000000000 +0200
+++ xfonts-artwiz-1.3-4/debian/artwiz-cursor.lintian	2006-04-15 15:11:08.000000000 +0200
@@ -1,3 +1 @@
-artwiz-cursor: packages-installs-file-to-usr-x11r6 usr/X11R6/
-artwiz-cursor: packages-installs-file-to-usr-x11r6 usr/X11R6/lib/
-artwiz-cursor: packages-installs-file-to-usr-x11r6 usr/X11R6/lib/X11/
+artwiz-cursor: package-depends-on-an-x-font-package depends: xfonts-utils
\ No newline at end of file
diff -ur xfonts-artwiz-1.3/debian/artwiz-cursor.postrm xfonts-artwiz-1.3-4/debian/artwiz-cursor.postrm
--- xfonts-artwiz-1.3/debian/artwiz-cursor.postrm	2006-04-15 16:42:33.000000000 +0200
+++ xfonts-artwiz-1.3-4/debian/artwiz-cursor.postrm	2006-04-15 14:38:04.000000000 +0200
@@ -4,8 +4,8 @@
 # Divert the regular cursor back into place now that our version is gone.
 if [ "$1" = remove ]; then
 	dpkg-divert --package artwiz-cursor --remove --rename --divert \
-		/usr/X11R6/lib/X11/fonts/misc/cursor.pcf.gz-artwiz \
-		/usr/X11R6/lib/X11/fonts/misc/cursor.pcf.gz 
+		/usr/share/fonts/X11/misc/cursor.pcf.gz-artwiz \
+		/usr/share/fonts/X11/misc/cursor.pcf.gz 
 fi
 		
 #DEBHELPER#
diff -ur xfonts-artwiz-1.3/debian/artwiz-cursor.preinst xfonts-artwiz-1.3-4/debian/artwiz-cursor.preinst
--- xfonts-artwiz-1.3/debian/artwiz-cursor.preinst	2006-04-15 16:42:33.000000000 +0200
+++ xfonts-artwiz-1.3-4/debian/artwiz-cursor.preinst	2006-04-15 14:39:18.000000000 +0200
@@ -7,8 +7,8 @@
 # same time, it needs to run before that package is unpacked.
 if [ "$1" = install ] || [ "$1" = upgrade ]; then
 	dpkg-divert --package artwiz-cursor --add --rename --divert \
-		/usr/X11R6/lib/X11/fonts/misc/cursor.pcf.gz-artwiz \
-		/usr/X11R6/lib/X11/fonts/misc/cursor.pcf.gz 
+		/usr/share/fonts/X11/misc/cursor.pcf.gz-artwiz \
+		/usr/share/fonts/X11/misc/cursor.pcf.gz 
 
 	update-alternatives --set x-cursor-theme /etc/X11/cursors/core.theme
 fi
diff -ur xfonts-artwiz-1.3/debian/changelog xfonts-artwiz-1.3-4/debian/changelog
--- xfonts-artwiz-1.3/debian/changelog	2006-04-15 16:42:33.000000000 +0200
+++ xfonts-artwiz-1.3-4/debian/changelog	2006-04-15 15:18:53.000000000 +0200
@@ -1,3 +1,11 @@
+xfonts-artwiz (1:1.3-4) unstable; urgency=low
+
+  * First modular upload to Debian
+  * Add xfonts-utils to b-d and remove xutils from b-d.
+  * Move fonts to /usr/share/fonts/X11/misc
+
+ -- Jean-Christophe Jaskula <jean.christophe.jaskula@wanadoo.fr>  Sat,  15 Apr 2006 15:03:05 +0200
+
 xfonts-artwiz (1:1.3-3) unstable; urgency=low
 
   * QA Group upload orphaning this package
diff -ur xfonts-artwiz-1.3/debian/control xfonts-artwiz-1.3-4/debian/control
--- xfonts-artwiz-1.3/debian/control	2006-04-15 16:42:33.000000000 +0200
+++ xfonts-artwiz-1.3-4/debian/control	2006-04-15 16:46:57.000000000 +0200
@@ -2,12 +2,12 @@
 Section: x11
 Priority: optional
 Maintainer: Debian QA Group <packages@qa.debian.org>
-Build-Depends-Indep: debhelper (>> 3.0.0), xutils, bzip2
+Build-Depends-Indep: debhelper (>> 3.0.0), xfonts-utils, bzip2
 Standards-Version: 3.6.1
 
 Package: xfonts-artwiz
 Architecture: all
-Depends: xutils (>> 4.0.3)
+Depends: x11-common, xfonts-utils
 Suggests: artwiz-cursor, xserver | xfs
 Conflicts: xfonts-gimpers, artwiz-cursor (<= 2.7)
 Replaces: xfonts-gimpers
@@ -38,7 +38,7 @@
 
 Package: artwiz-cursor
 Architecture: all
-Depends: xutils (>> 4.0.3)
+Depends: x11-common, xfonts-utils
 Suggests: xfonts-artwiz, xserver | xfs
 Conflicts: big-cursor, xfonts-artwiz (<< 2.0)
 Description: artwiz futuristic mouse cursor for x11
diff -ur xfonts-artwiz-1.3/debian/rules xfonts-artwiz-1.3-4/debian/rules
--- xfonts-artwiz-1.3/debian/rules	2006-04-15 16:42:33.000000000 +0200
+++ xfonts-artwiz-1.3-4/debian/rules	2006-04-15 14:32:09.000000000 +0200
@@ -20,35 +20,35 @@
 	cd $(CURDIR)/upstream && tar -xvjf artwiz_src.tar.bz2 && cd artwiz && \
 	for font in *.bdf; do \
 		bdftopcf $${font} | \
-			gzip > $(CURDIR)/debian/xfonts-artwiz/usr/X11R6/lib/X11/fonts/misc/$${font%.bdf}.pcf.gz; \
+			gzip > $(CURDIR)/debian/xfonts-artwiz/usr/share/fonts/X11/misc/$${font%.bdf}.pcf.gz; \
 	done
 	cd $(CURDIR)/upstream && tar -xvjf artwiz-aleczapka-en-sources-1.3.tar.bz2 && cd artwiz-aleczapka-en-sources-1.3 && \
-	install -m644 fonts.alias $(CURDIR)/debian/xfonts-artwiz/etc/X11/fonts/misc/xfonts-artwiz.alias && \
+	install -m644 fonts.alias $(CURDIR)/debian/xfonts-artwiz/etc/X11/fonts/X11R7/misc/xfonts-artwiz.alias && \
 	for font in *.bdf; do \
 		bdftopcf $${font} | \
-			gzip > $(CURDIR)/debian/xfonts-artwiz/usr/X11R6/lib/X11/fonts/misc/$${font%.bdf}.pcf.gz; \
+			gzip > $(CURDIR)/debian/xfonts-artwiz/usr/share/fonts/X11/misc/$${font%.bdf}.pcf.gz; \
 	done
 	cd $(CURDIR)/upstream && tar -xvjf artwiz-aleczapka-de-sources-1.3.tar.bz2 && cd artwiz-aleczapka-de-sources-1.3 && \
 	for font in *.bdf; do \
 		bdftopcf $${font} | \
-			gzip > $(CURDIR)/debian/xfonts-artwiz/usr/X11R6/lib/X11/fonts/misc/$${font%.bdf}.pcf.gz; \
+			gzip > $(CURDIR)/debian/xfonts-artwiz/usr/share/fonts/X11/misc/$${font%.bdf}.pcf.gz; \
 	done
 	cd $(CURDIR)/upstream && tar -xvjf artwiz-aleczapka-se-sources-1.3.tar.bz2 && cd artwiz-aleczapka-se-sources-1.3 && \
 	for font in *.bdf; do \
 		bdftopcf $${font} | \
-			gzip > $(CURDIR)/debian/xfonts-artwiz/usr/X11R6/lib/X11/fonts/misc/$${font%.bdf}.pcf.gz; \
+			gzip > $(CURDIR)/debian/xfonts-artwiz/usr/share/fonts/X11/misc/$${font%.bdf}.pcf.gz; \
 	done
 	cd $(CURDIR)/upstream && tar -xvjf artwiz_ru_src.tar.bz2 && cd artwiz_ru && \
 	for font in *.bdf; do \
 	    ./ucs2any.pl +d $${font} maps/koi8-r.enc koi8-r > /dev/null 2>&1; \
 	    ./ucs2any.pl +d $${font} maps/cp1251.enc microsoft-cp1251 > /dev/null 2>&1; \
 	    bdftopcf $${font%.bdf}-koi8-r.bdf | \
-			gzip > $(CURDIR)/debian/xfonts-artwiz/usr/X11R6/lib/X11/fonts/misc/$${font%.bdf}-koi8-r.pcf.gz; \
+			gzip > $(CURDIR)/debian/xfonts-artwiz/usr/share/fonts/X11/misc/$${font%.bdf}-koi8-r.pcf.gz; \
 	    bdftopcf $${font%.bdf}-microsoft-cp1251.bdf | \
-			gzip > $(CURDIR)/debian/xfonts-artwiz/usr/X11R6/lib/X11/fonts/misc/$${font%.bdf}-microsoft-cp1251.pcf.gz; \
+			gzip > $(CURDIR)/debian/xfonts-artwiz/usr/share/fonts/X11/misc/$${font%.bdf}-microsoft-cp1251.pcf.gz; \
 	done
-	mv $(CURDIR)/debian/xfonts-artwiz/usr/X11R6/lib/X11/fonts/misc/cursor.pcf.gz \
-		$(CURDIR)/debian/artwiz-cursor/usr/X11R6/lib/X11/fonts/misc/artwiz-cursor.pcf.gz
+	mv $(CURDIR)/debian/xfonts-artwiz/usr/share/fonts/X11/misc/cursor.pcf.gz \
+		$(CURDIR)/debian/artwiz-cursor/usr/share/fonts/X11/misc/artwiz-cursor.pcf.gz
 
 # Build architecture-independent files here.
 binary-indep: build install
Only in xfonts-artwiz-1.3-4/debian: xfonts-artwiz
diff -ur xfonts-artwiz-1.3/debian/xfonts-artwiz.dirs xfonts-artwiz-1.3-4/debian/xfonts-artwiz.dirs
--- xfonts-artwiz-1.3/debian/xfonts-artwiz.dirs	2006-04-15 16:42:33.000000000 +0200
+++ xfonts-artwiz-1.3-4/debian/xfonts-artwiz.dirs	2006-04-15 14:48:15.000000000 +0200
@@ -1,3 +1,3 @@
-usr/X11R6/lib/X11/fonts/misc/
+usr/share/fonts/X11/misc/
 usr/share/lintian/overrides/
-etc/X11/fonts/misc/
+etc/X11/fonts/X11R7/misc/
diff -ur xfonts-artwiz-1.3/debian/xfonts-artwiz.lintian xfonts-artwiz-1.3-4/debian/xfonts-artwiz.lintian
--- xfonts-artwiz-1.3/debian/xfonts-artwiz.lintian	2006-04-15 16:42:33.000000000 +0200
+++ xfonts-artwiz-1.3-4/debian/xfonts-artwiz.lintian	2006-04-15 16:44:04.000000000 +0200
@@ -1,3 +1 @@
-xfonts-artwiz: packages-installs-file-to-usr-x11r6 usr/X11R6/
-xfonts-artwiz: packages-installs-file-to-usr-x11r6 usr/X11R6/lib/
-xfonts-artwiz: packages-installs-file-to-usr-x11r6 usr/X11R6/lib/X11/
+xfonts-artwiz: package-depends-on-an-x-font-package depends: xfonts-utils
Only in xfonts-artwiz-1.3-4/debian: xfonts-artwiz.substvars
Only in xfonts-artwiz-1.3-4/upstream: artwiz
Only in xfonts-artwiz-1.3-4/upstream: artwiz-aleczapka-de-sources-1.3
Only in xfonts-artwiz-1.3-4/upstream: artwiz-aleczapka-en-sources-1.3
Only in xfonts-artwiz-1.3-4/upstream: artwiz-aleczapka-se-sources-1.3
Only in xfonts-artwiz-1.3-4/upstream: artwiz_ru

--- End Message ---
--- Begin Message --- 
Source: xfonts-artwiz
Source-Version: 1:1.3-4

We believe that the bug you reported is fixed in the latest version of
xfonts-artwiz, which is due to be installed in the Debian FTP archive:

artwiz-cursor_1.3-4_all.deb
  to pool/main/x/xfonts-artwiz/artwiz-cursor_1.3-4_all.deb
xfonts-artwiz_1.3-4.diff.gz
  to pool/main/x/xfonts-artwiz/xfonts-artwiz_1.3-4.diff.gz
xfonts-artwiz_1.3-4.dsc
  to pool/main/x/xfonts-artwiz/xfonts-artwiz_1.3-4.dsc
xfonts-artwiz_1.3-4_all.deb
  to pool/main/x/xfonts-artwiz/xfonts-artwiz_1.3-4_all.deb



A summary of the changes between this version and the previous one is
attached.

Thank you for reporting the bug, which will now be closed.  If you
have further comments please address them to 362788@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
pp.
Michael Ablassmeier <abi@debian.org> (supplier of updated xfonts-artwiz package)

(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmaster@debian.org)


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Format: 1.7
Date: Wed, 26 Apr 2006 15:21:01 +0200
Source: xfonts-artwiz
Binary: artwiz-cursor xfonts-artwiz
Architecture: source all
Version: 1:1.3-4
Distribution: unstable
Urgency: low
Maintainer: Debian QA Group <packages@qa.debian.org>
Changed-By: Michael Ablassmeier <abi@debian.org>
Description: 
 artwiz-cursor - artwiz futuristic mouse cursor for x11
 xfonts-artwiz - x11 fonts created by Artwiz, TigerT, and Daniel Erat
Closes: 362345 362788
Changes: 
 xfonts-artwiz (1:1.3-4) unstable; urgency=low
 .
   * QA Upload
   * X fonts transition (Closes: #362345, #362788)
     + depend on debhelper >= 5.0.31
     + move debhelper to Build-Depends.
     + add ${misc:Depends} and x11-common to Depends.
Files: 
 d7d5c5331eb5a00783e6ba7c4db3a093 639 x11 optional xfonts-artwiz_1.3-4.dsc
 7e9d73ab8ca59582cf20f84a25845914 3843 x11 optional xfonts-artwiz_1.3-4.diff.gz
 7425e1f0cc13460ef8d07b1b4a55282c 222936 x11 optional xfonts-artwiz_1.3-4_all.deb
 9a1543fe0fcb9edb97a2d59233f8db70 8850 x11 optional artwiz-cursor_1.3-4_all.deb

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.3 (GNU/Linux)

iD8DBQFET4S/EFV7g4B8rCURAgXOAKDAwTw17rjfphinxc6qvg7K+yo5NgCg4+Sc
VReI1mbQhgPl3Pxw59Y72kA=
=c3VE
-----END PGP SIGNATURE-----

--- End Message ---
Reply to: