Control: tags -1 patch
Dear Maintainer,
In Ubuntu, the attached patch was applied to achieve the following:
* debian/rules:
- Remove legacy DH_COMPAT export.
- Don't allow distclean to ignore errors.
* debian/compat: Indicate compatibility level of 9.
* debian/control:
- Build-depend on debhelper (>= 9).
- Depend on ${misc:Depends}.
* debian/copyright: Don't point to symlink GPL.
Thanks for considering the patch.
Logan Rosen
diff -u libdshconfig-0.20.13/debian/control libdshconfig-0.20.13/debian/control
--- libdshconfig-0.20.13/debian/control
+++ libdshconfig-0.20.13/debian/control
@@ -2,13 +2,13 @@
Section: libs
Priority: optional
Maintainer: Junichi Uekawa <dan...@debian.org>
-Build-Depends: debhelper (>> 4.0.0), dh-autoreconf, d-shlibs (>= 0.4), doxygen
+Build-Depends: debhelper (>= 9), dh-autoreconf, d-shlibs (>= 0.4), doxygen
Standards-Version: 3.7.2
Package: libdshconfig1
Architecture: any
Section: libs
-Depends: ${shlibs:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
Description: configuration file parser library for dsh - runtime
Runtime library for configuration file parser,
required for running programs with dsh config file support.
@@ -18,7 +18,7 @@
Package: libdshconfig1-dev
Architecture: any
Section: libdevel
-Depends: libdshconfig1 (= ${binary:Version}), ${devlibs:Depends}
+Depends: ${misc:Depends}, libdshconfig1 (= ${binary:Version}), ${devlibs:Depends}
Provides: libdshconfig-dev
Conflicts: libdshconfig-dev
Description: configuration file parser library for dsh - development
diff -u libdshconfig-0.20.13/debian/copyright libdshconfig-0.20.13/debian/copyright
--- libdshconfig-0.20.13/debian/copyright
+++ libdshconfig-0.20.13/debian/copyright
@@ -14 +14 @@
-Please see /usr/share/common-licenses/GPL on Debian systems.
+Please see /usr/share/common-licenses/GPL-2 on Debian systems.
diff -u libdshconfig-0.20.13/debian/rules libdshconfig-0.20.13/debian/rules
--- libdshconfig-0.20.13/debian/rules
+++ libdshconfig-0.20.13/debian/rules
@@ -5,9 +5,6 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-# This is the debhelper compatability version to use.
-export DH_COMPAT=4
-
DSH=$(CURDIR)/debian/dsh
configure: configure-stamp
@@ -31,14 +28,14 @@
dh_testroot
rm -f build-stamp configure-stamp
rm -rf $(DSH)
- -$(MAKE) distclean
+ [ ! -f Makefile ] || $(MAKE) distclean
dh_autoreconf_clean
dh_clean
install: build
dh_testdir
dh_testroot
- dh_clean -k
+ dh_prep
dh_installdirs
# Add here commands to install the package into debian/dsh.
only in patch2:
unchanged:
--- libdshconfig-0.20.13.orig/debian/compat
+++ libdshconfig-0.20.13/debian/compat
@@ -0,0 +1 @@
+9
