diff -Nru xfonts-mona-2.90/debian/changelog xfonts-mona-2.90/debian/changelog --- xfonts-mona-2.90/debian/changelog 2012-03-21 02:16:28.000000000 +0000 +++ xfonts-mona-2.90/debian/changelog 2015-11-13 19:10:37.000000000 +0000 @@ -1,3 +1,16 @@ +xfonts-mona (2.90-8) unstable; urgency=medium + + * Update debian/control. + - Bump up Standards-Version to 3.9.6. + - Remove ttf-kochi-gothic from Build-Depends. + * Update debian/rules. + - Add --no-name option to gzip. + Fix package-contains-timestamped-gzip of lintian warning. + * Remove support fonts-mona. (Closes: #804515) + The fonts-mona package will provide by ttf-mona source package. + + -- Nobuhiro Iwamatsu Fri, 13 Nov 2015 14:48:23 +0900 + xfonts-mona (2.90-7) unstable; urgency=low * Update debian/control. diff -Nru xfonts-mona-2.90/debian/control xfonts-mona-2.90/debian/control --- xfonts-mona-2.90/debian/control 2012-03-21 02:04:10.000000000 +0000 +++ xfonts-mona-2.90/debian/control 2015-11-13 05:51:01.000000000 +0000 @@ -3,8 +3,8 @@ Priority: optional Maintainer: Nobuhiro Iwamatsu Build-Depends: debhelper (>= 9) -Build-Depends-Indep: ttf-kochi-gothic, bzip2, xfonts-utils -Standards-Version: 3.9.3 +Build-Depends-Indep: bzip2, xfonts-utils +Standards-Version: 3.9.6 Package: xfonts-mona Architecture: all @@ -12,21 +12,3 @@ Description: Proportional X fonts for 2ch ASCII art These fonts are suitable for some ASCII arts like mona, gikoneko and so on. This package provides BDF (Bitmap Description / Display Format) font. - -Package: fonts-mona -Architecture: all -Depends: ${misc:Depends} -Provides: ttf-japanese-gothic -Conflicts: ttf-mona (<< 2.90-7) -Replaces: ttf-mona (<< 2.90-7) -Description: Japanese TrueType font for 2ch ASCII art - These fonts are suitable for some ASCII arts like mona, gikoneko and so on. - This package provides TrueType font. - -Package: ttf-mona -Depends: fonts-mona, ${misc:Depends} -Architecture: all -Priority: extra -Section: oldlibs -Description: Transitional dummy package - This package is a dummy transitional package. It can be safely removed. diff -Nru xfonts-mona-2.90/debian/fonts-mona.dirs xfonts-mona-2.90/debian/fonts-mona.dirs --- xfonts-mona-2.90/debian/fonts-mona.dirs 2012-03-21 00:26:43.000000000 +0000 +++ xfonts-mona-2.90/debian/fonts-mona.dirs 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -usr/share/fonts/truetype/mona -usr/share/doc/ttf-mona diff -Nru xfonts-mona-2.90/debian/fonts-mona.docs xfonts-mona-2.90/debian/fonts-mona.docs --- xfonts-mona-2.90/debian/fonts-mona.docs 2012-03-21 00:26:43.000000000 +0000 +++ xfonts-mona-2.90/debian/fonts-mona.docs 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -README.ascii -README.euc diff -Nru xfonts-mona-2.90/debian/fonts-mona.postinst xfonts-mona-2.90/debian/fonts-mona.postinst --- xfonts-mona-2.90/debian/fonts-mona.postinst 2012-03-21 01:29:35.000000000 +0000 +++ xfonts-mona-2.90/debian/fonts-mona.postinst 1970-01-01 00:00:00.000000000 +0000 @@ -1,53 +0,0 @@ -#! /bin/sh -set -e - -# font alternatives -ALT_NAME_OLD="ttf-japanese-gothic" -ALT_NAME="fonts-japanese-gothic" -FONT_ENTRY="/usr/share/fonts/truetype/mona/mona.ttf" -FONT_PRIORITY=20 - -remove_old_alternate_font_entry() -{ - # remove old 'ttf-japanese-mincho' alternatives - if [ -f /usr/share/fonts/truetype/$ALT_NAME_OLD ]; then - rm -rf /usr/share/fonts/truetype/$ALT_NAME_OLD - fi - # remove old 'ttf-japanese-mincho.ttf' alternatives - if [ -f /usr/share/fonts/truetype/$ALT_NAME_OLD.ttf ]; then - update-alternatives --remove $ALT_NAME_OLD.ttf $FONT_ENTRY - fi -} - -add_alternate_font_entry() -{ - update-alternatives --install \ - /usr/share/fonts/truetype/$ALT_NAME.ttf \ - $ALT_NAME.ttf \ - $FONT_ENTRY \ - $FONT_PRIORITY -} - -case "$1" in - configure) - # alternatives - remove_old_alternate_font_entry - add_alternate_font_entry - ;; - - abort-upgrade|abort-remove|abort-deconfigure) - - ;; - - *) - echo "postinst called with unknown argument \`$1'" >&2 - exit 1 - ;; -esac - -# dh_installdeb will replace this with shell code automatically -# generated by other debhelper scripts. - -#DEBHELPER# - -exit 0 diff -Nru xfonts-mona-2.90/debian/fonts-mona.preinst xfonts-mona-2.90/debian/fonts-mona.preinst --- xfonts-mona-2.90/debian/fonts-mona.preinst 2012-03-21 00:26:43.000000000 +0000 +++ xfonts-mona-2.90/debian/fonts-mona.preinst 1970-01-01 00:00:00.000000000 +0000 @@ -1,39 +0,0 @@ -#!/bin/sh - -set -e - -PKG="ttf-mona" -PKG_VERSION="2.90-5" - -rm_conffile() { - PKGNAME="$1" - CONFFILE="$2" - if [ -e "$CONFFILE" ]; then - md5sum="`md5sum \"$CONFFILE\" | sed -e \"s/ .*//\"`" - old_md5sum="`dpkg-query -W -f='${Conffiles}' $PKGNAME | sed -n -e \"\\\\' $CONFFILE'{s/ obsolete$//;s/.* //p}\"`" - if [ "$md5sum" != "$old_md5sum" ]; then - echo "Obsolete conffile $CONFFILE has been modified by you." - echo "Saving as $CONFFILE.dpkg-bak ..." - mv -f "$CONFFILE" "$CONFFILE".dpkg-bak - else - echo "Removing obsolete conffile $CONFFILE ..." - rm -f "$CONFFILE" - fi - fi -} - -case "$1" in -install|upgrade) - if dpkg --compare-versions "$2" lt-nl "$PKG_VERSION"; then - FILE="/etc/defoma/hints/${PKG}.hints" - if [ -f $FILE ]; then - if [ -x /usr/bin/defoma-font ]; then - defoma-font purge-all $FILE || true - fi - fi - rm_conffile $PKG $FILE - fi -esac - -#DEBHELPER# -exit 0 diff -Nru xfonts-mona-2.90/debian/fonts-mona.prerm xfonts-mona-2.90/debian/fonts-mona.prerm --- xfonts-mona-2.90/debian/fonts-mona.prerm 2012-03-21 01:27:26.000000000 +0000 +++ xfonts-mona-2.90/debian/fonts-mona.prerm 1970-01-01 00:00:00.000000000 +0000 @@ -1,34 +0,0 @@ -#! /bin/sh -set -e - -# font alternatives -ALT_NAME_OLD="ttf-japanese-gothic" -ALT_NAME="fonts-japanese-gothic" -FONT_ENTRY="/usr/share/fonts/truetype/mona/mona.ttf" - -remove_alternate_font_entry() -{ - update-alternatives --remove $ALT_NAME.ttf $FONT_ENTRY -} - -case "$1" in - upgrade|deconfigure) - ;; - remove) - # alternative - remove_alternate_font_entry - ;; - failed-upgrade) - ;; - *) - echo "prerm called with unknown argument \`$1'" >&2 - exit 1 - ;; -esac - -# dh_installdeb will replace this with shell code automatically -# generated by other debhelper scripts. - -#DEBHELPER# - -exit 0 diff -Nru xfonts-mona-2.90/debian/rules xfonts-mona-2.90/debian/rules --- xfonts-mona-2.90/debian/rules 2012-03-21 01:40:38.000000000 +0000 +++ xfonts-mona-2.90/debian/rules 2015-11-13 05:54:33.000000000 +0000 @@ -5,22 +5,14 @@ override_dh_auto_build: -mkdir dist make bdf - (cd dist; for i in *.bdf; do bdftopcf $$i|gzip -c9 > `basename $$i .bdf`.pcf.gz; done) - make -C ttfsrc + (cd dist; for i in *.bdf; do bdftopcf $$i|gzip --no-name -c9 > `basename $$i .bdf`.pcf.gz; done) override_dh_auto_install: # Add here commands to install the package into debian/tmp. cp dist/*.pcf.gz `pwd`/debian/xfonts-mona/usr/share/fonts/X11/misc - # ttf copy - mkdir -p `pwd`/debian/fonts-mona/usr/share/fonts/truetype/mona/. - install -m 644 ttfsrc/mona.ttf \ - `pwd`/debian/fonts-mona/usr/share/fonts/truetype/mona/ - - #gzip -9 `pwd`/debian/xfonts-mona/usr/X11R6/lib/X11/fonts/misc/*.pcf override_dh_auto_clean: - make clean -C ttfsrc make clean -rm -f dist/*