Package: sitecopy
Severity: wishlist
Tags: patch
Hi Sandro,
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.
Thanks,
Jari
[*] 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>
>From 31b063d1f3e30b37791281aa10af8fdc73492ffd Mon Sep 17 00:00:00 2001
From: Jari Aalto <jari.aa...@cante.net>
Date: Fri, 20 Apr 2012 15:42:12 +0300
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 | 4 ----
debian/changelog | 13 +++++++++++++
debian/compat | 2 +-
debian/control | 4 ++--
debian/patches/00list | 7 -------
...ynamic_rc.dpatch => 01-remote-dynamic-rc.patch} | 7 ++-----
...french-po-fix.dpatch => 02-french-po-fix.patch} | 7 ++-----
..._397155.dpatch => 03-wrong-memory-397155.patch} | 7 ++-----
...xes.dpatch => 04-manpages-addition-fixes.patch} | 8 ++------
.../06-sftpdriver.c-fix-for-new-openssh.patch | 14 ++++++++++++++
.../06_sftpdriver.c_fix-for-new-openssh.dpatch | 20 --------------------
...-bts410703-preserve-storage-files-sigint.patch} | 8 ++------
...549721-add-compatibility-for-neon-0.29.0.patch} | 7 ++-----
debian/patches/series | 7 +++++++
debian/rules | 17 +++++++----------
debian/source/format | 1 +
16 files changed, 57 insertions(+), 76 deletions(-)
delete mode 100644 debian/README.source
delete mode 100644 debian/patches/00list
rename debian/patches/{01_remote_dynamic_rc.dpatch => 01-remote-dynamic-rc.patch} (94%)
rename debian/patches/{02_french-po-fix.dpatch => 02-french-po-fix.patch} (72%)
rename debian/patches/{03_wrong_memory_397155.dpatch => 03-wrong-memory-397155.patch} (70%)
rename debian/patches/{04_manpages_addition_fixes.dpatch => 04-manpages-addition-fixes.patch} (99%)
create mode 100644 debian/patches/06-sftpdriver.c-fix-for-new-openssh.patch
delete mode 100644 debian/patches/06_sftpdriver.c_fix-for-new-openssh.dpatch
rename debian/patches/{10_bts410703_preserve_storage_files_sigint.dpatch => 10-bts410703-preserve-storage-files-sigint.patch} (85%)
rename debian/patches/{20_bts549721_add_compatibility_for_neon_0.29.0.dpatch => 20-bts549721-add-compatibility-for-neon-0.29.0.patch} (71%)
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 0d0aa40..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,4 +0,0 @@
-This package uses dpatch to handle patches against upstream source code; you
-can find additional information about dpatch at
-
- /usr/share/doc/dpatch/
diff --git a/debian/changelog b/debian/changelog
index 5ea60c1..8dc6438 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+sitecopy (1:0.16.6-4) unstable; urgency=low
+
+ [ Jari Aalto ]
+ * Remove deprecated dpatch and upgrade to packaging format "3.0 quilt".
+ * debian/control
+ - Bump Standards-Version to 3.9.3
+ - Update to debhelper 9.
+ * debian/rules
+ - Add required build-arch and build-indep targets
+ - Update to use dh_prep.
+
+ -- Jari Aalto <jari.aa...@cante.net> Fri, 20 Apr 2012 15:34:10 +0300
+
sitecopy (1:0.16.6-3) unstable; urgency=medium
* debian/patches/20_bts549721_add_compatibility_for_neon_0.29.0.dpatch
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 67a39ec..14cf516 100644
--- a/debian/control
+++ b/debian/control
@@ -3,9 +3,9 @@ Section: web
Priority: extra
Maintainer: Sandro Tosi <mo...@debian.org>
Uploaders: Christian Marillat <maril...@debian.org>, Kartik Mistry <kar...@debian.org>
-Build-Depends: debhelper (>= 5), dpatch, autoconf, autotools-dev, gettext, libexpat1-dev, libgnutls-dev, libneon27-gnutls-dev, libxml2-dev
+Build-Depends: debhelper (>= 9), autoconf, autotools-dev, gettext, libexpat1-dev, libgnutls-dev, libneon27-gnutls-dev, libxml2-dev
Homepage: http://www.manyfish.co.uk/sitecopy/
-Standards-Version: 3.8.3
+Standards-Version: 3.9.3
Vcs-Git: git://git.debian.org/git/collab-maint/sitecopy.git
Vcs-Browser: http://git.debian.org/?p=collab-maint/sitecopy.git
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 576385f..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,7 +0,0 @@
-01_remote_dynamic_rc.dpatch
-02_french-po-fix.dpatch
-03_wrong_memory_397155.dpatch
-04_manpages_addition_fixes.dpatch
-06_sftpdriver.c_fix-for-new-openssh.dpatch
-10_bts410703_preserve_storage_files_sigint.dpatch
-20_bts549721_add_compatibility_for_neon_0.29.0
diff --git a/debian/patches/01_remote_dynamic_rc.dpatch b/debian/patches/01-remote-dynamic-rc.patch
similarity index 94%
rename from debian/patches/01_remote_dynamic_rc.dpatch
rename to debian/patches/01-remote-dynamic-rc.patch
index 4edbd19..54c6326 100644
--- a/debian/patches/01_remote_dynamic_rc.dpatch
+++ b/debian/patches/01-remote-dynamic-rc.patch
@@ -1,9 +1,6 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 01_remote_dynamic_rc.dpatch by Jesus Climent <jesus dot climent at hispalinux dot es>
-## Dpatch format by Kartik Mistry <kartik.mis...@gmail.com>
-## DP: A patch for generating dynamic rc files
+From: Jesus Climent <jesus dot climent at hispalinux dot es>
+Subject: A patch for generating dynamic rc files
-@DPATCH@
diff -u sitecopy-0.16.3-orig/src/console_fe.c sitecopy-0.16.3/src/console_fe.c
--- sitecopy-0.16.3-orig/src/console_fe.c 2006-10-27 18:55:19.000000000 +0530
diff --git a/debian/patches/02_french-po-fix.dpatch b/debian/patches/02-french-po-fix.patch
similarity index 72%
rename from debian/patches/02_french-po-fix.dpatch
rename to debian/patches/02-french-po-fix.patch
index 39cb8e7..878e15c 100644
--- a/debian/patches/02_french-po-fix.dpatch
+++ b/debian/patches/02-french-po-fix.patch
@@ -1,9 +1,6 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 02_french-po-fix.dpatch by Ludovic Rousseau <rouss...@debian.org>
-## Prepared for dpatch by Kartik Mistry <kartik.mis...@gmail.com>
-## DP: Fixed the french translation issue
+From: Ludovic Rousseau <rouss...@debian.org>
+Subject: Fixed the french translation issue
-@DPATCH@
--- sitecopy-0.16.3.orig/po/fr.po 2006-03-12 11:07:42.000000000 +0100
+++ sitecopy-0.16.3/po/fr.po 2007-05-05 10:14:08.000000000 +0200
diff --git a/debian/patches/03_wrong_memory_397155.dpatch b/debian/patches/03-wrong-memory-397155.patch
similarity index 70%
rename from debian/patches/03_wrong_memory_397155.dpatch
rename to debian/patches/03-wrong-memory-397155.patch
index ede24cb..1be8028 100644
--- a/debian/patches/03_wrong_memory_397155.dpatch
+++ b/debian/patches/03-wrong-memory-397155.patch
@@ -1,9 +1,6 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 03_wrong_memory_init.dpatch by Ludovic Rousseau <rousseau at debian dot org>
-## Dpatch format by Kartik <kartik.mis...@gmail.com>
-## DP: A patch for fixing wrong memory intialization
+From: Ludovic Rousseau <rousseau at debian dot org>
+Subject: A patch for fixing wrong memory intialization
-@DPATCH@
diff -u sitecopy-0.16.3-orig/src/rcfile.c sitecopy-0.16.3/src/rcfile.c
--- sitecopy-0.16.3-orig/src/rcfile.c 2006-02-04 17:46:36.000000000 +0530
diff --git a/debian/patches/04_manpages_addition_fixes.dpatch b/debian/patches/04-manpages-addition-fixes.patch
similarity index 99%
rename from debian/patches/04_manpages_addition_fixes.dpatch
rename to debian/patches/04-manpages-addition-fixes.patch
index 2d1d24d..31ef667 100644
--- a/debian/patches/04_manpages_addition_fixes.dpatch
+++ b/debian/patches/04-manpages-addition-fixes.patch
@@ -1,10 +1,6 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 04_manpages_addition_fix.dpatch by Kartik Mistry <kartik.mis...@gmail.com>
-## French translations, Thanks to Jean-Luc Coulon <jean-luc.cou...@wanadoo.fr>
-## and Ludovic Rousseau <rouss...@debian.org>
-## DP: Add missing/wrong entries/translation in manpages (#405483, #439594)
+From: Kartik Mistry <kartik.mis...@gmail.com>
+Subject: Add missing/wrong entries/translation in manpages (#405483, #439594)
-@DPATCH@
--- sitecopy-0.16.3-orig/doc/sitecopy.1 2005-12-13 02:47:10.000000000 +0530
+++ sitecopy-0.16.3/doc/sitecopy.1 2008-02-26 00:16:37.000000000 +0530
@@ -172,12 +172,20 @@
diff --git a/debian/patches/06-sftpdriver.c-fix-for-new-openssh.patch b/debian/patches/06-sftpdriver.c-fix-for-new-openssh.patch
new file mode 100644
index 0000000..f09c07f
--- /dev/null
+++ b/debian/patches/06-sftpdriver.c-fix-for-new-openssh.patch
@@ -0,0 +1,14 @@
+From: Agustin Martin Domingo <agmar...@debian.org>
+Subject: Patch for sftp protocol doesn't work with >= 1:4.2p1-1
+
+diff -urNad sitecopy-0.16.3~/src/sftpdriver.c sitecopy-0.16.3/src/sftpdriver.c
+--- sitecopy-0.16.3~/src/sftpdriver.c 2005-06-29 11:44:47.000000000 +0200
++++ sitecopy-0.16.3/src/sftpdriver.c 2007-10-22 14:58:51.000000000 +0200
+@@ -140,7 +140,6 @@
+ }
+ close(c_in);
+ close(c_out);
+- read_sftp(sess); /* wait for prompt */
+ return SITE_OK;
+ }
+
diff --git a/debian/patches/06_sftpdriver.c_fix-for-new-openssh.dpatch b/debian/patches/06_sftpdriver.c_fix-for-new-openssh.dpatch
deleted file mode 100644
index ea07545..0000000
--- a/debian/patches/06_sftpdriver.c_fix-for-new-openssh.dpatch
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 05_sftpdriver.c_fix-for-new-openssh.dpatch by Agustin Martin Domingo <agmar...@debian.org>
-##
-## DP: Patch for sftp protocol doesn't work with >= 1:4.2p1-1
-## the new sftp command doesn't print a prompt after connecting to the remote
-## server any longer if STDIN is not a tty.[1]
-## [1] http://www.openbsd.org/cgi-bin/cvsweb/src/usr.bin/ssh/sftp.c.diff?r1=1.65&r2=1.66&f=h
-
-@DPATCH@
-diff -urNad sitecopy-0.16.3~/src/sftpdriver.c sitecopy-0.16.3/src/sftpdriver.c
---- sitecopy-0.16.3~/src/sftpdriver.c 2005-06-29 11:44:47.000000000 +0200
-+++ sitecopy-0.16.3/src/sftpdriver.c 2007-10-22 14:58:51.000000000 +0200
-@@ -140,7 +140,6 @@
- }
- close(c_in);
- close(c_out);
-- read_sftp(sess); /* wait for prompt */
- return SITE_OK;
- }
-
diff --git a/debian/patches/10_bts410703_preserve_storage_files_sigint.dpatch b/debian/patches/10-bts410703-preserve-storage-files-sigint.patch
similarity index 85%
rename from debian/patches/10_bts410703_preserve_storage_files_sigint.dpatch
rename to debian/patches/10-bts410703-preserve-storage-files-sigint.patch
index cc4067f..d99acd1 100644
--- a/debian/patches/10_bts410703_preserve_storage_files_sigint.dpatch
+++ b/debian/patches/10-bts410703-preserve-storage-files-sigint.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 10_bts-410703_preserve_storage_files_sigint.dpatch by Andreas Henriksson <andr...@fatal.se>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Preserve storage files it SIGINT (Ctrl+C) is sent
+From: Andreas Henriksson <andr...@fatal.se>
+Subject: Preserve storage files it SIGINT (Ctrl+C) is sent
-@DPATCH@
--- sitecopy-0.16.3/src/sitestore.c 2006-02-04 11:18:08.000000000 +0100
+++ sitecopy-0.16.3-pending/src/sitestore.c 2008-06-08 21:56:23.000000000 +0200
diff --git a/debian/patches/20_bts549721_add_compatibility_for_neon_0.29.0.dpatch b/debian/patches/20-bts549721-add-compatibility-for-neon-0.29.0.patch
similarity index 71%
rename from debian/patches/20_bts549721_add_compatibility_for_neon_0.29.0.dpatch
rename to debian/patches/20-bts549721-add-compatibility-for-neon-0.29.0.patch
index 7de339f..66356c4 100644
--- a/debian/patches/20_bts549721_add_compatibility_for_neon_0.29.0.dpatch
+++ b/debian/patches/20-bts549721-add-compatibility-for-neon-0.29.0.patch
@@ -1,9 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 20_bts549721_add_compatibility_for_neon_0.29.0.dpatch by Sandro Tosi <mo...@debian.org>
-##
-## DP: Add support for libneon 0.29.0
+From: Sandro Tosi <mo...@debian.org>
+Subject: Add support for libneon 0.29.0
-@DPATCH@
diff -urNad sitecopy~/configure.in sitecopy/configure.in
--- sitecopy~/configure.in 2008-07-20 18:21:15.000000000 +0200
+++ sitecopy/configure.in 2009-10-05 23:44:00.764858219 +0200
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..38afd50
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,7 @@
+01-remote-dynamic-rc.patch
+02-french-po-fix.patch
+03-wrong-memory-397155.patch
+04-manpages-addition-fixes.patch
+06-sftpdriver.c-fix-for-new-openssh.patch
+10-bts410703-preserve-storage-files-sigint.patch
+20-bts549721-add-compatibility-for-neon-0.29.0.patch
diff --git a/debian/rules b/debian/rules
index 95462cc..ab9c2e5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,8 +3,6 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-include /usr/share/dpatch/dpatch.make
-
TARGETS = console
CFLAGS = -Wall
@@ -27,6 +25,10 @@ ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
INSTALL_PROGRAM += -s
endif
+
+build-arch: build
+build-indep: build
+
build: build-stamp
build-stamp: $(TARGETS:%=build-%)
dh_testdir
@@ -39,13 +41,8 @@ configure: configure.in
build-console/config.status: configure
dh_testdir
-
-ifneq "$(wildcard /usr/share/misc/config.sub)" ""
cp -f /usr/share/misc/config.sub $(CURDIR)/config.sub
-endif
-ifneq "$(wildcard /usr/share/misc/config.guess)" ""
cp -f /usr/share/misc/config.guess $(CURDIR)/config.guess
-endif
[ -d build-console ] || mkdir build-console
cd build-console && \
@@ -64,12 +61,12 @@ build-console/Makefile: build-console/config.status Makefile.in
cd build-console && CONFIG_FILES=Makefile CONFIG_HEADERS=./config.status
build-console: build-console-stamp
-build-console-stamp: patch-stamp build-console/Makefile
+build-console-stamp: build-console/Makefile
dh_testdir
$(MAKE) -C build-console
touch $@
-clean: unpatch
+clean:
dh_testdir
dh_testroot
rm -f build-stamp build-console-stamp \
@@ -90,7 +87,7 @@ install-console: install-console-stamp
install-console-stamp: build-console-stamp
dh_testdir
dh_testroot
- dh_clean -k
+ dh_prep
dh_installdirs
$(MAKE) -C build-console install prefix=$(CURDIR)/debian/sitecopy/usr
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.5
