Package: libapache2-mod-auth-cas
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
Michele, as we spoke before, here is the proposed NMU patch.
Let me know if there is anything that needs adjusting or if it is ok
to upload with these changes.
Thanks,
Jari
>From 3e0c47d5ba53be244353d384b2a0921df96c1635 Mon Sep 17 00:00:00 2001
From: Jari Aalto <jari.aa...@cante.net>
Date: Wed, 29 Feb 2012 02:31:29 -0500
Subject: [PATCH] format-3.0
Organization: Private
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 8bit
Signed-off-by: Jari Aalto <jari.aa...@cante.net>
---
debian/README.source | 5 -----
debian/changelog | 8 ++++++++
debian/compat | 2 +-
debian/control | 4 ++--
debian/patches/00list | 1 -
.../{10_ssl_libs.dpatch => 10_ssl_libs.patch} | 8 ++------
debian/patches/series | 1 +
debian/rules | 16 +++-------------
debian/source/format | 1 +
9 files changed, 18 insertions(+), 28 deletions(-)
delete mode 100644 debian/README.source
delete mode 100644 debian/patches/00list
rename debian/patches/{10_ssl_libs.dpatch => 10_ssl_libs.patch} (79%)
create mode 100644 debian/patches/series
create mode 100644 debian/source/format
diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index 6259ce0..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,5 +0,0 @@
-The source for mod_auth_cas is not provided by upstream as a tarball, but directly in SubVersion.
-
-To retrieve upstream source code, one has to do (for instance) :
-
-$ svn export https://www.ja-sig.org/svn/cas-clients/mod_auth_cas/tags/mod_auth_cas-1.0.8/ libapache2-mod-auth-cas-1.0.8
diff --git a/debian/changelog b/debian/changelog
index 2329f63..d7893ad 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+libapache2-mod-auth-cas (1.0.8-3.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.
+
+ -- Jari Aalto <jari.aa...@cante.net> Wed, 29 Feb 2012 00:32:22 -0500
+
libapache2-mod-auth-cas (1.0.8-3) unstable; urgency=low
* Fix dpatch-missing-description for 10_ssl_libs (note to self: lintian -I)
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 0a97db4..cddbb0d 100644
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,8 @@ Source: libapache2-mod-auth-cas
Section: web
Priority: extra
Maintainer: Michele Baldessari <mich...@pupazzo.org>
-Build-Depends: debhelper (>= 5), apache2-threaded-dev (>= 2.2.3), libssl-dev, dpatch
-Standards-Version: 3.8.1
+Build-Depends: debhelper (>= 9), apache2-threaded-dev (>= 2.2.3), libssl-dev
+Standards-Version: 3.9.3
Vcs-Svn: svn://svn.debian.org/svn/pkg-cas/libapache2-mod-auth-cas/svn-buildpackage/trunk/
Vcs-Browser: http://svn.debian.org/viewsvn/pkg-cas/libapache2-mod-auth-cas/svn-buildpackage/trunk/
Homepage: http://www.ja-sig.org/wiki/display/CASC/mod_auth_cas
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 943b43d..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1 +0,0 @@
-10_ssl_libs
diff --git a/debian/patches/10_ssl_libs.dpatch b/debian/patches/10_ssl_libs.patch
similarity index 79%
rename from debian/patches/10_ssl_libs.dpatch
rename to debian/patches/10_ssl_libs.patch
index 86e6ab7..b75e54d 100644
--- a/debian/patches/10_ssl_libs.dpatch
+++ b/debian/patches/10_ssl_libs.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 10_ssl_libs.dpatch by <Michele Baldessari <mich...@pupazzo.org>>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Forces linking to openssl (avoids possible missing symbol error)
+From: <Michele Baldessari <mich...@pupazzo.org>>
+Subject: Forces linking to openssl (avoids possible missing symbol error)
-@DPATCH@
diff -urNad libapache2-mod-auth-cas-1.0.8~/Makefile.in libapache2-mod-auth-cas-1.0.8/Makefile.in
--- libapache2-mod-auth-cas-1.0.8~/Makefile.in 2009-04-01 22:49:08.000000000 +0200
+++ libapache2-mod-auth-cas-1.0.8/Makefile.in 2009-04-01 22:52:14.000000000 +0200
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..ad4a2e4
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+10_ssl_libs.patch
diff --git a/debian/rules b/debian/rules
index 451cb23..082eea1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -19,17 +19,8 @@ else
CFLAGS += -O2
endif
-unpatch:
- dpatch deapply-all
- rm -rf patch-stamp debian/patched
-
-patch: patch-stamp
-patch-stamp:
- dpatch apply-all
- dpatch cat-all >patch-stamp
-
configure: configure-stamp
-configure-stamp: patch-stamp
+configure-stamp:
dh_testdir
./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs"
touch $@
@@ -40,8 +31,7 @@ build-stamp: configure-stamp
$(MAKE)
touch $@
-clean: clean-patched unpatch
-clean-patched:
+clean:
dh_testdir
dh_testroot
[ ! -f Makefile ] || $(MAKE) clean
@@ -81,4 +71,4 @@ binary-indep: build install
binary: binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure patch
+.PHONY: build clean binary-indep binary-arch binary install configure
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.9
