Control: tag -1 + pending patch Hi Logan and Uwe,
Logan Rosen wrote:
> In Ubuntu, the attached patch was applied to achieve the following:
Logan: Thanks!
> * debian/compat: Bump to 9.
> * debian/control:
> - Build-depend on debhelper (>= 9).
> - Depend on ${misc:Depends}.
> * debian/rules:
> - Add recommended build-arch and build-indep targets.
> - Replace dh_clean -k with dh_prep.
I've had an unpublished and not yet uploaded NMU laying around with
these (and some more) changes, too.
> * debian/rules:
> - Don't ignore all distclean errors.
[...]
> * debian/copyright: Don't point to symlink GPL.
I've merged in these additional changes from Logan, too, and uploaded
it to DELAYED/10.
Uwe: Feel free to tell me if I should fast-forward it or if I should
delay it longer.
Full debdiff attached. It's 86kB unpacked due to the removal of
config.guess and config.sub from the .diff.gz (they were originating
from there).
Here's the relevant debdiff without the file removals:
diff -u bb-1.3rc1/debian/changelog bb-1.3rc1/debian/changelog
--- bb-1.3rc1/debian/changelog
+++ bb-1.3rc1/debian/changelog
@@ -1,3 +1,27 @@
+bb (1.3rc1-8.5) unstable; urgency=medium
+
+ * Non-maintainer upload.
+
+ [ Axel Beckert ]
+ * Move from no more supported debhelper compatibility level 4 to
+ currently recommended level 9 and make debian/rules and debian/control
+ more future-proof:
+ + Change "dh_clean -k" to "dh_prep".
+ + Remove explicit argument from dh_installchangelogs. (No more needed.)
+ + Add recommended targets build-indep and build-arch.
+ + Add ${misc:Depends} to Depends
+ + Closes: #817373
+ * Remove config.guess and config.sub from Debian's .diff.gz and use
+ dh_autotools-dev_{restore,update}config to provide up-to-date files at
+ build time.
+ + Add build-dependency on autotools-dev.
+
+ [ Logan Rosen ]
+ * debian/rules: Don't ignore all distclean errors.
+ * debian/copyright: Don't point to symlink GPL.
+
+ -- Axel Beckert <[email protected]> Thu, 21 Jul 2016 19:21:48 +0200
+
bb (1.3rc1-8.4) unstable; urgency=medium
* Non-maintainer upload.
diff -u bb-1.3rc1/debian/compat bb-1.3rc1/debian/compat
--- bb-1.3rc1/debian/compat
+++ bb-1.3rc1/debian/compat
@@ -1 +1 @@
-4
+9
diff -u bb-1.3rc1/debian/control bb-1.3rc1/debian/control
--- bb-1.3rc1/debian/control
+++ bb-1.3rc1/debian/control
@@ -2,13 +2,13 @@
Section: games
Priority: optional
Maintainer: Uwe Hermann <[email protected]>
-Build-Depends: debhelper (>> 4.0.0), libmikmod-dev, libaa1-dev (>= 1.4p5-28)
+Build-Depends: debhelper (>> 9), libmikmod-dev, libaa1-dev (>= 1.4p5-28),
autotools-dev
Standards-Version: 3.7.2.2
Homepage: http://aa-project.sourceforge.net/bb/
Package: bb
Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
Description: ASCII-art demo based on AAlib
This package contains a 'high quality audio-visual demonstration'
of ASCII-art using AAlib, a portable ASCII-art graphics library.
diff -u bb-1.3rc1/debian/copyright bb-1.3rc1/debian/copyright
--- bb-1.3rc1/debian/copyright
+++ bb-1.3rc1/debian/copyright
@@ -26,7 +26,7 @@
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
On Debian systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL'.
+Public License can be found in `/usr/share/common-licenses/GPL-2'.
-------------------------------------------------------------------------------
diff -u bb-1.3rc1/debian/rules bb-1.3rc1/debian/rules
--- bb-1.3rc1/debian/rules
+++ bb-1.3rc1/debian/rules
@@ -25,15 +25,17 @@
config.status: configure
dh_testdir
+ dh_autotools-dev_updateconfig
./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE)
--prefix=/usr --mandir=\$${prefix}/share/man --bindir=\$${prefix}/games
--datadir=\$${prefix}/share
# Don't use -rpath...
cat Makefile | sed 's/-Wl,-rpath,\/usr\/lib//g' > Makefile.new; sleep 1
mv Makefile.new Makefile
-build: build-stamp
-
-build-stamp: config.status
+build: build-arch build-indep
+build-arch: build-stamp
+build-indep: build-stamp
+build-stamp: config.status
dh_testdir
$(MAKE)
touch build-stamp
@@ -42,19 +44,14 @@
dh_testdir
dh_testroot
rm -f build-stamp
- -$(MAKE) distclean
-ifneq "$(wildcard /usr/share/misc/config.sub)" ""
- cp -f /usr/share/misc/config.sub config.sub
-endif
-ifneq "$(wildcard /usr/share/misc/config.guess)" ""
- cp -f /usr/share/misc/config.guess config.guess
-endif
+ [ ! -f Makefile ] || $(MAKE) distclean
+ dh_autotools-dev_restoreconfig
dh_clean
install: build
dh_testdir
dh_testroot
- dh_clean -k
+ dh_prep
dh_installdirs
$(MAKE) install prefix=$(CURDIR)/debian/bb/usr
@@ -66,7 +63,7 @@
binary-arch: build install
dh_testdir
dh_testroot
- dh_installchangelogs ChangeLog
+ dh_installchangelogs
dh_installdocs
#dh_installexamples
# dh_install
P.S.: Uwe: Do you want a co-maintainer for bb?
Regards, Axel
--
,''`. | Axel Beckert <[email protected]>, http://people.debian.org/~abe/
: :' : | Debian Developer, ftp.ch.debian.org Admin
`. `' | 4096R: 2517 B724 C5F6 CA99 5329 6E61 2FF9 CD59 6126 16B5
`- | 1024D: F067 EA27 26B9 C3FC 1486 202E C09E 1D89 9593 0EDE
bb_1.3rc1-8.4_1.3rc1-8.5.dsc.debdiff.gz
Description: Binary data
