Control: tags 836753 + patch Control: tags 836753 + pending Dear maintainer,
I've prepared an NMU for djmount (versioned as 0.71-7.1) and
uploaded it to DELAYED/5. Please feel free to tell me if I
should delay it longer.
I did my work in git, and I'll push it if my NMU is accepted. I've also
attached the changes as generated by `git format-patch`
Regards.
--
regards,
Mattia Rizzolo
GPG Key: 66AE 2B4A FCCF 3F52 DA18 4D18 4B04 3FCD B944 4540 .''`.
more about me: https://mapreri.org : :' :
Launchpad user: https://launchpad.net/~mapreri `. `'`
Debian QA page: https://qa.debian.org/developer.php?login=mattia `-
[0;0mdiffstat for djmount-0.71 djmount-0.71[0;0m [0;0m[0;0m [0;0m changelog | 19 +++++++++++++++++++[0;0m [0;0m compat | 2 +-[0;0m [0;0m control | 6 +++---[0;0m [0;0m copyright | 36 +++++++++++++++---------------------[0;0m [0;0m rules | 36 +++++-------------------------------[0;0m [0;0m 5 files changed, 43 insertions(+), 56 deletions(-)[0;0m [0;0m[0;0m [1;36mdiff -Nru djmount-0.71/debian/changelog djmount-0.71/debian/changelog[0;0m [0;31m--- djmount-0.71/debian/changelog 2014-12-21 18:35:47.000000000 +0000[0;0m [0;32m+++ djmount-0.71/debian/changelog 2016-09-27 21:14:45.000000000 +0000[0;0m [0;36m@@ -1,3 +1,22 @@[0;0m [0;32m+djmount (0.71-7.1) unstable; urgency=medium[0;0m [0;32m+[0;0m [0;32m+ * Non-maintainer upload.[0;0m [0;32m+ * Use HTTPS for the Vcs-* fields.[0;0m [0;32m+ * Bump debhelper compat level to 10, so that dh_update_autotools_config is run[0;0m [0;32m+ instead of the external addon dh_autotools-dev (but disable autoreconf).[0;0m [0;32m+ * Use dh_auto_configure instead of manually calling ./configure.[0;0m [0;32m+ * Call dh_auto_install instead of manually calling `make install`.[0;0m [0;32m+ * Stop using hardening-wrapper, make use of dpkg-buildflags with[0;0m [0;32m+ DEB_BUILD_MAINT_OPTIONS=hardening=+all[0;0m [0;32m+ instead. Closes: #836753[0;0m [0;32m+ * Fix copyright-format 1.0 syntax.[0;0m [0;32m+ + dep5-copyright-license-name-not-unique by moving GPL-2+ license text to a[0;0m [0;32m+ standalone license paragraph.[0;0m [0;32m+ + invalid-short-name-in-dep5-copyright by renaming the name of the BSD[0;0m [0;32m+ license from 'BSD' to 'BSD-3-Clauses'.[0;0m [0;32m+[0;0m [0;32m+ -- Mattia Rizzolo <mat...@debian.org> Tue, 27 Sep 2016 21:14:45 +0000[0;0m [0;32m+[0;0m [0;0m djmount (0.71-7) unstable; urgency=medium[0;0m [0;0m [0;0m [0;0m * debian/patches:[0;0m [1;36mdiff -Nru djmount-0.71/debian/compat djmount-0.71/debian/compat[0;0m [0;31m--- djmount-0.71/debian/compat 2014-12-21 18:35:47.000000000 +0000[0;0m [0;32m+++ djmount-0.71/debian/compat 2016-09-27 20:54:22.000000000 +0000[0;0m [0;36m@@ -1 +1 @@[0;0m [0;31m-9[0;0m [0;32m+10[0;0m [1;36mdiff -Nru djmount-0.71/debian/control djmount-0.71/debian/control[0;0m [0;31m--- djmount-0.71/debian/control 2014-12-21 18:35:47.000000000 +0000[0;0m [0;32m+++ djmount-0.71/debian/control 2016-09-27 21:01:44.000000000 +0000[0;0m [0;36m@@ -2,11 +2,11 @@[0;0m [0;0m Section: net[0;0m [0;0m Priority: extra[0;0m [0;0m Maintainer: Dario Minnucci <mid...@debian.org>[0;0m [0;31m-Build-Depends: debhelper (>= [7m9), autotools-dev, libfuse-dev, libupnp-dev, libtalloc-dev, chrpath, hardening-includes[27m[0;0m [0;32m+Build-Depends: debhelper (>= [7m10), libfuse-dev, libupnp-dev, libtalloc-dev, chrpath[27m[0;0m [0;0m Standards-Version: 3.9.4[0;0m [0;0m Homepage: http://djmount.sourceforge.net/[0;0m [0;31m-Vcs-Browser: http[7m://anonscm.debian.org/gitweb/?p=collab-maint/djmount.git;a=summary[27m[0;0m [0;31m-Vcs-Git: [7mgit://anonscm.debian.org[27m/collab-maint/djmount.git[0;0m [0;32m+Vcs-Browser: http[7ms://anonscm.debian.org/git/collab-maint/djmount.git[27m[0;0m [0;32m+Vcs-Git: [7mhttps://anonscm.debian.org/git[27m/collab-maint/djmount.git[0;0m [0;0m [0;0m [0;0m Package: djmount[0;0m [0;0m Architecture: any[0;0m [1;36mdiff -Nru djmount-0.71/debian/copyright djmount-0.71/debian/copyright[0;0m [0;31m--- djmount-0.71/debian/copyright 2014-12-21 18:35:47.000000000 +0000[0;0m [0;32m+++ djmount-0.71/debian/copyright 2016-09-27 21:13:04.000000000 +0000[0;0m [0;36m@@ -9,22 +9,27 @@[0;0m [0;0m 2005, Dmitry Zakharov aka ChaoS <dmitr...@mail.ru>[0;0m [0;0m 2005-2006, Rémi Turboult <r...@users.sourceforge.net>[0;0m [0;0m License: GPL-2+[0;0m [0;31m- On Debian systems the full text of the GNU General Public [0;0m [0;31m- License can be found in the `/usr/share/common-licenses/GPL-2'[0;0m [0;31m- file.[0;0m [0;31m-[0;0m [0;0m [0;0m [0;0m Files: gl/*[0;0m [0;0m Copyright: 1990-2005, Free Software Foundation, Inc[0;0m [0;0m License: GPL-2+[0;0m [0;31m- On Debian systems the full text of the GNU General Public [0;0m [0;31m- License can be found in the `/usr/share/common-licenses/GPL-2'[0;0m [0;31m- file.[0;0m [0;31m-[0;0m [0;0m [0;0m [0;0m Files: libupnp/*[0;0m [0;0m Copyright: 2000-2003, Intel Corporation[0;0m [0;31m-License: BSD[0;0m [0;32m+License: BSD-3-Clause[0;0m [0;32m+[0;0m [0;32m+Files: talloc/*[0;0m [0;32m+Copyright: 2004-2005, Andrew Tridgell[0;0m [0;32m+License: LGPL-2+[0;0m [0;32m+ On Debian systems the full text of the GNU General Public[0;0m [0;32m+ License can be found in the `/usr/share/common-licenses/LGPL-2'[0;0m [0;32m+ file.[0;0m [0;32m+[0;0m [0;32m+Files: debian/*[0;0m [0;32m+Copyright: 2009-2012, Dario Minnucci <mid...@debian.org>[0;0m [0;32m+License: GPL-2+[0;0m [0;32m+[0;0m [0;32m+License: BSD-3-Clause[0;0m [0;0m Copyright (c) The Regents of the University of California.[0;0m [0;0m All rights reserved.[0;0m [0;0m .[0;0m [0;36m@@ -52,18 +57,7 @@[0;0m [0;0m OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF[0;0m [0;0m SUCH DAMAGE.[0;0m [0;0m [0;0m [0;31m-[0;0m [0;31m-Files: talloc/*[0;0m [0;31m-Copyright: 2004-2005, Andrew Tridgell[0;0m [0;31m-License: LGPL-2+[0;0m [0;31m- On Debian systems the full text of the GNU General Public [0;0m [0;31m- License can be found in the `/usr/share/common-licenses/LGPL-2'[0;0m [0;31m- file.[0;0m [0;31m-[0;0m [0;31m-[0;0m [0;31m-Files: debian/*[0;0m [0;31m-Copyright: 2009-2012, Dario Minnucci <mid...@debian.org>[0;0m [0;0m License: GPL-2+[0;0m [0;31m- On Debian systems the full text of the GNU General Public[7m [0;0m[27m [0;32m+ On Debian systems the full text of the GNU General Public[0;0m[7m[27m [0;0m License can be found in the `/usr/share/common-licenses/GPL-2'[0;0m [0;0m file.[0;0m [1;36mdiff -Nru djmount-0.71/debian/rules djmount-0.71/debian/rules[0;0m [0;31m--- djmount-0.71/debian/rules 2014-12-21 18:35:47.000000000 +0000[0;0m [0;32m+++ djmount-0.71/debian/rules 2016-09-27 21:04:15.000000000 +0000[0;0m [0;36m@@ -1,48 +1,22 @@[0;0m [0;0m #!/usr/bin/make -f[0;0m [0;31m-# -*- makefile -*-[0;0m [0;31m-# Sample debian/rules that uses debhelper.[0;0m [0;31m-# This file was originally written by Joey Hess and Craig Small.[0;0m [0;31m-# As a special exception, when this file is copied by dh-make into a[0;0m [0;31m-# dh-make output file, you may use that output file without restriction.[0;0m [0;31m-# This special exception was added by Craig Small in version 0.37 of dh-make.[0;0m [0;0m [0;0m [0;0m # Uncomment this to turn on verbose mode.[0;0m [0;0m #export DH_VERBOSE=1[0;0m [0;0m [0;0m [0;31m-#DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)[0;0m [0;31m-#DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)[0;0m [0;31m-[0;0m [0;31m-#ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE))[0;0m [0;31m-#CROSS= --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)[0;0m [0;31m-#else[0;0m [0;31m-#CROSS= --build $(DEB_BUILD_GNU_TYPE)[0;0m [0;31m-#endif[0;0m [0;31m-[0;0m [0;31m-include /usr/share/hardening-includes/hardening.make[0;0m [0;31m-FLAGS=$(shell dpkg-buildflags --get CFLAGS)[0;0m [0;31m-LDFLAGS=$(shell dpkg-buildflags --get LDFLAGS)[0;0m [0;31m-CFLAGS+=$(HARDENING_CFLAGS)[0;0m [0;31m-LDFLAGS+=$(HARDENING_LDFLAGS)[0;0m [0;31m-[0;0m [0;32m+export DEB_BUILD_MAINT_OPTIONS = hardening=+all[0;0m [0;32m+export DEB_LDFLAGS_MAINT_APPEND = -Wl,-z,defs,--as-needed[0;0m [0;0m [0;0m [0;0m %:[0;0m [0;31m- dh $@ [7m --with autotools-dev[27m[0;0m [0;32m+ dh $@ [7m--without autoreconf[27m[0;0m [0;0m [0;0m [0;0m override_dh_auto_configure:[0;0m [0;31m- #[0;0m [0;31m- ./configure $(CROSS) \[0;0m [0;31m- --prefix=/usr \[0;0m [0;31m- --mandir=\$${prefix}/share/man \[0;0m [0;31m- --infodir=\$${prefix}/share/info \[0;0m [0;32m+ dh_auto_configure -- \[0;0m [0;0m --with-external-libupnp \[0;0m [0;0m --with-external-talloc \[0;0m [0;31m- CFLAGS="$(CFLAGS)" \[0;0m [0;31m- LDFLAGS="$(LDFLAGS) -Wl,-z,defs,--as-needed" \[0;0m [0;0m [0;0m [0;0m override_dh_auto_install:[0;0m [0;31m- [7m$(MAKE) DESTDIR=$(CURDIR)/debian/djmount [27minstall[0;0m [0;32m+ [7mdh_auto_[27minstall[0;0m [0;0m chrpath -d $(CURDIR)/debian/djmount/usr/bin/djmount[0;0m [0;31m- dh_install[0;0m [0;0m [0;0m [0;0m override_dh_auto_test:[0;0m [0;0m [0;0m
From 27b4c31cad7d805e5624eebb6589964d98a717ee Mon Sep 17 00:00:00 2001 From: Mattia Rizzolo <mat...@debian.org> Date: Tue, 27 Sep 2016 20:53:35 +0000 Subject: [PATCH 01/10] Use HTTPS for the Vcs-* fields. --- debian/control | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/control b/debian/control index 374fb18..a36f30c 100644 --- a/debian/control +++ b/debian/control @@ -5,8 +5,8 @@ Maintainer: Dario Minnucci <mid...@debian.org> Build-Depends: debhelper (>= 9), autotools-dev, libfuse-dev, libupnp-dev, libtalloc-dev, chrpath, hardening-includes Standards-Version: 3.9.4 Homepage: http://djmount.sourceforge.net/ -Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/djmount.git;a=summary -Vcs-Git: git://anonscm.debian.org/collab-maint/djmount.git +Vcs-Browser: https://anonscm.debian.org/git/collab-maint/djmount.git +Vcs-Git: https://anonscm.debian.org/git/collab-maint/djmount.git Package: djmount Architecture: any -- 2.9.3
From 977598fb2f2cfd4bd756ebea5da7671839ce5dd1 Mon Sep 17 00:00:00 2001 From: Mattia Rizzolo <mat...@debian.org> Date: Tue, 27 Sep 2016 20:55:45 +0000 Subject: [PATCH 02/10] Bump debhelper compat level to 10, so that dh_update_autotools_config is run, instead of the external addon dh_autotools-dev (but disable autoreconf) --- debian/compat | 2 +- debian/control | 2 +- debian/rules | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/compat b/debian/compat index ec63514..f599e28 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/debian/control b/debian/control index a36f30c..3a3183e 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: djmount Section: net Priority: extra Maintainer: Dario Minnucci <mid...@debian.org> -Build-Depends: debhelper (>= 9), autotools-dev, libfuse-dev, libupnp-dev, libtalloc-dev, chrpath, hardening-includes +Build-Depends: debhelper (>= 10), libfuse-dev, libupnp-dev, libtalloc-dev, chrpath, hardening-includes Standards-Version: 3.9.4 Homepage: http://djmount.sourceforge.net/ Vcs-Browser: https://anonscm.debian.org/git/collab-maint/djmount.git diff --git a/debian/rules b/debian/rules index 7683551..3b6763f 100755 --- a/debian/rules +++ b/debian/rules @@ -26,7 +26,7 @@ LDFLAGS+=$(HARDENING_LDFLAGS) %: - dh $@ --with autotools-dev + dh $@ --without autoreconf override_dh_auto_configure: # -- 2.9.3
From 6d2e7fec3d0b6e490813bd32376be407293808a3 Mon Sep 17 00:00:00 2001
From: Mattia Rizzolo <mat...@debian.org>
Date: Tue, 27 Sep 2016 21:00:45 +0000
Subject: [PATCH 03/10] Use dh_auto_configure instead of manually calling
./configure.
---
debian/rules | 22 +---------------------
1 file changed, 1 insertion(+), 21 deletions(-)
diff --git a/debian/rules b/debian/rules
index 3b6763f..5a98e6d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,23 +1,8 @@
#!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-#DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-#DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-
-#ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE))
-#CROSS= --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
-#else
-#CROSS= --build $(DEB_BUILD_GNU_TYPE)
-#endif
-
include /usr/share/hardening-includes/hardening.make
FLAGS=$(shell dpkg-buildflags --get CFLAGS)
LDFLAGS=$(shell dpkg-buildflags --get LDFLAGS)
@@ -29,14 +14,9 @@ LDFLAGS+=$(HARDENING_LDFLAGS)
dh $@ --without autoreconf
override_dh_auto_configure:
- #
- ./configure $(CROSS) \
- --prefix=/usr \
- --mandir=\$${prefix}/share/man \
- --infodir=\$${prefix}/share/info \
+ dh_auto_configure -- \
--with-external-libupnp \
--with-external-talloc \
- CFLAGS="$(CFLAGS)" \
LDFLAGS="$(LDFLAGS) -Wl,-z,defs,--as-needed" \
override_dh_auto_install:
--
2.9.3
From 2e0927df8d0d5f6c7422b236cacddb153d4072c2 Mon Sep 17 00:00:00 2001 From: Mattia Rizzolo <mat...@debian.org> Date: Tue, 27 Sep 2016 21:03:22 +0000 Subject: [PATCH 04/10] Stop using hardening-wrapper, make use of dpkg-buildflags with DEB_BUILD_MAINT_OPTIONS=hardening=+all instead Closes: #836753 --- debian/control | 2 +- debian/rules | 9 ++------- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/debian/control b/debian/control index 3a3183e..c6d3fff 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: djmount Section: net Priority: extra Maintainer: Dario Minnucci <mid...@debian.org> -Build-Depends: debhelper (>= 10), libfuse-dev, libupnp-dev, libtalloc-dev, chrpath, hardening-includes +Build-Depends: debhelper (>= 10), libfuse-dev, libupnp-dev, libtalloc-dev, chrpath Standards-Version: 3.9.4 Homepage: http://djmount.sourceforge.net/ Vcs-Browser: https://anonscm.debian.org/git/collab-maint/djmount.git diff --git a/debian/rules b/debian/rules index 5a98e6d..ae41f65 100755 --- a/debian/rules +++ b/debian/rules @@ -3,12 +3,8 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -include /usr/share/hardening-includes/hardening.make -FLAGS=$(shell dpkg-buildflags --get CFLAGS) -LDFLAGS=$(shell dpkg-buildflags --get LDFLAGS) -CFLAGS+=$(HARDENING_CFLAGS) -LDFLAGS+=$(HARDENING_LDFLAGS) - +export DEB_BUILD_MAINT_OPTIONS = hardening=+all +export DEB_LDFLAGS_MAINT_APPEND = -Wl,-z,defs,--as-needed %: dh $@ --without autoreconf @@ -17,7 +13,6 @@ override_dh_auto_configure: dh_auto_configure -- \ --with-external-libupnp \ --with-external-talloc \ - LDFLAGS="$(LDFLAGS) -Wl,-z,defs,--as-needed" \ override_dh_auto_install: $(MAKE) DESTDIR=$(CURDIR)/debian/djmount install -- 2.9.3
From 5b51208a4c5e79598ac8ca6192f833ecf02533ea Mon Sep 17 00:00:00 2001 From: Mattia Rizzolo <mat...@debian.org> Date: Tue, 27 Sep 2016 21:03:55 +0000 Subject: [PATCH 05/10] No need to manually call dh_install there Gbp-Dch: Ignore --- debian/rules | 1 - 1 file changed, 1 deletion(-) diff --git a/debian/rules b/debian/rules index ae41f65..cfe1b7a 100755 --- a/debian/rules +++ b/debian/rules @@ -17,7 +17,6 @@ override_dh_auto_configure: override_dh_auto_install: $(MAKE) DESTDIR=$(CURDIR)/debian/djmount install chrpath -d $(CURDIR)/debian/djmount/usr/bin/djmount - dh_install override_dh_auto_test: -- 2.9.3
From 2c58138f1cf59813843dbaea9bc6c581f7b65dff Mon Sep 17 00:00:00 2001 From: Mattia Rizzolo <mat...@debian.org> Date: Tue, 27 Sep 2016 21:04:36 +0000 Subject: [PATCH 06/10] Call dh_auto_install instead of manually calling `make install` --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index cfe1b7a..3c8dbfa 100755 --- a/debian/rules +++ b/debian/rules @@ -15,7 +15,7 @@ override_dh_auto_configure: --with-external-talloc \ override_dh_auto_install: - $(MAKE) DESTDIR=$(CURDIR)/debian/djmount install + dh_auto_install chrpath -d $(CURDIR)/debian/djmount/usr/bin/djmount override_dh_auto_test: -- 2.9.3
From 8e960440b76d6a8515adc67b3c12382a440fe26b Mon Sep 17 00:00:00 2001
From: Mattia Rizzolo <mat...@debian.org>
Date: Tue, 27 Sep 2016 21:09:07 +0000
Subject: [PATCH 07/10] Fix copyright-format 1.0 syntax
(dep5-copyright-license-name-not-unique) by moving GPL-2+ license text to a
standalone license paragraph.
---
debian/copyright | 14 +++-----------
1 file changed, 3 insertions(+), 11 deletions(-)
diff --git a/debian/copyright b/debian/copyright
index 6cf3932..d5104c2 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -9,18 +9,10 @@ Copyright: 2000-2003, Intel Corporation
2005, Dmitry Zakharov aka ChaoS <dmitr...@mail.ru>
2005-2006, Rémi Turboult <r...@users.sourceforge.net>
License: GPL-2+
- On Debian systems the full text of the GNU General Public
- License can be found in the `/usr/share/common-licenses/GPL-2'
- file.
-
Files: gl/*
Copyright: 1990-2005, Free Software Foundation, Inc
License: GPL-2+
- On Debian systems the full text of the GNU General Public
- License can be found in the `/usr/share/common-licenses/GPL-2'
- file.
-
Files: libupnp/*
Copyright: 2000-2003, Intel Corporation
@@ -52,7 +44,6 @@ License: BSD
OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
SUCH DAMAGE.
-
Files: talloc/*
Copyright: 2004-2005, Andrew Tridgell
License: LGPL-2+
@@ -60,10 +51,11 @@ License: LGPL-2+
License can be found in the `/usr/share/common-licenses/LGPL-2'
file.
-
Files: debian/*
Copyright: 2009-2012, Dario Minnucci <mid...@debian.org>
License: GPL-2+
- On Debian systems the full text of the GNU General Public
+
+License: GPL-2+
+ On Debian systems the full text of the GNU General Public
License can be found in the `/usr/share/common-licenses/GPL-2'
file.
--
2.9.3
From a8e23d88a8936445e204f8569dc0aedded138475 Mon Sep 17 00:00:00 2001
From: Mattia Rizzolo <mat...@debian.org>
Date: Tue, 27 Sep 2016 21:11:55 +0000
Subject: [PATCH 08/10] Fix copyright-format 1.0 syntax
(invalid-short-name-in-dep5-copyright) by renaming the name of the BSD
license from 'BSD' to 'BSD-3-Clauses'
---
debian/copyright | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/debian/copyright b/debian/copyright
index d5104c2..dcf6eaa 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -16,7 +16,7 @@ License: GPL-2+
Files: libupnp/*
Copyright: 2000-2003, Intel Corporation
-License: BSD
+License: BSD-3-Clause
Copyright (c) The Regents of the University of California.
All rights reserved.
.
--
2.9.3
From 923a29f69a96c38a747cb357e429d23491d4c62b Mon Sep 17 00:00:00 2001
From: Mattia Rizzolo <mat...@debian.org>
Date: Tue, 27 Sep 2016 21:13:45 +0000
Subject: [PATCH 09/10] Improve readibility of the copyright by moving the BSD
license text to a standalone license paragraph and moving all the file
paragraph to the top
Gbp-Dch: Ignore
---
debian/copyright | 24 +++++++++++++-----------
1 file changed, 13 insertions(+), 11 deletions(-)
diff --git a/debian/copyright b/debian/copyright
index dcf6eaa..266b3fe 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -17,6 +17,19 @@ License: GPL-2+
Files: libupnp/*
Copyright: 2000-2003, Intel Corporation
License: BSD-3-Clause
+
+Files: talloc/*
+Copyright: 2004-2005, Andrew Tridgell
+License: LGPL-2+
+ On Debian systems the full text of the GNU General Public
+ License can be found in the `/usr/share/common-licenses/LGPL-2'
+ file.
+
+Files: debian/*
+Copyright: 2009-2012, Dario Minnucci <mid...@debian.org>
+License: GPL-2+
+
+License: BSD-3-Clause
Copyright (c) The Regents of the University of California.
All rights reserved.
.
@@ -44,17 +57,6 @@ License: BSD-3-Clause
OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
SUCH DAMAGE.
-Files: talloc/*
-Copyright: 2004-2005, Andrew Tridgell
-License: LGPL-2+
- On Debian systems the full text of the GNU General Public
- License can be found in the `/usr/share/common-licenses/LGPL-2'
- file.
-
-Files: debian/*
-Copyright: 2009-2012, Dario Minnucci <mid...@debian.org>
-License: GPL-2+
-
License: GPL-2+
On Debian systems the full text of the GNU General Public
License can be found in the `/usr/share/common-licenses/GPL-2'
--
2.9.3
From e7c6824cd20244aff73bc50386042d97bce304f5 Mon Sep 17 00:00:00 2001 From: Mattia Rizzolo <mat...@debian.org> Date: Tue, 27 Sep 2016 21:16:09 +0000 Subject: [PATCH 10/10] Changelog for 0.71-7.1 --- debian/changelog | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/debian/changelog b/debian/changelog index c432918..6ffb6f1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,22 @@ +djmount (0.71-7.1) unstable; urgency=medium + + * Non-maintainer upload. + * Use HTTPS for the Vcs-* fields. + * Bump debhelper compat level to 10, so that dh_update_autotools_config is run + instead of the external addon dh_autotools-dev (but disable autoreconf). + * Use dh_auto_configure instead of manually calling ./configure. + * Call dh_auto_install instead of manually calling `make install`. + * Stop using hardening-wrapper, make use of dpkg-buildflags with + DEB_BUILD_MAINT_OPTIONS=hardening=+all + instead. Closes: #836753 + * Fix copyright-format 1.0 syntax. + + dep5-copyright-license-name-not-unique by moving GPL-2+ license text to a + standalone license paragraph. + + invalid-short-name-in-dep5-copyright by renaming the name of the BSD + license from 'BSD' to 'BSD-3-Clauses'. + + -- Mattia Rizzolo <mat...@debian.org> Tue, 27 Sep 2016 21:14:45 +0000 + djmount (0.71-7) unstable; urgency=medium * debian/patches: -- 2.9.3
signature.asc
Description: PGP signature
