control: tags -1 +patch Hi! Here's a patch migrating debfoster to dh 9, fixing the FTBFS.
I've moved the bash_completion file to a dir on its own to simplify the packaging -- debian/rules is now the usual dh two-liner. Meow! -- An imaginary friend squared is a real enemy.
>From 0eb439c5dc0816aa1f38150fae518818f2e03bd8 Mon Sep 17 00:00:00 2001 From: Adam Borowski <kilob...@angband.pl> Date: Thu, 21 Jul 2016 06:36:31 +0200 Subject: [PATCH] dh 9 --- debian/bash_completion/debfoster | 41 +++++++++++++++++++ debian/compat | 2 +- debian/control | 2 +- debian/debfoster.bash_completion | 41 ------------------- debian/install | 2 + debian/rules | 85 +--------------------------------------- 6 files changed, 47 insertions(+), 126 deletions(-) create mode 100644 debian/bash_completion/debfoster delete mode 100644 debian/debfoster.bash_completion create mode 100644 debian/install diff --git a/debian/bash_completion/debfoster b/debian/bash_completion/debfoster new file mode 100644 index 0000000..0c6e3ac --- /dev/null +++ b/debian/bash_completion/debfoster @@ -0,0 +1,41 @@ +# -*- sh -*- + +# Provided by Eric Hansander <e...@users.sourceforge.net> in +# <http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=349035> + +have debfoster && +_debfoster() +{ + local cur prev options + + COMPREPLY=() + cur=${COMP_WORDS[COMP_CWORD]} + prev=${COMP_WORDS[COMP_CWORD-1]} + options='-v --verbose -V --version -h --help -q --quiet -f --force \ + -m --mark-only -u --upgrade -c --config -k --keeperfile -n \ + --no-keeperfile -i --ignore-default-rules -a --show-keepers -s \ + --show-orphans -d --show-depends -e --show-dependents -p \ + --show-providers -r --show-related -t --use-tasks -o --option' + + case $prev in + -@(c|-config|k|-keeperfile)) + _filedir + return 0 + ;; + -@(d|-show-depends|e|-show-dependents|r|-show-related)) + COMPREPLY=( $( _comp_dpkg_installed_packages $cur ) ) + return 0 + ;; + esac + + if [[ "$cur" == -* ]]; then + COMPREPLY=( $( compgen -W "$options" -- $cur ) ) + else + # This is just an approximation. Actually, debfoster can + # install new packages, which won't appear in that list. + COMPREPLY=( $( _comp_dpkg_installed_packages $cur ) ) + fi + + return 0 +} +test "$have" && complete -F _debfoster $default debfoster diff --git a/debian/compat b/debian/compat index b8626c4..ec63514 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -4 +9 diff --git a/debian/control b/debian/control index 80a4dfc..228b0c9 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: admin Priority: optional Maintainer: debfoster Maintainer Team <pkg-debfos...@teams.debian.net> Uploaders: Andreas Barth <a...@not.so.argh.org>, Marc Haber <mh+debian-packa...@zugschlus.de>, Florian Weimer <f...@deneb.enyo.de> -Build-Depends: debhelper (>> 4.0.0), gettext, libgc-dev +Build-Depends: debhelper (>> 9), gettext, libgc-dev Standards-Version: 3.7.2 Package: debfoster diff --git a/debian/debfoster.bash_completion b/debian/debfoster.bash_completion deleted file mode 100644 index 0c6e3ac..0000000 --- a/debian/debfoster.bash_completion +++ /dev/null @@ -1,41 +0,0 @@ -# -*- sh -*- - -# Provided by Eric Hansander <e...@users.sourceforge.net> in -# <http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=349035> - -have debfoster && -_debfoster() -{ - local cur prev options - - COMPREPLY=() - cur=${COMP_WORDS[COMP_CWORD]} - prev=${COMP_WORDS[COMP_CWORD-1]} - options='-v --verbose -V --version -h --help -q --quiet -f --force \ - -m --mark-only -u --upgrade -c --config -k --keeperfile -n \ - --no-keeperfile -i --ignore-default-rules -a --show-keepers -s \ - --show-orphans -d --show-depends -e --show-dependents -p \ - --show-providers -r --show-related -t --use-tasks -o --option' - - case $prev in - -@(c|-config|k|-keeperfile)) - _filedir - return 0 - ;; - -@(d|-show-depends|e|-show-dependents|r|-show-related)) - COMPREPLY=( $( _comp_dpkg_installed_packages $cur ) ) - return 0 - ;; - esac - - if [[ "$cur" == -* ]]; then - COMPREPLY=( $( compgen -W "$options" -- $cur ) ) - else - # This is just an approximation. Actually, debfoster can - # install new packages, which won't appear in that list. - COMPREPLY=( $( _comp_dpkg_installed_packages $cur ) ) - fi - - return 0 -} -test "$have" && complete -F _debfoster $default debfoster diff --git a/debian/install b/debian/install new file mode 100644 index 0000000..e8c99f8 --- /dev/null +++ b/debian/install @@ -0,0 +1,2 @@ +debian/debfoster2aptitude usr/sbin/ +debian/bash_completion/debfoster etc/bash_completion.d/ diff --git a/debian/rules b/debian/rules index a19d653..be1a4c2 100755 --- a/debian/rules +++ b/debian/rules @@ -1,86 +1,5 @@ #!/usr/bin/make -f -# Sample debian/rules that uses debhelper. -# GNU copyright 1997 to 1999 by Joey Hess. - -# Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -configure: configure-stamp -configure-stamp: - dh_testdir - # Add here commands to configure the package. - - ./configure --prefix=/usr --sysconfdir=/etc \ - --mandir=/usr/share/man --localstatedir=/var - - touch configure-stamp - -build: configure-stamp build-stamp -build-stamp: - dh_testdir - - # Add here commands to compile the package. - $(MAKE) - #/usr/bin/docbook-to-man debian/debfoster.sgml > debfoster.1 - - touch build-stamp - -clean: - dh_testdir - dh_testroot - rm -f build-stamp configure-stamp - - # Add here commands to clean up after the build process. - -$(MAKE) distclean - rm -f po/*.gmo po/stamp-po - - dh_clean - -install: build - dh_testdir - dh_testroot - dh_clean -k - dh_installdirs - - # Add here commands to install the package into debian/debfoster. - \$(MAKE) install DESTDIR=$(CURDIR)/debian/debfoster - install debian/debfoster2aptitude debian/debfoster/usr/sbin/ - install -m 644 debian/debfoster.bash_completion \ - debian/debfoster/etc/bash_completion.d/debfoster - -# Build architecture-independent files here. -binary-indep: build install -# We have nothing to do by default. - -# Build architecture-dependent files here. -binary-arch: build install - dh_testdir - dh_testroot -# dh_installdebconf - dh_installdocs - dh_installexamples - dh_installmenu -# dh_installemacsen -# dh_installpam -# dh_installinit - dh_installcron - dh_installman - dh_installinfo -# dh_undocumented - dh_installchangelogs - dh_link - dh_strip - dh_compress - dh_fixperms - # You may want to make some executables suid here. -# dh_suidregister -# dh_makeshlibs - dh_installdeb -# dh_perl - dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb - -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install configure +%: + dh $@ --parallel -- 2.8.1
