--- Begin Message ---
Package: goocanvas
Severity: wishlist
Tags: patch
Hi,
The dpatch patch management system has been deprecated for some time. The
Lintian currently flags use of dpatch packages as an error. The new 3.0
packaging format is an improved version which, among other things, contains
patch management built-in. For more information, see:
http://wiki.debian.org/Projects/DebSrc3.0
I had some free time; see attached patch to migrate to new package
format. Note that all files in debian/patches/* are canocalized to
*.patch.
Let me know if there is anything that needs adjusting or if it is ok
to upload this version in a NMU in case you are working on other
issues needing attention.
Thanks,
Jari
>From 919935149f14ea01b4bb7c38eb03d86a9fabb883 Mon Sep 17 00:00:00 2001
From: Jari Aalto <[email protected]>
Date: Sat, 28 Apr 2012 09:11:06 +0300
Subject: [PATCH] format-3.0
Organization: Private
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 8bit
Signed-off-by: Jari Aalto <[email protected]>
---
debian/README.source | 4 -
debian/changelog | 10 +
debian/compat | 2 +-
debian/control | 4 +-
debian/copyright | 2 +-
debian/patches/00list | 1 -
...0_relibtoolize.dpatch => 10-relibtoolize.patch} | 219 +-------------------
debian/patches/series | 1 +
debian/rules | 5 +-
debian/source/format | 2 +-
10 files changed, 22 insertions(+), 228 deletions(-)
delete mode 100644 debian/README.source
delete mode 100644 debian/patches/00list
rename debian/patches/{10_relibtoolize.dpatch => 10-relibtoolize.patch} (99%)
create mode 100644 debian/patches/series
diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index 3ab4713..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,4 +0,0 @@
-This package uses dpatch to patch the upstream source.
-Please see /usr/share/doc/dpatch/README.source.gz for details.
-
- -- Jeffrey Ratcliffe <[email protected]>, Thu, 6 May 2010 22:05:47 +0200
diff --git a/debian/changelog b/debian/changelog
index 549f0fe..65a212c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+goocanvas (0.15-1.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Remove deprecated dpatch and upgrade to packaging format "3.0 quilt".
+ * Update to Standards-Version to 3.9.3 and debhelper to 9.
+ * Fix copyright-refers-to-symlink-license (Lintian).
+ * Patch 10: delete config.guess and config.sub; handled by rules file.
+
+ -- Jari Aalto <[email protected]> Sat, 28 Apr 2012 09:10:33 +0300
+
goocanvas (0.15-1) unstable; urgency=low
[ Jeffrey Ratcliffe ]
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+9
diff --git a/debian/control b/debian/control
index a236a9d..b329682 100644
--- a/debian/control
+++ b/debian/control
@@ -1,8 +1,8 @@
Source: goocanvas
Priority: optional
Maintainer: Jose Carlos Garcia Sogo <[email protected]>
-Build-Depends: cdbs, debhelper (>= 5), dpkg-dev (>= 1.13.19), libglib2.0-dev (>= 2.10), libgtk2.0-dev (>= 2.12), dpatch, autotools-dev, gtk-doc-tools
-Standards-Version: 3.8.4
+Build-Depends: cdbs, debhelper (>= 9), libglib2.0-dev (>= 2.10), libgtk2.0-dev (>= 2.12), autotools-dev, gtk-doc-tools
+Standards-Version: 3.9.3
Section: libs
Vcs-Git: git://git.debian.org/git/users/jsogo/goocanvas.git
Vcs-Browser: http://git.debian.org/git/users/jsogo/goocanvas.git
diff --git a/debian/copyright b/debian/copyright
index fa3feeb..5a6c1ed 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -34,5 +34,5 @@ On Debian systems, the full text of the LGPL can be found in
The Debian packaging is copyright 2006, Sebastien Bacher <[email protected]>,
copyright 2007, Jose Carlos Garcia Sogo <[email protected]> and
-is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
+is licensed under the GPL, see `/usr/share/common-licenses/GPL-2'.
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 42a666e..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1 +0,0 @@
-10_relibtoolize
diff --git a/debian/patches/10_relibtoolize.dpatch b/debian/patches/10-relibtoolize.patch
similarity index 99%
rename from debian/patches/10_relibtoolize.dpatch
rename to debian/patches/10-relibtoolize.patch
index 0dc40b0..5d50987 100644
--- a/debian/patches/10_relibtoolize.dpatch
+++ b/debian/patches/10-relibtoolize.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 10_relibtoolize.dpatch by Chris Coulson <[email protected]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+From: Chris Coulson <[email protected]>
+Subject: No description.
-@DPATCH@
diff -urNad goocanvas-0.15~/Makefile.in goocanvas-0.15/Makefile.in
--- goocanvas-0.15~/Makefile.in 2009-06-29 16:22:23.000000000 +0100
+++ goocanvas-0.15/Makefile.in 2009-07-28 20:46:48.852837288 +0100
@@ -11173,107 +11169,6 @@ diff -urNad goocanvas-0.15~/aclocal.m4 goocanvas-0.15/aclocal.m4
AC_DEFUN([_AM_SUBST_NOTMAKE])
diff -urNad goocanvas-0.15~/config.guess goocanvas-0.15/config.guess
---- goocanvas-0.15~/config.guess 2007-08-29 12:52:51.000000000 +0100
-+++ goocanvas-0.15/config.guess 2009-07-28 20:46:43.970296197 +0100
-@@ -1,10 +1,10 @@
- #! /bin/sh
- # Attempt to guess a canonical system name.
- # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
--# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
--# Inc.
-+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
-+# Free Software Foundation, Inc.
-
--timestamp='2007-05-17'
-+timestamp='2008-01-23'
-
- # This file is free software; you can redistribute it and/or modify it
- # under the terms of the GNU General Public License as published by
-@@ -56,8 +56,8 @@
- GNU config.guess ($timestamp)
-
- Originally written by Per Bothner.
--Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
--Free Software Foundation, Inc.
-+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
-
- This is free software; see the source for copying conditions. There is NO
- warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-@@ -330,7 +330,7 @@
- sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
- echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
- exit ;;
-- i86pc:SunOS:5.*:* | ix86xen:SunOS:5.*:*)
-+ i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
- echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
- exit ;;
- sun4*:SunOS:6*:*)
-@@ -532,7 +532,7 @@
- echo rs6000-ibm-aix3.2
- fi
- exit ;;
-- *:AIX:*:[45])
-+ *:AIX:*:[456])
- IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
- if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
- IBM_ARCH=rs6000
-@@ -793,12 +793,15 @@
- exit ;;
- *:Interix*:[3456]*)
- case ${UNAME_MACHINE} in
-- x86)
-+ x86)
- echo i586-pc-interix${UNAME_RELEASE}
- exit ;;
- EM64T | authenticamd)
- echo x86_64-unknown-interix${UNAME_RELEASE}
- exit ;;
-+ IA64)
-+ echo ia64-unknown-interix${UNAME_RELEASE}
-+ exit ;;
- esac ;;
- [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
- echo i${UNAME_MACHINE}-pc-mks
-@@ -833,7 +836,14 @@
- echo ${UNAME_MACHINE}-pc-minix
- exit ;;
- arm*:Linux:*:*)
-- echo ${UNAME_MACHINE}-unknown-linux-gnu
-+ eval $set_cc_for_build
-+ if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
-+ | grep -q __ARM_EABI__
-+ then
-+ echo ${UNAME_MACHINE}-unknown-linux-gnu
-+ else
-+ echo ${UNAME_MACHINE}-unknown-linux-gnueabi
-+ fi
- exit ;;
- avr32*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
-@@ -954,8 +964,8 @@
- x86_64:Linux:*:*)
- echo x86_64-unknown-linux-gnu
- exit ;;
-- xtensa:Linux:*:*)
-- echo xtensa-unknown-linux-gnu
-+ xtensa*:Linux:*:*)
-+ echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit ;;
- i*86:Linux:*:*)
- # The BFD linker knows what the default object file format is, so
-@@ -1474,9 +1484,9 @@
- the operating system you are using. It is advised that you
- download the most up to date version of the config scripts from
-
-- http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess
-+ http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
- and
-- http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub
-+ http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
-
- If the version you run ($0) is already up to date, please
- send the following data and any information you think might be
diff -urNad goocanvas-0.15~/config.h.in goocanvas-0.15/config.h.in
--- goocanvas-0.15~/config.h.in 2009-06-29 16:20:31.000000000 +0100
+++ goocanvas-0.15/config.h.in 2009-07-28 20:46:48.033835763 +0100
@@ -11289,116 +11184,6 @@ diff -urNad goocanvas-0.15~/config.h.in goocanvas-0.15/config.h.in
#undef PACKAGE
diff -urNad goocanvas-0.15~/config.sub goocanvas-0.15/config.sub
---- goocanvas-0.15~/config.sub 2007-08-29 12:52:51.000000000 +0100
-+++ goocanvas-0.15/config.sub 2009-07-28 20:46:44.001837990 +0100
-@@ -1,10 +1,10 @@
- #! /bin/sh
- # Configuration validation subroutine script.
- # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
--# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
--# Inc.
-+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
-+# Free Software Foundation, Inc.
-
--timestamp='2007-04-29'
-+timestamp='2008-01-16'
-
- # This file is (in principle) common to ALL GNU software.
- # The presence of a machine in this file suggests that SOME GNU software
-@@ -72,8 +72,8 @@
- version="\
- GNU config.sub ($timestamp)
-
--Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
--Free Software Foundation, Inc.
-+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
-
- This is free software; see the source for copying conditions. There is NO
- warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-@@ -369,10 +369,14 @@
- | v850-* | v850e-* | vax-* \
- | we32k-* \
- | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
-- | xstormy16-* | xtensa-* \
-+ | xstormy16-* | xtensa*-* \
- | ymp-* \
- | z8k-*)
- ;;
-+ # Recognize the basic CPU types without company name, with glob match.
-+ xtensa*)
-+ basic_machine=$basic_machine-unknown
-+ ;;
- # Recognize the various machine names and aliases which stand
- # for a CPU type and a company and sometimes even an OS.
- 386bsd)
-@@ -443,6 +447,14 @@
- basic_machine=ns32k-sequent
- os=-dynix
- ;;
-+ blackfin)
-+ basic_machine=bfin-unknown
-+ os=-linux
-+ ;;
-+ blackfin-*)
-+ basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
-+ os=-linux
-+ ;;
- c90)
- basic_machine=c90-cray
- os=-unicos
-@@ -475,8 +487,8 @@
- basic_machine=craynv-cray
- os=-unicosmp
- ;;
-- cr16c)
-- basic_machine=cr16c-unknown
-+ cr16)
-+ basic_machine=cr16-unknown
- os=-elf
- ;;
- crds | unos)
-@@ -668,6 +680,14 @@
- basic_machine=m68k-isi
- os=-sysv
- ;;
-+ m68knommu)
-+ basic_machine=m68k-unknown
-+ os=-linux
-+ ;;
-+ m68knommu-*)
-+ basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
-+ os=-linux
-+ ;;
- m88k-omron*)
- basic_machine=m88k-omron
- ;;
-@@ -813,6 +833,14 @@
- basic_machine=i860-intel
- os=-osf
- ;;
-+ parisc)
-+ basic_machine=hppa-unknown
-+ os=-linux
-+ ;;
-+ parisc-*)
-+ basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
-+ os=-linux
-+ ;;
- pbd)
- basic_machine=sparc-tti
- ;;
-@@ -1021,6 +1049,10 @@
- basic_machine=tic6x-unknown
- os=-coff
- ;;
-+ tile*)
-+ basic_machine=tile-unknown
-+ os=-linux-gnu
-+ ;;
- tx39)
- basic_machine=mipstx39-unknown
- ;;
diff -urNad goocanvas-0.15~/configure goocanvas-0.15/configure
--- goocanvas-0.15~/configure 2009-06-29 16:20:17.000000000 +0100
+++ goocanvas-0.15/configure 2009-07-28 20:46:47.709838096 +0100
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..eac7ff7
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+10-relibtoolize.patch
diff --git a/debian/rules b/debian/rules
index 73eccc1..7331ca5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,9 +1,12 @@
#!/usr/bin/make -f
-include /usr/share/cdbs/1/rules/dpatch.mk
include /usr/share/cdbs/1/class/autotools.mk
include /usr/share/cdbs/1/rules/debhelper.mk
DEB_SHLIBDEPS_INCLUDE_libgoocanvas3 := debian/libgoocanvas3/usr/lib
DEB_DH_MAKESHLIBS_ARGS_libgoocanvas3 := -V"libgoocanvas3 (>= 0.15)"
DEB_INSTALL_CHANGELOGS_ALL := ChangeLog
+
+clean::
+ rm -f src/stamp-goocanvasenumtypes.h \
+ src/stamp-goocanvasmarshal.h
diff --git a/debian/source/format b/debian/source/format
index d3827e7..163aaf8 100644
--- a/debian/source/format
+++ b/debian/source/format
@@ -1 +1 @@
-1.0
+3.0 (quilt)
--
1.7.10
--- End Message ---
