Control: tags -1 +pending
Hi!
I've prepared a NMU, with the patch I've sent before, and a few minor fixes
elsewhere. It's in delayed/7, please holler if you want it
removed/amended/etc.
Per the NMU rules, a debdiff is attached. As the dh-9-ization patch moves
files around and thus is hard to read in a monolithic diff, an itemized
stack of patches is available at https://gitlab.com/kilobyte/debfoster
--
An imaginary friend squared is a real enemy.
diff -u debfoster-2.7/debian/changelog debfoster-2.7/debian/changelog
--- debfoster-2.7/debian/changelog
+++ debfoster-2.7/debian/changelog
@@ -1,3 +1,13 @@
+debfoster (2.7-2.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Migrate to debhelper 9. Closes: #817424
+ * Move bash completion files to /usr/share/bash-completion/completions.
+ * Unbreak bash completion. Closes: #800354
+ * Depend on ${misc:Depends}.
+
+ -- Adam Borowski <[email protected]> Sat, 30 Jul 2016 03:53:25 +0200
+
debfoster (2.7-2) unstable; urgency=medium
* update config.sub/guess. Closes: #533685
diff -u debfoster-2.7/debian/compat debfoster-2.7/debian/compat
--- debfoster-2.7/debian/compat
+++ debfoster-2.7/debian/compat
@@ -1 +1 @@
-4
+9
diff -u debfoster-2.7/debian/control debfoster-2.7/debian/control
--- debfoster-2.7/debian/control
+++ debfoster-2.7/debian/control
@@ -3,12 +3,12 @@
Priority: optional
Maintainer: debfoster Maintainer Team <[email protected]>
Uploaders: Andreas Barth <[email protected]>, Marc Haber
<[email protected]>, Florian Weimer <[email protected]>
-Build-Depends: debhelper (>> 4.0.0), gettext, libgc-dev
-Standards-Version: 3.7.2
+Build-Depends: debhelper (>> 9), gettext, libgc-dev
+Standards-Version: 3.9.8
Package: debfoster
Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
Recommends: apt
Description: Install only wanted Debian packages
debfoster is a wrapper program for apt and dpkg. When first run, it
reverted:
--- debfoster-2.7/debian/debfoster.bash_completion
+++ debfoster-2.7.orig/debian/debfoster.bash_completion
@@ -1,41 +0,0 @@
-# -*- sh -*-
-
-# Provided by Eric Hansander <[email protected]> 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 -u debfoster-2.7/debian/dirs debfoster-2.7/debian/dirs
--- debfoster-2.7/debian/dirs
+++ debfoster-2.7/debian/dirs
@@ -6 +5,0 @@
-etc/bash_completion.d
diff -u debfoster-2.7/debian/rules debfoster-2.7/debian/rules
--- debfoster-2.7/debian/rules
+++ debfoster-2.7/debian/rules
@@ -2,85 +2,4 @@
-# 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
only in patch2:
unchanged:
--- debfoster-2.7.orig/debian/bash_completion/debfoster
+++ debfoster-2.7/debian/bash_completion/debfoster
@@ -0,0 +1,41 @@
+# -*- sh -*-
+
+# Provided by Eric Hansander <[email protected]> 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=( $( _xfunc dpkg _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=( $( _xfunc dpkg _comp_dpkg_installed_packages $cur ) )
+ fi
+
+ return 0
+}
+test "$have" && complete -F _debfoster $default debfoster
only in patch2:
unchanged:
--- debfoster-2.7.orig/debian/install
+++ debfoster-2.7/debian/install
@@ -0,0 +1,2 @@
+debian/debfoster2aptitude usr/sbin/
+debian/bash_completion/debfoster usr/share/bash-completion/completions/
