Package: cvs-autoreleasedeb
Version: 0.12-1
Followup-For: Bug #817325
User: [email protected]
Usertags: origin-ubuntu yakkety ubuntu-patch
Dear Maintainer,
In Ubuntu, the attached patch was applied to achieve the following:
* debian/rules:
- Remove legacy DH_COMPAT export.
- Don't allow clean to ignore errors.
- Add recommended build-arch and build-indep targets.
- Use dh_prep instead of dh_clean -k.
* debian/compat: Indicate compatibility level of 9.
* debian/control:
- Build-depend on debhelper (>= 9).
- Remove superfluous Build-Depends-Indep field.
- Depend on ${misc:Depends}.
* debian/{cvs,svn}-autoreleasedeb.prerm: Delete, since they are empty.
Thanks for considering the patch.
Logan Rosen
-- System Information:
Debian Release: stretch/sid
APT prefers xenial-updates
APT policy: (500, 'xenial-updates'), (500, 'xenial-security'), (500,
'xenial'), (100, 'xenial-backports')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 4.4.0-21-generic (SMP w/2 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8) (ignored: LC_ALL
set to en_US.utf8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
diff -u cvs-autoreleasedeb-0.12/debian/control cvs-autoreleasedeb-0.12/debian/control
--- cvs-autoreleasedeb-0.12/debian/control
+++ cvs-autoreleasedeb-0.12/debian/control
@@ -2,13 +2,12 @@
Section: devel
Priority: optional
Maintainer: Daniel Ruoso <[email protected]>
-Build-Depends: debhelper (>> 4.0.0), perl
-Build-Depends-Indep: debhelper (>> 4.0.0), perl
+Build-Depends: debhelper (>= 9), perl
Standards-Version: 3.7.2.1
Package: cvs-autoreleasedeb
Architecture: all
-Depends: dpkg-dev, fakeroot, cvs, ${perl:Depends}, libxml-parser-perl, dupload, cvs-buildpackage, libapt-pkg-perl, adduser
+Depends: ${misc:Depends}, dpkg-dev, fakeroot, cvs, ${perl:Depends}, libxml-parser-perl, dupload, cvs-buildpackage, libapt-pkg-perl, adduser
Description: Automatically release/upload debian packages from CVS
This package provides the capability of automatically publish a
deb package directly from the CVS source. The CVS source must be
@@ -28,7 +27,7 @@
Package: svn-autoreleasedeb
Architecture: all
-Depends: dpkg-dev, fakeroot, subversion, ${perl:Depends}, libxml-parser-perl, dupload, svn-buildpackage, libapt-pkg-perl, adduser
+Depends: ${misc:Depends}, dpkg-dev, fakeroot, subversion, ${perl:Depends}, libxml-parser-perl, dupload, svn-buildpackage, libapt-pkg-perl, adduser
Description: Automatically release/upload debian packages from SVN
This package provides the capability of automatically publish a
deb package directly from the SVN source. The SVN source must be
reverted:
--- cvs-autoreleasedeb-0.12/debian/cvs-autoreleasedeb.prerm
+++ cvs-autoreleasedeb-0.12.orig/debian/cvs-autoreleasedeb.prerm
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
diff -u cvs-autoreleasedeb-0.12/debian/rules cvs-autoreleasedeb-0.12/debian/rules
--- cvs-autoreleasedeb-0.12/debian/rules
+++ cvs-autoreleasedeb-0.12/debian/rules
@@ -2,9 +2,6 @@
# Sample debian/rules that uses debhelper.
# GNU copyright 1997 to 1999 by Joey Hess.
-# This is the debhelper compatibility version to use.
-export DH_COMPAT=4
-
ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
CFLAGS += -g
endif
@@ -17,7 +14,9 @@
dh_testdir
touch configure-stamp
-build: build-stamp
+build: build-arch build-indep
+build-arch: build-stamp
+build-indep: build-stamp
build-stamp: configure-stamp
dh_testdir
@@ -28,13 +27,13 @@
dh_testdir
dh_testroot
rm -f build-stamp configure-stamp
- -$(MAKE) clean
+ $(MAKE) clean
dh_clean
install: build
dh_testdir
dh_testroot
- dh_clean -k
+ dh_prep
dh_installdirs
$(MAKE) install-cvs DESTDIR=$(CURDIR)/debian/cvs-autoreleasedeb
$(MAKE) install-svn DESTDIR=$(CURDIR)/debian/svn-autoreleasedeb
@@ -62 +61 @@
-.PHONY: build clean binary-indep binary-arch binary install configure
+.PHONY: build build-arch build-indep clean binary-indep binary-arch binary install configure
reverted:
--- cvs-autoreleasedeb-0.12/debian/svn-autoreleasedeb.prerm
+++ cvs-autoreleasedeb-0.12.orig/debian/svn-autoreleasedeb.prerm
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
only in patch2:
unchanged:
--- cvs-autoreleasedeb-0.12.orig/debian/compat
+++ cvs-autoreleasedeb-0.12/debian/compat
@@ -0,0 +1 @@
+9
