diff -u xfonts-artwiz-1.3/debian/control xfonts-artwiz-1.3/debian/control --- xfonts-artwiz-1.3/debian/control +++ xfonts-artwiz-1.3/debian/control @@ -1,13 +1,14 @@ Source: xfonts-artwiz Section: x11 Priority: optional -Maintainer: A Lee -Build-Depends-Indep: debhelper (>> 3.0.0), xutils, bzip2 -Standards-Version: 3.6.1 +Maintainer: Debian QA Group +Build-Depends: debhelper (>> 5.0.31) +Build-Depends-Indep: xutils, bzip2 +Standards-Version: 3.6.2 Package: xfonts-artwiz Architecture: all -Depends: xutils (>> 4.0.3) +Depends: x11-common, ${misc:Depends} Suggests: artwiz-cursor, xserver | xfs Conflicts: xfonts-gimpers, artwiz-cursor (<= 2.7) Replaces: xfonts-gimpers @@ -38,7 +39,7 @@ Package: artwiz-cursor Architecture: all -Depends: xutils (>> 4.0.3) +Depends: x11-common, ${misc:Depends} Suggests: xfonts-artwiz, xserver | xfs Conflicts: big-cursor, xfonts-artwiz (<< 2.0) Description: artwiz futuristic mouse cursor for x11 diff -u xfonts-artwiz-1.3/debian/rules xfonts-artwiz-1.3/debian/rules --- xfonts-artwiz-1.3/debian/rules +++ xfonts-artwiz-1.3/debian/rules @@ -1,5 +1,5 @@ #!/usr/bin/make -f -export DH_COMPAT=3 +export DH_COMPAT=5 build: dh_testdir @@ -15,40 +15,40 @@ dh_testroot dh_clean -k dh_installdirs - install -m644 debian/xfonts-artwiz.lintian $(CURDIR)/debian/xfonts-artwiz/usr/share/lintian/overrides/xfonts-artwiz - install -m644 debian/artwiz-cursor.lintian $(CURDIR)/debian/artwiz-cursor/usr/share/lintian/overrides/artwiz-cursor + #install -m644 debian/xfonts-artwiz.lintian $(CURDIR)/debian/xfonts-artwiz/usr/share/lintian/overrides/xfonts-artwiz + #install -m644 debian/artwiz-cursor.lintian $(CURDIR)/debian/artwiz-cursor/usr/share/lintian/overrides/artwiz-cursor 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 diff -u xfonts-artwiz-1.3/debian/artwiz-cursor.postrm xfonts-artwiz-1.3/debian/artwiz-cursor.postrm --- xfonts-artwiz-1.3/debian/artwiz-cursor.postrm +++ xfonts-artwiz-1.3/debian/artwiz-cursor.postrm @@ -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 -u xfonts-artwiz-1.3/debian/changelog xfonts-artwiz-1.3/debian/changelog --- xfonts-artwiz-1.3/debian/changelog +++ xfonts-artwiz-1.3/debian/changelog @@ -1,8 +1,34 @@ -xfonts-artwiz (1:1.3-2malc1) precise; urgency=medium +xfonts-artwiz (1:1.3-5malc1) precise; urgency=medium - * Revive long-dead package from Debian Sarge + * Revive abandoned package from Ubuntu Gutsy - -- Malcolm Scott Sat, 26 Jan 2013 16:36:49 +0000 + -- Malcolm Scott Sat, 26 Jan 2013 16:49:44 +0000 + +xfonts-artwiz (1:1.3-5) unstable; urgency=low + + * QA Upload + * fix path for diversion in preinst/postrm + * remove obsolete debian/*.lintian + + -- Michael Ablassmeier Thu, 27 Apr 2006 09:18:44 +0200 + +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. + + -- Michael Ablassmeier Wed, 26 Apr 2006 15:21:01 +0200 + +xfonts-artwiz (1:1.3-3) unstable; urgency=low + + * QA Group upload orphaning this package + * debian/artwiz.preinst: removed bashism + * debian/rules: bumped DH_COMPAT to 4 + + -- Andrew Pollock Mon, 6 Mar 2006 19:29:31 -0800 xfonts-artwiz (1:1.3-2) unstable; urgency=low diff -u xfonts-artwiz-1.3/debian/xfonts-artwiz.dirs xfonts-artwiz-1.3/debian/xfonts-artwiz.dirs --- xfonts-artwiz-1.3/debian/xfonts-artwiz.dirs +++ xfonts-artwiz-1.3/debian/xfonts-artwiz.dirs @@ -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 -u xfonts-artwiz-1.3/debian/artwiz-cursor.preinst xfonts-artwiz-1.3/debian/artwiz-cursor.preinst --- xfonts-artwiz-1.3/debian/artwiz-cursor.preinst +++ xfonts-artwiz-1.3/debian/artwiz-cursor.preinst @@ -5,10 +5,10 @@ # instead. This has to happen before update-font-dir, which is why it's in # the preinst here; if this package and xfonts-base are installed at the # same time, it needs to run before that package is unpacked. -if [ "$1" = install -o "$1" = upgrade ]; then +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 reverted: --- xfonts-artwiz-1.3/debian/artwiz-cursor.lintian +++ xfonts-artwiz-1.3.orig/debian/artwiz-cursor.lintian @@ -1,3 +0,0 @@ -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/ diff -u xfonts-artwiz-1.3/debian/artwiz-cursor.dirs xfonts-artwiz-1.3/debian/artwiz-cursor.dirs --- xfonts-artwiz-1.3/debian/artwiz-cursor.dirs +++ xfonts-artwiz-1.3/debian/artwiz-cursor.dirs @@ -1,3 +1,2 @@ -usr/X11R6/lib/X11/fonts/misc/ +/usr/share/fonts/X11/misc/ usr/share/lintian/overrides/ -etc/X11/fonts/misc/ reverted: --- xfonts-artwiz-1.3/debian/xfonts-artwiz.lintian +++ xfonts-artwiz-1.3.orig/debian/xfonts-artwiz.lintian @@ -1,3 +0,0 @@ -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/