Use the GPL from base-files in About (closes Debian #791553)

6 files changed, 24 insertions, 4 deletions

diff --git a/debian/changelog b/debian/changelog
index 00ed0d2..d2c5686 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,8 +6,9 @@ transmission-remote-gtk (1.1.1-2) unstable; urgency=low
   * Import upstream patch to have 'make test' work again.
   * Import upstream patch to add keywords to .desktop file (fixes a
     Lintian warning).
+  * Use base-files’ copy of the GPL in the about box (closes: #791553).
 
- -- Benjamin Barenblat <bbaren@mit.edu>  Tue, 25 Nov 2014 17:58:21 -0500
+ -- Benjamin Barenblat <bbaren@mit.edu>  Sun, 26 Jul 2015 18:11:58 -0400
 
 transmission-remote-gtk (1.1.1-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 5cf0e59..7e18697 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,8 @@ Section: net
 Priority: optional
 Maintainer: Benjamin Barenblat <bbaren@mit.edu>
 Build-Depends:
- autotools-dev,
  debhelper (>= 9.0.0),
+ dh-autoreconf,
  intltool (>= 0.35.0),
  libappindicator3-dev,
  libcurl4-gnutls-dev | libcurl-ssl-dev,
diff --git a/debian/copyright b/debian/copyright
index 0c3cc49..bffe8b1 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -102,7 +102,7 @@ License: FSF-GPL2
  of this license document, but changing it is not allowed.
 
 Files: debian/*
-Copyright: 2013, 2014 Benjamin Barenblat <bbaren@mit.edu>
+Copyright: 2013, 2014, 2015 Benjamin Barenblat <bbaren@mit.edu>
 License: GPL-2+
 
 Files: install-sh
diff --git a/debian/patches/series b/debian/patches/series
index 9aeeb98..9c52550 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 updatePOTFILES.in.diff
 addDesktopKeywords.diff
+useBaseFilesLicensePath.diff
diff --git a/debian/patches/useBaseFilesLicensePath.diff b/debian/patches/useBaseFilesLicensePath.diff
new file mode 100644
index 0000000..79d7214
--- /dev/null
+++ b/debian/patches/useBaseFilesLicensePath.diff
@@ -0,0 +1,15 @@
+Description: Use correct path for GPL
+Bug-Debian: https://bugs.debian.org/791553
+Forwarded: not-needed
+Author: Benjamin Barenblat <bbaren@mit.edu>
+--- a/configure.ac
++++ b/configure.ac
+@@ -52,7 +52,7 @@ AM_CONDITIONAL([WIN32], test "$WIN32" =
+ CFLAGS="$CFLAGS -IC:/MinGW/msys/1.0/include"
+ #endif
+ 
+-trglicense='${docdir}-$(PACKAGE_VERSION)/COPYING'
++trglicense='/usr/share/common-licenses/GPL-2'
+ AC_SUBST(trglicense)
+ GETTEXT_PACKAGE=AC_PACKAGE_NAME
+ AC_SUBST(GETTEXT_PACKAGE)
diff --git a/debian/rules b/debian/rules
index 039bd78..d51c02b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,7 +12,10 @@
 export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
 
 %:
-	dh $@  --with autotools-dev
+	dh $@  --with autoreconf
+
+override_dh_autoreconf:
+	dh_autoreconf sh -- autogen.sh
 
 override_dh_auto_configure:
 	dh_auto_configure -- --disable-silent-rules