mergeHEADdebian/1.7.1+repack-2master

6 files changed, 53 insertions, 37 deletions

diff --git a/debian/README.source b/debian/README.source
index e4f2b3d..4732fae 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -10,7 +10,7 @@ Please upload unattended uploads use a branch feature/<your title>.
 
 Many thanks.
 
- -- Jörg Frings-Fürst <debian@jff-webhosting.net>  Fri, 02 Jun 2017 19:00:40 +0200
+ -- Jörg Frings-Fürst <debian@jff.email>  Sun, 08 Jul 2018 22:36:22 +0200
 
 [1] http://nvie.com/posts/a-successful-git-branching-model/
 [2] https://github.com/petervanderdoes/gitflow-avh
diff --git a/debian/changelog b/debian/changelog
index e250071..b828bc1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,14 +1,27 @@
-gcstar (1.7.1+repack-2) UNRELEASED; urgency=medium
+gcstar (1.7.1+repack-2) unstable; urgency=medium
 
-  * New README.source to explain the branching model used.
-  * Change to my new mail address:
-    - debian/control,
-    - debian/copyright
-  * Declare compliance with Debian Policy 4.1.2.0. (No changes needed).
   * debian/control:
-    - Add libdate-calc-perl and libgd-graph-perl to Depends.
+    - Switch Vcs-* to new loacation.
+  * Change to my new mail address.
+  * Declare compliance with Debian Policy 4.1.5 (no changes required).
+  * Migrate to debhelper 11:
+    - Change debian/compat to 11.
+    - Bump minimum debhelper version in debian/control to >= 11.
+  * Remove trailing whitespaces from
+    - debian/changelog
+    - debian/control
+    - debian/rules
+  * debian/copyright:
+    - Use secure URI for the copyright format.
+    - Add year 2018 for packaging.
+  * Add missing perl module to Depends (Closes: #892568, #903298):
+    - libdate-calc-perl
+    - libgd-graph-perl
+    - libgd-text-perl
+    - liblocale-codes-perl
+  * New README.source to explain the branching model used.
 
- -- Jörg Frings-Fürst <debian@jff.email>  Sun, 17 Dec 2017 17:36:22 +0100
+ -- Jörg Frings-Fürst <debian@jff.email>  Sun, 08 Jul 2018 22:46:40 +0200
 
 gcstar (1.7.1+repack-1) unstable; urgency=medium
 
@@ -90,7 +103,7 @@ gcstar (1.7.0-1) unstable; urgency=medium
     - 13-fix_musicbrainz.patch
     - 14-fix_imdb.patch
     - 16-fix_isbndb_plugin.patch
-      Thanks to 
+      Thanks to
         Marc Deslauriers <marc.deslauriers@canonical.com> and
         David Weinehall <tao@acc.umu.se>
   * Remove useless:
@@ -104,7 +117,7 @@ gcstar (1.6.2-1) unstable; urgency=low
 
   * [0a00985] Imported Upstream version 1.6.2
     (Closes: #636168)
-    - Fix imdb plugin (Closes: #630729) 
+    - Fix imdb plugin (Closes: #630729)
   * [2968bd2] Add missing build-targets to rules file
 
  -- Alexander Wirt <formorer@debian.org>  Tue, 09 Aug 2011 08:44:08 +0200
@@ -125,10 +138,10 @@ gcstar (1.6.1-1) unstable; urgency=low
 gcstar (1.5.0-1) unstable; urgency=low
 
   * New upstream release
-    - Renaming of items is fixed (Closes: #356605) 
+    - Renaming of items is fixed (Closes: #356605)
   * Bump standards version
-  * Remove dh_desktop, dh_clean -k 
-  * Add dh_lintian 
+  * Remove dh_desktop, dh_clean -k
+  * Add dh_lintian
   * Add README.source
   * Take sure the package is source 1.0 in the future
   * Integrate the packaging suggestions from Nyall Dawson (Closes: #549676)
@@ -150,19 +163,19 @@ gcstar (1.4.3-1) unstable; urgency=low
   * remove 10-fix-storable-crash.dpatch (fixed upstream)
   * adapt 01-set_usr_lib.dpatch
   * adapt 07_fix_manpath.dpatch
-  * add 11_fix_allocine_plugin.dpatch: 
-    updated GCAllocine.pm module from upstream SVN 
+  * add 11_fix_allocine_plugin.dpatch:
+    updated GCAllocine.pm module from upstream SVN
 
   [ Alexander Wirt ]
-  * Bump standards version 
-  * Update copyright file 
-  * Call dh_desktop from rules file 
+  * Bump standards version
+  * Update copyright file
+  * Call dh_desktop from rules file
 
  -- Alexander Wirt <formorer@debian.org>  Sun, 22 Mar 2009 11:46:48 +0100
 
 gcstar (1.3.2-2) unstable; urgency=low
 
-  * Really activate 10-fix-storable-crash.dpatch this time.  
+  * Really activate 10-fix-storable-crash.dpatch this time.
 
  -- Alexander Wirt <formorer@debian.org>  Mon, 12 Jan 2009 22:22:47 +0100
 
@@ -193,16 +206,16 @@ gcstar (1.3.1-1) unstable; urgency=low
 
 gcstar (1.2.2-1) unstable; urgency=low
 
-  * Update menu icon 
+  * Update menu icon
   * New upstream release
   * Backported desktop file from cvs
-  * Removed 05_fix_xml_enoding (fixed upstream) 
+  * Removed 05_fix_xml_enoding (fixed upstream)
 
  -- Alexander Wirt <formorer@debian.org>  Fri, 21 Sep 2007 13:59:27 +0200
 
 gcstar (1.2.0-1) unstable; urgency=low
 
-  * New upstream release 
+  * New upstream release
     - Fixes HTML output (Closes: #419791)
   * Updated 03_change_default_browser.dpatch
   * Removed 08_cvs_imdbplugin and 04_dont_check_permissions (adopted by
@@ -214,7 +227,7 @@ gcstar (1.2.0-1) unstable; urgency=low
 
 gcstar (1.1.1-2) unstable; urgency=low
 
-  * Backport imdb plugin from cvs (Closes: #419792) 
+  * Backport imdb plugin from cvs (Closes: #419792)
 
  -- Alexander Wirt <formorer@debian.org>  Wed, 18 Apr 2007 07:51:20 +0200
 
@@ -245,7 +258,7 @@ gcstar (0.5.0-1) unstable; urgency=low
 
 gcstar (0.4.1-2) unstable; urgency=low
 
-  * Add libxml-parser-perl and libxml-simple-perl to build deps 
+  * Add libxml-parser-perl and libxml-simple-perl to build deps
     (Closes:  #396887)
 
  -- Alexander Wirt <formorer@debian.org>  Fri,  3 Nov 2006 15:58:04 +0100
@@ -255,4 +268,3 @@ gcstar (0.4.1-1) unstable; urgency=low
   * Initial release (Closes: #381669)
 
  -- Alexander Wirt <formorer@debian.org>  Sat,  9 Jul 2005 17:26:18 +0200
-
diff --git a/debian/compat b/debian/compat
index f599e28..b4de394 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-10
+11
diff --git a/debian/control b/debian/control
index b3354f0..da71175 100644
--- a/debian/control
+++ b/debian/control
@@ -7,24 +7,26 @@ Build-Depends-Indep:
  libdate-calc-perl,
  libdatetime-format-strptime-perl,
  libgd-graph-perl,
+ libgd-text-perl,
  libgtk2-perl,
+ liblocale-codes-perl,
  libmp3-info-perl,
  libmp3-tag-perl,
  libnet-freedb-perl,
  libogg-vorbis-header-pureperl-perl,
  libwww-perl,
  libxml-parser-perl,
- libxml-simple-perl,
+ libxml-simple-perl
 Build-Depends:
- debhelper (>= 10)
-Standards-Version: 4.1.2.0
+ debhelper (>= 11)
+Standards-Version: 4.1.5
 Homepage: http://www.gcstar.org/
-Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/gcstar.git
-Vcs-Git: https://anonscm.debian.org/git/collab-maint/gcstar.git
+Vcs-Git: git://jff.email/opt/git/gcstar.git
+Vcs-Browser: https://jff.email/cgit/gcstar.git/
 
 Package: gcstar
 Architecture: all
-Depends: 
+Depends:
  ${misc:Depends},
  ${perl:Depends},
  fonts-liberation,
@@ -32,7 +34,9 @@ Depends:
  libarchive-zip-perl,
  libdate-calc-perl,
  libgd-graph-perl,
+ libgd-text-perl,
  libgtk2-perl,
+ liblocale-codes-perl,
  libmp3-tag-perl,
  libogg-vorbis-header-pureperl-perl,
  libwww-perl,
diff --git a/debian/copyright b/debian/copyright
index b039e4f..eeb680f 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,4 +1,4 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: gcstar
 Upstream-Contact: Tian <tian@c-sait.net>
 Source: http://www.gcstar.org/
@@ -23,8 +23,8 @@ Copyright: 2006      Kevin Krammer <kevin.krammer@gmx.at>
 License: Expat
 
 Files: debian/*
-Copyright: 2006-2011 Alexander Wirt <formorer@debian.org>
-           2014-2017 Jörg Frings-Fürst <debian@jff.email>
+Copyright: 2006-2011 Alexander Wirt <formorer@debian.org> 
+           2014-2018 Jörg Frings-Fürst <debian@jff.email>
 License: GPL-3+
 
 License: GPL-2+
diff --git a/debian/rules b/debian/rules
index 849e8b9..3a2690c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,7 +9,7 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
 
 %:
-	dh $@ 
+	dh $@
 
 override_dh_install:
 	dh_install