diff -Nru fonts-monapo-20170722/debian/changelog fonts-monapo-20170722/debian/changelog --- fonts-monapo-20170722/debian/changelog 2019-01-03 03:35:47.000000000 +0000 +++ fonts-monapo-20170722/debian/changelog 2020-05-20 10:27:33.000000000 +0000 @@ -1,3 +1,18 @@ +fonts-monapo (20170722-3) unstable; urgency=medium + + * debian/control + - Update standards version to 4.5.0, no changes needed. + - Drop debhelper and set debhelper-compat (= 13) + * debian/{rules,install} + - Not just install ttf but generate it with script + * debian/{control,preinst} + - Drop old unnecessary relationship and maintscript + * Add debian/salsa-ci.yml + * Update debian/gbp.conf + * Drop README.Debian + + -- Hideki Yamane Wed, 20 May 2020 19:27:33 +0900 + fonts-monapo (20170722-2) unstable; urgency=medium * debian/control diff -Nru fonts-monapo-20170722/debian/control fonts-monapo-20170722/debian/control --- fonts-monapo-20170722/debian/control 2019-01-03 03:35:47.000000000 +0000 +++ fonts-monapo-20170722/debian/control 2020-05-20 10:27:33.000000000 +0000 @@ -3,8 +3,9 @@ Priority: optional Maintainer: Debian Fonts Task Force Uploaders: Hideki Yamane -Build-Depends: debhelper (>= 12), debhelper-compat (= 12), -Standards-Version: 4.3.0 +Build-Depends: debhelper-compat (= 13), +Build-Depends-Indep: fontforge-nox | fontforge, +Standards-Version: 4.5.0 Homepage: http://linuxplayers.g1.xrea.com/ Vcs-Git: https://salsa.debian.org/fonts-team/fonts-monapo.git Vcs-Browser: https://salsa.debian.org/fonts-team/fonts-monapo @@ -12,10 +13,7 @@ Package: fonts-monapo Architecture: all Multi-Arch: foreign -Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends} Depends: ${misc:Depends} -Replaces: ttf-monapo (<< 20090423-5) -Breaks: ttf-monapo (<< 20090423-5) Description: Japanese TrueType font, Monapo Monapo font is a combined font, that uses IPAfont and monafont. It has almost same width as MS P Gothic, so it can show Japanese Ascii Art diff -Nru fonts-monapo-20170722/debian/gbp.conf fonts-monapo-20170722/debian/gbp.conf --- fonts-monapo-20170722/debian/gbp.conf 2019-01-03 03:35:47.000000000 +0000 +++ fonts-monapo-20170722/debian/gbp.conf 2020-05-20 10:27:33.000000000 +0000 @@ -13,22 +13,3 @@ pristine-tar = True color = auto #builder = /usr/bin/git-pbuilder - -[buildpackage] -# uncomment this to automatically GPG sign tags: -sign-tags = True -# keyid to GPG sign tags with: -keyid = 58E1222F9696C885A3CD104C5D328D082AAAB140 - -# call lintian after a successful build: -postbuild = lintian $GBP_CHANGES_FILE -# let package generate upstream changelog before build: -#prebuild = GIT_DIR=$GBP_GIT_DIR debian/autogen.sh -# use this for more svn-buildpackage like behaviour: -export-dir = ../build-area/ -tarball-dir = ../tarballs/ - -compression = xz - -# Wheter to use cowbuilder via git-pbuilder(1) -pbuilder = True diff -Nru fonts-monapo-20170722/debian/install fonts-monapo-20170722/debian/install --- fonts-monapo-20170722/debian/install 2019-01-03 03:35:47.000000000 +0000 +++ fonts-monapo-20170722/debian/install 2020-05-20 10:27:33.000000000 +0000 @@ -1,2 +1 @@ -*.ttf usr/share/fonts/truetype/monapo/ - +fontforge-script/monapo.ttf usr/share/fonts/truetype/monapo/ diff -Nru fonts-monapo-20170722/debian/preinst fonts-monapo-20170722/debian/preinst --- fonts-monapo-20170722/debian/preinst 2019-01-03 03:35:47.000000000 +0000 +++ fonts-monapo-20170722/debian/preinst 1970-01-01 00:00:00.000000000 +0000 @@ -1,56 +0,0 @@ -#!/bin/sh -# -# stolen from ttf-dzongkha/debian/ttf-dzongkha.preinst :) -# - -set -e - -VERSION=20090423-3 -PKG=ttf-monapo -FILE=/etc/defoma/hints/${PKG}.hints - -# Remove a no-longer used conffile -rm_conffile() { - local PKGNAME="$1" - local CONFFILE="$2" - [ -e "$CONFFILE" ] || return 0 - - local md5sum="$(md5sum $CONFFILE | sed -e 's/ .*//')" - local 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 -} - -pathfind() { - OLDIFS="$IFS" - IFS=: - for p in $PATH; do - if [ -x "$p/$*" ]; then - IFS="$OLDIFS" - return 0 - fi - done - IFS="$OLDIFS" - return 1 -} - -case "$1" in -install|upgrade) - if dpkg --compare-versions "$2" lt-nl "$VERSION"; then - if [ -f $FILE ]; then - if `pathfind defoma-font`; then - defoma-font purge-all $FILE || true - fi - fi - rm_conffile $PKG $FILE - fi -esac - -#DEBHELPER# diff -Nru fonts-monapo-20170722/debian/README.Debian fonts-monapo-20170722/debian/README.Debian --- fonts-monapo-20170722/debian/README.Debian 2019-01-03 03:35:47.000000000 +0000 +++ fonts-monapo-20170722/debian/README.Debian 1970-01-01 00:00:00.000000000 +0000 @@ -1,8 +0,0 @@ -ttf-monapo for Debian ------------------------------------------------------------------------ - - This "monapo" font is derivatives of IPAfont. If you want to back monapo - to IPAfont, use "revert-ipagp.pe" fontforge script with ipagp.otf from - fonts-ipafont-gothic and mona.ttf from xfonts-mona package. - - -- Hideki Yamane (Debian-JP) Mon, 08 Jun 2009 22:23:47 +0900 diff -Nru fonts-monapo-20170722/debian/rules fonts-monapo-20170722/debian/rules --- fonts-monapo-20170722/debian/rules 2019-01-03 03:35:47.000000000 +0000 +++ fonts-monapo-20170722/debian/rules 2020-05-20 10:27:33.000000000 +0000 @@ -3,3 +3,6 @@ #export DH_VERBOSE=1 %: dh $@ + +override_dh_auto_build: + cd $(CURDIR)/fontforge-script && ./import-ipagp.pe diff -Nru fonts-monapo-20170722/debian/salsa-ci.yml fonts-monapo-20170722/debian/salsa-ci.yml --- fonts-monapo-20170722/debian/salsa-ci.yml 1970-01-01 00:00:00.000000000 +0000 +++ fonts-monapo-20170722/debian/salsa-ci.yml 2020-05-20 10:27:33.000000000 +0000 @@ -0,0 +1,8 @@ +--- +include: + - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml + - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml + +variables: + SALSA_CI_DISABLE_BLHC: 1 + SALSA_CI_DISABLE_BUILD_PACKAGE_ANY: 1