Package: goto-fai-backend
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

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 0e4664524f582baa7737a84dee1f974de39bfc14 Mon Sep 17 00:00:00 2001
From: Jari Aalto <jari.aa...@cante.net>
Date: Tue, 28 Feb 2012 08:51:56 -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  |    1 -
 debian/changelog      |    8 ++++++++
 debian/compat         |    2 +-
 debian/control        |    4 ++--
 debian/patches/00list |    2 --
 debian/rules          |   18 ++++--------------
 debian/source/format  |    3 +--
 7 files changed, 16 insertions(+), 22 deletions(-)
 delete mode 100644 debian/README.source
 delete mode 100644 debian/patches/00list

diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index 1c919f0..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1 +0,0 @@
-/usr/share/doc/dpatch/README.source.gz
diff --git a/debian/changelog b/debian/changelog
index 43c48dd..2787058 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+goto-fai-backend (3.0-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.
+
+ -- Jari Aalto <jari.aa...@cante.net>  Tue, 28 Feb 2012 08:51:03 -0500
+
 goto-fai-backend (3.0-1) unstable; urgency=low
 
   * Initial upload (Closes: #532478)
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 c2b0b5a..b419547 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,8 @@ Section: utils
 Priority: optional
 Maintainer: GOsa packages maintainers group <gosa-...@oss.gonicus.de>
 Uploaders: Cajus Pollmeier <ca...@debian.org>, Benoit Mortier <benoit.mort...@opensides.be>
-Standards-Version: 3.8.4
-Build-Depends: debhelper (>= 5.0.0), dpatch
+Standards-Version: 3.9.3
+Build-Depends: debhelper (>= 9)
 Homepage: https://oss.gonicus.de/labs/gosa/
 Vcs-Browser: https://oss.gonicus.de/repositories/goto/trunk/goto-fai-backend
 Vcs-Svn: https://oss.gonicus.de/repositories/goto/trunk/goto-fai-backend
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 92ee79b..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,2 +0,0 @@
-# This file has been left intentionally blank
-
diff --git a/debian/rules b/debian/rules
index 516aa3d..cb8c954 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,14 +4,13 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-build: patch 
+build: 
 	#********************************************************
 	#* Building fai-backend into a Debian/GNU Linux Package *
-	#*                    please stand by                   *
+	#*		      please stand by			*
 	#********************************************************
 
-clean: clean-patched unpatch
-clean-patched:
+clean:
 	dh_testdir
 	rm -f install-stamp 
 	-rm -f debian/files
@@ -19,10 +18,6 @@ clean-patched:
 	-rm -f debian/substvars
 	dh_clean
 
-unpatch:
-	dpatch deapply-all
-	rm -rf patch-stamp debian/patched
-
 install: install-stamp
 install-stamp: 
 	dh_testdir
@@ -38,11 +33,6 @@ install-stamp:
 
 	touch install-stamp
 
-patch: patch-stamp
-patch-stamp:
-	dpatch apply-all
-	dpatch cat-all >patch-stamp
-
 binary-indep: install
 	dh_testdir
 	dh_testroot
@@ -66,7 +56,7 @@ binary-indep: install
 	dh_md5sums
 	dh_builddeb
 
-source diff:                                                                  
+source diff:								      
 	@echo >&2 'source and diff are obsolete - use dpkg-source -b'; false
 
 binary: binary-indep 
diff --git a/debian/source/format b/debian/source/format
index b9b0237..163aaf8 100644
--- a/debian/source/format
+++ b/debian/source/format
@@ -1,2 +1 @@
-1.0
-
+3.0 (quilt)
-- 
1.7.9

Reply via email to