[SCM] libgd-perl Debian packaging branch, master, updated. debian/1%2.46-3.1-160-gfbaad52

[Jonas Smedegaard]

The following commit has been merged in the master branch:
commit db8c4a559bea3b212eeb259ed40f58f5aa9e444e
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Mon Jun 24 22:11:22 2013 +0200

    Update changelog, control file and copyright hints.

diff --git a/debian/changelog b/debian/changelog
index dc1b29a..a64f538 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libgd-perl (1:2.49-1) UNRELEASED; urgency=low
+libgd-perl (2.49-1) UNRELEASED; urgency=low
 
   [ upstream ]
   * New release.
@@ -15,21 +15,31 @@ libgd-perl (1:2.49-1) UNRELEASED; urgency=low
   * Bump standards-version to 3.9.4.
 
   [ Vasudev Kamath ]
-  * Rename source package to libgd-perl. Provide/conflict/replace now
-    obsolete libgd-gd2-perl.
+  * Rename source package to libgd-perl.
   * Add myself as uploader.
   * Build-Depend on libgd2-dev (keeping libgd2-xpm-dev as fallback to
-    ease backporting.
+    ease backporting).
   * Relax to build-depend unversioned on debhelper: Needed version
     satisfied even in oldstable.
-  * Declare all cleanup in rules file (not partly in debhelper clean
-    hook).
+  * Declare all cleanup in rules file (stop use debhelper clean hook).
   * Drop makemaker-ccflags.patch: Adopted upstream.
 
   [ Jonas Smedegaard ]
   * Update README.source to emphasize control.in file as *not* a
     show-stopper for contributions, referring to wiki page for details.
   * Update Vcs-* URLs to reflect new source package libgd-perl.
+  * Update package relations:
+    + Build-depend on devscripts to check copyright unconditionally.
+    + Stop conflicting against libgd-noxpm-perl, libgd-perl,
+      libgd-gd1-perl or libgd-gd1-noxpm-perl: dropped before oldstable
+      (or for the latter two: never part of a Debian release).
+    + Provide/replace/break libgd-gd2-perl and libgd-gd2-noxpm-perl.
+  * Update copyright file:
+    + Rewrite using file format 1.0.
+    + Add git URL as alternate source.
+  * Drop legacy epoch from package version.
+  * Simplify watch file.
+  * Fix make find rules in rules file POSIX-compliant.
 
  -- Vasudev Kamath <kamathvasudev at gmail.com>  Tue, 14 May 2013 14:33:48 +0530
 
diff --git a/debian/control b/debian/control
index c527fbb..0d4c372 100644
--- a/debian/control
+++ b/debian/control
@@ -7,32 +7,28 @@ Uploaders: Jonas Smedegaard <dr at jones.dk>,
  Xavier Guimard <x.guimard at free.fr>,
  Vasudev Kamath <kamathvasudev at gmail.com>
 Build-Depends: cdbs,
+ devscripts,
  perl,
  debhelper,
  dh-buildinfo,
- libgd2-dev|libgd2-xpm-dev,
+ libgd2-dev | libgd2-xpm-dev,
  libjpeg-dev,
  libpng12-dev,
  libz-dev,
  libfreetype6-dev,
  libxpm-dev,
  libx11-dev
-Vcs-Git: git://anonscm.debian.org/git/pkg-perl/packages/libgd-gd2-perl
-Vcs-Browser: http://anonscm.debian.org/?p=pkg-perl/packages/libgd-gd2-perl.git
+Vcs-Git: git://anonscm.debian.org/pkg-perl/packages/libgd-perl
+Vcs-Browser: http://anonscm.debian.org/?p=pkg-perl/packages/libgd-perl.git
 Standards-Version: 3.9.4
 Homepage: http://search.cpan.org/dist/GD/
 
 Package: libgd-perl
 Architecture: any
 Depends: ${shlibs:Depends}, ${perl:Depends}, ${misc:Depends}
-Provides: libgd-gd2-perl
-Replaces: libgd-gd2-perl
-Conflicts: libgd-noxpm-perl,
- libgd-perl,
- libgd-gd1-perl,
- libgd-gd1-noxpm-perl,
- libgd-gd2-noxpm-perl,
- libgd-gd2-perl
+Provides: ${cdbs:Provides}
+Replaces: ${cdbs:Replaces}
+Conflicts: ${cdbs:Conflicts}
 Description: Perl module wrapper for libgd - gd2 variant
  This is a autoloadable interface module for libgd, a popular library
  for creating and manipulating PNG files.  With this library you can
@@ -54,6 +50,3 @@ Description: Perl module wrapper for libgd - gd2 variant
  .
  Included with the example code is the perl script qd.pl with QuickDraw
  routines for generating PICT2 files (used on Apple Macintosh).
- .
- This package is linked against libgd2, with Xpm (X pixmap)
- support.
diff --git a/debian/copyright_hints b/debian/copyright_hints
index affb5d4..8424f88 100644
--- a/debian/copyright_hints
+++ b/debian/copyright_hints
@@ -1,4 +1,4 @@
-Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?rev=174
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: FIXME
 Upstream-Contact: FIXME
 Source: FIXME
@@ -17,8 +17,11 @@ Files: ChangeLog
  debian/control
  debian/control.in
  debian/gbp.conf
+ debian/patches/disable-jpeg-test10.patch
+ debian/patches/pod-errors.patch
+ debian/patches/series
  debian/source/format
- debian/source/local-options
+ debian/source/include-binaries
  debian/watch
  demos/brushes.pl
  demos/copies.pl
@@ -50,13 +53,13 @@ License: UNKNOWN
 Files: GD/Polygon.pm
  GD/Simple.pm
 Copyright: 1995-2005, Lincoln D. Stein. It is
- 2004, Lincoln D. Stein. It is
+  2004, Lincoln D. Stein. It is
 License: UNKNOWN
  FIXME
 
 Files: debian/rules
-Copyright: 2003-2008, 2010-2011, Jonas Smedegaard <dr at jones.dk>
-License: GPL
+Copyright: 2002-2008, 2010-2011, 2013
+License: GPL-3+
  FIXME
 
 Files: bdf_scripts/bdftogd
@@ -66,7 +69,7 @@ License: UNKNOWN
 
 Files: bdf_scripts/bdf2gdfont.PLS
 Copyright: 2004, Cold Spring Harbor Laboratory
- = $value; }
+  = $value; }
 License: UNKNOWN
  FIXME
 
@@ -77,7 +80,7 @@ License: UNKNOWN
 
 Files: GD/Image.pm.PLS
 Copyright: 1995, Lincoln D. Stein. See accompanying README file for
- 1995-2005, Lincoln D. Stein. It is
+  1995-2005, Lincoln D. Stein. It is
 License: UNKNOWN
  FIXME
 
@@ -88,7 +91,7 @@ License: UNKNOWN
 
 Files: GD.pm
 Copyright: 1995, Lincoln D. Stein. See accompanying README file for
- 1995-2010, Lincoln D. Stein. This
+  1995-2010, Lincoln D. Stein. This
 License: UNKNOWN
  FIXME
 

-- 
libgd-perl Debian packaging