[libgd-gd2-perl] 01/02: Imported Debian patch 2.49-1
Daniel Lintott
dlintott-guest at moszumanska.debian.org
Thu Feb 27 21:57:12 UTC 2014
This is an automated email from the git hooks/post-receive script.
dlintott-guest pushed a commit to branch master
in repository libgd-gd2-perl.
commit 61149991ab3e5eb7b15b0fb3478caaba378b9150
Author: Jonas Smedegaard <dr at jones.dk>
Date: Mon Jun 24 22:14:09 2013 +0200
Imported Debian patch 2.49-1
---
debian/changelog | 57 +++++++++++++++++++++++++++++++++---------------
debian/control | 21 ++++++------------
debian/control.in | 18 +++++----------
debian/copyright | 59 ++++++++++++++++++++++++++++----------------------
debian/copyright_hints | 19 +++++++++-------
debian/rules | 40 +++++++++++++++++++---------------
debian/watch | 5 +----
7 files changed, 118 insertions(+), 101 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 0229d0e..be98681 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,27 +1,48 @@
-libgd-perl (1:2.49-1) UNRELEASED; urgency=low
+libgd-perl (2.49-1) unstable; urgency=low
+
+ [ upstream ]
+ * New release.
+
+ [ Gregor Hermann ]
+ * Remove debian/source/local-options: abort-on-upstream-changes and
+ unapply-patches are default in dpkg-source since 1.16.1.
[ Salvatore Bonaccorso ]
- * Change Vcs-Git to canonical URI (git://anonscm.debian.org)
+ * Use canonical host (anonscm.debian.org) in Vcs-Git URI.
[ Xavier Guimard ]
- * Add licenses texts to remove missing-license-text-in-dep5-copyright warning
- * Report previous changes from d/control to d/control.in
- * Report replacement of libjpeg62-dev to libjpeg-dev in cdbs dependencies
+ * Use canonical host (anonscm.debian.org) in Vcs-Browser URI.
+ * Bump standards-version to 3.9.4.
[ Vasudev Kamath ]
- * Imported new upstream version 2.49.
- * Package renamed to libgd-perl and added Provides Replaces and
- Conflicts on libgd-gd2-perl.
- * Added myself to Uploaders field.
- * Build-Depends on libgd2-dev|libgd2-xpm-dev for libgd2-dev transition.
- * Remove bdf_scripts/bdf2gdfont.pl Makefile.old files in clean hook.
- * Removed makemaker-ccflags.patch as it has been merged by upstream.
-
- [ Axel Beckert ]
- * debian/copyright: migrate pre-1.0 format to 1.0 using "cme fix dpkg-
- copyright"
-
- -- Vasudev Kamath <kamathvasudev at gmail.com> Tue, 14 May 2013 14:33:48 +0530
+ * Rename source package to libgd-perl.
+ * Add myself as uploader.
+ * Build-Depend on libgd2-dev (keeping libgd2-xpm-dev as fallback to
+ ease backporting).
+ * Relax to build-depend unversioned on debhelper: Needed version
+ satisfied even in oldstable.
+ * 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.
+ * Stop tracking md5sum of upstream tarball.
+
+ -- Jonas Smedegaard <dr at jones.dk> Mon, 24 Jun 2013 22:14:09 +0200
libgd-gd2-perl (1:2.46-3.1) unstable; urgency=low
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/control.in b/debian/control.in
index 59016b3..a509370 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -7,22 +7,17 @@ Uploaders: Jonas Smedegaard <dr at jones.dk>,
Xavier Guimard <x.guimard at free.fr>,
Vasudev Kamath <kamathvasudev at gmail.com>
Build-Depends: @cdbs@
-Vcs-Git: git://anonscm.debian.org/pkg-perl/packages/libgd-gd2-perl.git
-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
@@ -44,6 +39,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 b/debian/copyright
index f04d488..6f6fa21 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,10 +2,14 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: GD
Upstream-Contact: Lincoln D. Stein <lstein at cshl.org>
Source: http://search.cpan.org/dist/GD/
+ git://github.com/lstein/Perl-GD
Files: *
Copyright: 1995-2010, Lincoln D. Stein
License: Artistic-2.0 or GPL-1+
+Comment:
+ License:
+ .
The GD.pm interface is copyright 1995-2010, Lincoln D. Stein. This
package and its accompanying libraries is free software; you can
redistribute it and/or modify it under the terms of the GPL (either
@@ -19,23 +23,21 @@ License: Artistic or GPL-1+
Files: GD/Polyline.pm
Copyright: 2002, Daniel J. Harasty
License: Artistic or GPL-1+
+Comment:
+ License:
+ .
The Polyline.pm module is copyright 2002, Daniel J. Harasty. It is
distributed under the same terms as Perl itself. See the "Artistic
License" in the Perl source code distribution for licensing terms.
-Comment:
- Perl is licensed under either the Artistic license or the GNU General
- Public License, version 1 or later.
+ .
+ Comment:
+ .
+ Perl is licensed under either the "Artistic license" or the "GNU
+ General Public License" version 1 or later.
Files: debian/*
-Copyright: 2003-2008,2010-2011, Jonas Smedegaard <dr at jones.dk>
-License: GPL-2+
-
-License: Artistic
- This program is free software; you can redistribute it and/or modify
- it under the terms of the Artistic License, which comes with Perl.
-Comment:
- On Debian systems the Artistic License is located in
- '/usr/share/common-licenses/Artistic'.
+Copyright: 2003-2008,2010-2011,2013, Jonas Smedegaard <dr at jones.dk>
+License: GPL-3+
License: Artistic-2.0
Artistic License 2.0
@@ -216,28 +218,33 @@ License: Artistic-2.0
INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING IN ANY WAY OUT OF THE USE
OF THE PACKAGE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+License: Artistic
+ Comment:
+ .
+ On Debian systems the "Artistic License" is located in
+ '/usr/share/common-licenses/Artistic'.
+
License: GPL-1+
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 1, or (at your option)
- any later version.
-Comment:
- On Debian systems the GNU General Public License (GPL) version 1 is
- located in '/usr/share/common-licenses/GPL-1'.
+ Comment:
+ .
+ On Debian systems the "GNU General Public License" version 1 is located
+ in '/usr/share/common-licenses/GPL-1'.
-License: GPL-2+
+License: GPL-3+
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
- Free Software Foundation; either version 2, or (at your option) any
+ Free Software Foundation; either version 3, or (at your option) any
later version.
.
This program is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
-Comment:
- On Debian systems the GNU General Public License (GPL) version 2 is
- located in '/usr/share/common-licenses/GPL-2'.
.
- You should have received a copy of the GNU General Public License along
- with this program. If not, see <http://www.gnu.org/licenses/>.
+ Comment:
+ .
+ On Debian systems the "GNU General Public License" version 3 is located
+ in '/usr/share/common-licenses/GPL-3'.
+ .
+ You should have received a copy of the "GNU General Public License"
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
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
diff --git a/debian/rules b/debian/rules
index cfc46e2..f8b24fa 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,11 +1,12 @@
#!/usr/bin/make -f
# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003-2008, 2010-2011 Jonas Smedegaard <dr at jones.dk>
+# Copyright © 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2010, 2011, 2013
+# Jonas Smedegaard <dr at jones.dk>
# Description: Main Debian packaging script for GD
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
+# the Free Software Foundation; either version 3, or (at your option)
# any later version.
#
# This program is distributed in the hope that it will be useful, but
@@ -16,40 +17,43 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
--include /usr/share/cdbs/1/rules/upstream-tarball.mk
--include /usr/share/cdbs/1/rules/utils.mk
+include /usr/share/cdbs/1/rules/upstream-tarball.mk
+include /usr/share/cdbs/1/rules/utils.mk
include /usr/share/cdbs/1/class/perl-makemaker.mk
include /usr/share/cdbs/1/rules/debhelper.mk
-# Silence optional build-dependencies to ease backporting
-CDBS_BUILD_DEPENDS_rules_upstream-tarball =
-CDBS_BUILD_DEPENDS_rules_utils_copyright-check =
+pkg = $(DEB_SOURCE_PACKAGE)
DEB_UPSTREAM_PACKAGE = GD
DEB_UPSTREAM_URL = http://www.cpan.org/modules/by-authors/id/LDS/
-DEB_UPSTREAM_TARBALL_MD5 = c58b6556bddbe147c41f4e17a0de9bea
+
+# Needed by upstream build process
+CDBS_BUILD_DEPENDS +=, libgd2-dev | libgd2-xpm-dev, libjpeg-dev
+CDBS_BUILD_DEPENDS +=, libpng12-dev, libz-dev, libfreetype6-dev
+CDBS_BUILD_DEPENDS +=, libxpm-dev, libx11-dev
+
+# Transitional quirk: libgd-gd2-perl and libgd-gd2-noxpm-perl merged
+# TODO: drop after Jessie+1 (was introduced before Jessie)
+CDBS_PROVIDES_$(pkg) = libgd-gd2-perl, libgd-gd2-noxpm-perl
+oldpkgs-versioned = libgd-gd2-perl (<= 1:2.46-3.1), libgd-gd2-noxpm-perl (<= 1:2.46-2.1)
+CDBS_BREAKS_$(pkg) = $(oldpkgs-versioned)
+CDBS_REPLACES_$(pkg) = $(oldpkgs-versioned)
# Suppress some graphics (in addition to default stuff)
DEB_COPYRIGHT_CHECK_IGNORE_REGEX = ^(demos/font_list\.png|t/test.out.*|debian/(changelog|copyright(|_hints|_newhints)))$
DEB_INSTALL_DOCS_ALL += README.unix README.QUICKDRAW
DEB_INSTALL_EXAMPLES_ALL = demos bdf_scripts qd.pl
-DEB_INSTALL_EXAMPLES_libgd-gd2-perl = $(DEB_INSTALL_EXAMPLES_ALL)
-DEB_INSTALL_EXAMPLES_libgd-gd2-noxpm-perl = $(DEB_INSTALL_EXAMPLES_ALL)
# qd.pl and bdf2gdfont.pl are installed as example scripts instead
-common-binary-post-install-arch::
- find "$(DEB_DESTDIR)" -type f -and '(' -name '*qd.pl*' -or -name '*bdf2gdfont.pl*' ')' -and -not -path '*/usr/share/doc/*' -exec rm -r '{}' ';'
+binary-post-install/$(pkg)::
+ find "$(DEB_DESTDIR)" -type f '(' -name '*qd.pl*' -or -name '*bdf2gdfont.pl*' ')' '!' -path '*/usr/share/doc/*' -delete
# Remove stray empty dirs (due to MakeMaker stupidity and above cleanup)
-common-binary-post-install-arch::
- find "$(DEB_DESTDIR)" -empty -depth -exec rm -rf '{}' ';'
+binary-post-install/$(pkg)::
+ find "$(DEB_DESTDIR)" -depth -type d -empty -delete
find "$(DEB_DESTDIR)" -type f -exec sed -i 's,/usr/local/bin/perl,/usr/bin/perl,' '{}' ';'
# Manually clean leftovers
clean::
rm -f GD.html pod2html* pod2htmd.tmp pod2htmi.tmp .config.cache GD/Image.pm bdf_scripts/bdf2gdfont.pl Makefile.old
-
-
-# Needed for by upstream build process
-CDBS_BUILD_DEPENDS += , libgd2-dev|libgd2-xpm-dev, libjpeg-dev, libpng12-dev, libz-dev, libfreetype6-dev, libxpm-dev, libx11-dev
diff --git a/debian/watch b/debian/watch
index 3fc6aa1..cf27ad6 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,6 +1,3 @@
# Run the "uscan" command to check for upstream updates and more.
version=3
-opts="uversionmangle=s/(\d)\.(\d{2})(\d+)/$1.$2.$3/" \
- http://www.cpan.org/modules/by-module/GD/GD-([\d\.]+)\.tar\.gz
-opts="uversionmangle=s/(\d)\.(\d{2})(\d+)/$1.$2.$3/" \
- http://search.cpan.org/dist/GD/ .*/GD-([\d\.]+)\.tar\.gz
+http://search.cpan.org/dist/GD/ .*/GD-([\d.]+)\.tar\.gz
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libgd-gd2-perl.git
More information about the Pkg-perl-cvs-commits
mailing list