Package: pdl
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 4d0d291a61330704be485c12a5a572e50e4cac34 Mon Sep 17 00:00:00 2001
From: Jari Aalto <[email protected]>
Date: Sat, 28 Apr 2012 08:49:42 +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 | 14 --------------
debian/changelog | 12 ++++++++++++
debian/compat | 2 +-
debian/control | 8 ++++----
debian/copyright | 2 +-
debian/patches/00list | 1 -
debian/rules | 16 ++++++++--------
debian/source.lintian-overrides | 4 ----
debian/source/format | 1 +
9 files changed, 27 insertions(+), 33 deletions(-)
delete mode 100644 debian/README.source
delete mode 100644 debian/patches/00list
delete mode 100644 debian/source.lintian-overrides
create mode 100644 debian/source/format
diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index 3020910..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,14 +0,0 @@
-Repacked sources:
-Upstream sources contain a debian-directory, which is regularly updated
-from this package.
-In order to have a cleaner separation between upstream and debian package,
-upstreams released tarballs are repacked. the debian repack is marked by
-appending +dfsg to the version string.
-
-
-Patch system:
-This package uses dpatch to manage patches on top of the released
-tarballs, please check /usr/share/doc/dpatch/README.source.gz for details.
-The debian/patches directory within the upstream git repository is usually
-empty, as I commit most patches directly to upstream repositories head. and
-put backports to the released version into the debian/patches directory.
diff --git a/debian/changelog b/debian/changelog
index 567c94b..b1988c6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+pdl (1:2.4.10+dfsg-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.
+ * Add build-arch and build-indep targets; use dh_prep in rules file.
+ * Fix copyright-refers-to-symlink-license (Lintian).
+ * Fix duplicate-in-relation-field libastro-fits-header-perl (Lintian).
+ * Fix unused-override (Lintian).
+
+ -- Jari Aalto <[email protected]> Sat, 28 Apr 2012 08:44:59 +0300
+
pdl (1:2.4.10+dfsg-1) unstable; urgency=low
* new upstream release
diff --git a/debian/compat b/debian/compat
index 7f8f011..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+9
diff --git a/debian/control b/debian/control
index f4ae42c..d50cd36 100644
--- a/debian/control
+++ b/debian/control
@@ -2,15 +2,15 @@ Source: pdl
Section: math
Priority: optional
Maintainer: Henning Glawe <[email protected]>
-Standards-Version: 3.9.1
-Build-Depends: gfortran, x11proto-core-dev, libncurses-dev, perl (>= 5.8.0-3), debhelper (>= 7.0.0), libplplot-dev, libinline-perl (>= 0.43), libgsl0-dev, fftw-dev, dpatch, libxext-dev, libhdf4-alt-dev | libhdf4g-dev, libproj-dev | proj, proj-bin | proj, libgd2-xpm-dev, libastro-fits-header-perl, sharutils, libopengl-perl (>= 0.65), libxi-dev, libxmu-dev, freeglut3-dev, libextutils-f77-perl, netpbm, libdevel-repl-perl (>=1.003011)
+Standards-Version: 3.9.3
+Build-Depends: gfortran, x11proto-core-dev, libncurses-dev, perl (>= 5.8.0-3), debhelper (>= 9), libplplot-dev, libinline-perl (>= 0.43), libgsl0-dev, fftw-dev, libxext-dev, libhdf4-alt-dev | libhdf4g-dev, libproj-dev | proj, proj-bin | proj, libgd2-xpm-dev, libastro-fits-header-perl, sharutils, libopengl-perl (>= 0.65), libxi-dev, libxmu-dev, freeglut3-dev, libextutils-f77-perl, netpbm, libdevel-repl-perl (>=1.003011)
Homepage: http://pdl.perl.org/
Package: pdl
Architecture: any
-Depends: ${perl:Depends}, libterm-readkey-perl, ${shlibs:Depends}, libopengl-perl (>=0.62), ${misc:Depends}
+Depends: ${perl:Depends}, libterm-readkey-perl, ${shlibs:Depends}, libopengl-perl (>=0.62), ${misc:Depends}
Recommends: libterm-readline-gnu-perl | libterm-readline-perl-perl
-Suggests: libpgplot-perl, netpbm | imagemagick, libastro-fits-header-perl, libinline-perl, libplplot-dev, doc-base, libextutils-f77-perl, libastro-fits-header-perl, proj-bin | proj, libdevel-repl-perl (>=1.003011)
+Suggests: libpgplot-perl, netpbm | imagemagick, libastro-fits-header-perl, libinline-perl, libplplot-dev, doc-base, libextutils-f77-perl, proj-bin | proj, libdevel-repl-perl (>=1.003011)
Conflicts: r-pdl
Replaces: r-pdl
Description: perl data language: Perl extensions for numerics
diff --git a/debian/copyright b/debian/copyright
index cc220c4..09cfd2a 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -71,5 +71,5 @@ Following is the PDL copyright:
OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
On Debian GNU/Linux systems, the complete text of the GNU General
- Public License can be found in `/usr/share/common-licenses/GPL' and
+ Public License can be found in `/usr/share/common-licenses/GPL-2' and
the Artistic Licence in `/usr/share/common-licenses/Artistic'.
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index ab9fc75..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1 +0,0 @@
-# list of patches to upstream
diff --git a/debian/rules b/debian/rules
index bbe05b7..7bc3ae1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,7 +10,6 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-include /usr/share/dpatch/dpatch.make
unexport DISPLAY
CFLAGS = -Wall -g
@@ -22,7 +21,7 @@ else
endif
configure: configure-stamp
-configure-stamp: patch-stamp
+configure-stamp:
dh_testdir
# Add here commands to configure the package
PERL_MM_USE_DEFAULT=1 perl Makefile.PL F77CONF=debian/f77conf.pl INSTALLDIRS=vendor PDLCONF=debian/perldl.conf
@@ -30,6 +29,10 @@ configure-stamp: patch-stamp
touch configure-stamp
+
+build-arch: build
+build-indep: build
+
build: build-stamp
build-stamp: configure-stamp
dh_testdir
@@ -50,8 +53,7 @@ test-stamp: build-stamp
@echo "END test verbose"
touch test-stamp
-clean: clean-patched unpatch
-clean-patched:
+clean:
dh_testdir
dh_testroot
rm -f build-stamp configure-stamp test-stamp
@@ -60,10 +62,8 @@ clean-patched:
# Add here commands to clean up after the build process.
[ ! -f Makefile ] || $(MAKE) distclean
- rm -f t/callext.o t/callext.so Graphics/TriD/OpenGL/tmp*.h-out
- mkdir -p debian/patches
- -chmod a-x debian/patches/*
-
+ rm -f t/callext.o t/callext.so Graphics/TriD/OpenGL/tmp*.h-out \
+ Perldl2/pdl2.pod
install: build test
dh_testdir
diff --git a/debian/source.lintian-overrides b/debian/source.lintian-overrides
deleted file mode 100644
index 165dd6c..0000000
--- a/debian/source.lintian-overrides
+++ /dev/null
@@ -1,4 +0,0 @@
-# it is ok if there are no patches in the debian source
-# I usually use dpatch to backport fixes in upstream git
-# to the released version's debian package
-pdl source: dpatch-build-dep-but-no-patch-list
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
--
1.7.10
