2012-04-25 13:45 Sandro Tosi <mo...@debian.org>:
| Thanks for your work, but please rebase it on the git repository,
| which contains changes not addressed in your patch.
Hi Sandro,
Here an update against Git:
b992866 2011-11-03
>From 9d4544f1f37f4cb5b9c4f920e6ece3448074d308 Mon Sep 17 00:00:00 2001
From: Jari Aalto <jari.aa...@cante.net>
Date: Wed, 25 Apr 2012 19:41:09 +0300
Subject: [PATCH] Packaging format 3.0, Copyright Format 1.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 | 16 +++
debian/compat | 2 +-
debian/control | 7 +-
debian/copyright | 121 ++++++++++++--------
debian/patches/00list | 8 --
...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 +-
...ch => 30-bts320586-manpage-document-sftp.patch} | 8 +-
debian/patches/series | 8 ++
debian/rules | 27 +++--
debian/source/format | 1 +
18 files changed, 143 insertions(+), 137 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%)
mode change 100755 => 100644
rename debian/patches/{02_french-po-fix.dpatch => 02-french-po-fix.patch} (72%)
mode change 100755 => 100644
rename debian/patches/{03_wrong_memory_397155.dpatch => 03-wrong-memory-397155.patch} (70%)
mode change 100755 => 100644
rename debian/patches/{04_manpages_addition_fixes.dpatch => 04-manpages-addition-fixes.patch} (99%)
mode change 100755 => 100644
create mode 100644 debian/patches/06-sftpdriver.c-fix-for-new-openssh.patch
delete mode 100755 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%)
mode change 100755 => 100644
rename debian/patches/{20_bts549721_add_compatibility_for_neon_0.29.0.dpatch => 20-bts549721-add-compatibility-for-neon-0.29.0.patch} (71%)
mode change 100755 => 100644
rename debian/patches/{30_bts320586_manpage_document_sftp.dpatch => 30-bts320586-manpage-document-sftp.patch} (85%)
mode change 100755 => 100644
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 6d27cc4..4bdf1c8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,22 @@ sitecopy (1:0.16.6-4) UNRELEASED; urgency=low
- document SFTP support; thanks to Matthew Palmer for the report and to
Christian Kujau for the patch; Closes: #320586
+ [Jari Aalto]
+ * Udpate to packaging format "3.0 (quilt)"
+ * debian/control:
+ - Update to debhelper 9.
+ - Update to Standards-Version 3.9.3.
+ - Lowercase first line in description.
+ * debian/compat:
+ - Update to 9.
+ * debian/copyright:
+ - Update to format 1.0.
+ * debian/patches
+ - Update to quilt and DEP-3; README.source no longer needed.
+ * debian/rules:
+ - Simplify copyring config.sub and config.guess files.
+ - Remove ghost target "unpatch".
+
-- Kartik Mistry <kar...@debian.org> Thu, 03 Nov 2011 10:33:04 +0530
sitecopy (1:0.16.6-3) unstable; urgency=medium
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 75ba03e..cf11845 100644
--- a/debian/control
+++ b/debian/control
@@ -4,8 +4,7 @@ Priority: extra
Maintainer: Sandro Tosi <mo...@debian.org>
Uploaders: Christian Marillat <maril...@debian.org>,
Kartik Mistry <kar...@debian.org>
-Build-Depends: debhelper (>= 5),
- dpatch,
+Build-Depends: debhelper (>= 9),
autoconf,
autotools-dev,
gettext,
@@ -14,7 +13,7 @@ Build-Depends: debhelper (>= 5),
libneon27-gnutls-dev,
libxml2-dev
Homepage: http://www.manyfish.co.uk/sitecopy/
-Standards-Version: 3.9.2
+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
@@ -22,7 +21,7 @@ Package: sitecopy
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Conflicts: xsitecopy (<< 1:0.10.15-1), openssh-client (<< 1:4.2p1-1)
-Description: Program for managing a WWW site via FTP, SFTP, DAV or HTTP
+Description: program for managing a WWW site via FTP, SFTP, DAV or HTTP
Sitecopy is for copying locally stored websites to remote servers. With a
single command, the program will synchronize a set of local files to a remote
server by performing uploads and remote deletes as required. The aim is to
diff --git a/debian/copyright b/debian/copyright
index 7983e6c..dc4323f 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,30 +1,33 @@
-Format: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?revision=174
-Source: http://www.manyfish.co.uk/sitecopy/
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0
+Upstream-Name: sitecopy
Upstream-Contact: Joe Orton <j...@manyfish.co.uk>
+Source: http://freecode.com/projects/sitecopy
Files: *
-Copyright: 1998-2008, Joe Orton <j...@manyfish.co.uk>
-Copyright: 1987-2004, Free Software Foundation, Inc
-Copyright: 1997, Janos Farkas (che...@shadow.banki.hu)
-Copyright: 2003, Nobuyuki Tsuchimura <tutim...@nn.iij4u.or.jp>
-Copyright: 2004, David A Knight <da...@screem.org>
-License: GPL-2+
-
-The bundled Expat XML parser is:
-Copyright: 1998, James Clark
+Copyright:
+ 1998-2008 Joe Orton <j...@manyfish.co.uk>
+ 1987-2004 Free Software Foundation, Inc
+ 2004 David A Knight <da...@screem.org>
+ 2003 Nobuyuki Tsuchimura <tutim...@nn.iij4u.or.jp>
+ 1997 Janos Farkas (che...@shadow.banki.hu)
+X-Source-Comment:
+ The bundled Expat XML parser is Copyright (C) 1998 James Clark
License: GPL-2+
Files: gnome/*
-Copyright: 1999, Lee Mallabone <l...@fonicmonkey.net>
+Copyright:
+ 1999 Lee Mallabone <l...@fonicmonkey.net>
License: GPL-2+
Files: debian/*
-Copyright: 1998-2000, Tom Lees <t...@debian.org>,
-Copyright: 2001-2003, Masayuki Hatta <mha...@debian.org>,
-Copyright: 2003-2006, Reed Snellenberger <rsnellenber...@houston.rr.com>,
-Copyright: 2006-2008, Kartik Mistry <kartik.mis...@gmail.com>,
- Christian Marillat <maril...@debian.org>
-Copyright: 2008-2011, Sandro Tosi <mo...@debian.org>
+Copyright:
+ 2008-2012 Sandro Tosi <mo...@debian.org>
+ 2006-2012 Kartik Mistry <kartik.mis...@gmail.com>
+ 2007-2012 Christian Marillat <maril...@debian.org>
+ 2012 Jari Aalto <jari.aa...@cante.net>
+ 2003-2006 Reed Snellenberger <rsnellenber...@houston.rr.com>
+ 2001-2003 Masayuki Hatta <mha...@debian.org>
+ 1998-2000 Tom Lees <t...@debian.org>
License: GPL-2+
License: GPL-2+
@@ -38,49 +41,72 @@ License: GPL-2+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
.
- You should have received a copy of the GNU General Public License along
- with this package; if not, write to the Free Software Foundation, Inc.,
- 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License can be found in "/usr/share/common-licenses/GPL-2".
Files: intl/*
-Copyright: 1995-1998, 2000-2003, Free Software Foundation, Inc
+Copyright:
+ 1995-1998, 2000-2003, Free Software Foundation, Inc
License: LGPL-2+
-lib/neon/* except ne_sspi.c ne_gnutls.c ne_openssl.c ne_session.c ne_socket.c ne_md5.* ne_basic.h ne_dates.c
-Copyright: 1999-2006, Joe Orton <j...@manyfish.co.uk>
+Files: lib/neon/*
+X-File-Comment:
+ Excluding following files:
+ .
+ ept
+ ne_basic.h
+ ne_dates.c
+ ne_gnutls.c
+ ne_md5.*
+ ne_openssl.c
+ ne_session.c
+ ne_socket.c
+ ne_sspi.c
+Copyright:
+ 1999-2006 Joe Orton <j...@manyfish.co.uk>
License: LGPL-2+
-lib/neon/ne_sspi.c
-Copyright: 2004-2005, Vladimir Berezniker
+Files: lib/neon/ne_sspi.c
+Copyright:
+ 2004-2005 Vladimir Berezniker
License: LGPL-2+
-lib/neon/ne_gnutls.c
-Copyright: 2002-2006, Joe Orton <j...@manyfish.co.uk>
-Copyright: 2004, Aleix Conchillo Flaque <al...@member.fsf.org>
+Files: lib/neon/ne_gnutls.c
+Copyright:
+ 2002-2006 Joe Orton <j...@manyfish.co.uk>
+ 2004 Aleix Conchillo Flaque <al...@member.fsf.org>
License: LGPL-2+
-lib/neon/ne_openssl.c
-Copyright: 1999-2000, Tommi Komulainen <tommi.komulai...@iki.fi>
-Copyright: 2002-2006, Joe Orton <j...@manyfish.co.uk>
+Files: lib/neon/ne_openssl.c
+Copyright:
+ 2002-2006, Joe Orton <j...@manyfish.co.uk>
+ 1999-2000 Tommi Komulainen <tommi.komulai...@iki.fi>
License: LGPL-2+
-lib/neon/ne_socket.c
-Copyright: 1999-2000, Tommi Komulainen <tommi.komulai...@iki.fi>
-Copyright: 2004, Aleix Conchillo Flaque <al...@member.fsf.org>
-Copyright: 1998-2006, Joe Orton <j...@manyfish.co.uk>
+Files: lib/neon/ne_socket.c
+Copyright:
+ 1998-2006 Joe Orton <j...@manyfish.co.uk>
+ 2004 Aleix Conchillo Flaque <al...@member.fsf.org>
+ 1999-2000 Tommi Komulainen <tommi.komulai...@iki.fi>
License: LGPL-2+
-lib/neon/ne_md5.*
-Copyright: 1995, 1996, 1997 Free Software Foundation, Inc
+Files: lib/neon/ne_md5.*
+Copyright:
+ 1995, 1996, 1997 Free Software Foundation, Inc
License: LGPL-2+
-lib/neon/ne_basic.h
-Copyright: 1999-2006, Joe Orton <j...@manyfish.co.uk>
+Files: lib/neon/ne_basic.h
+Copyright:
+ 1999-2006, Joe Orton <j...@manyfish.co.uk>
License: LGPL-2+
-lib/neon/ne_dates.c
-Copyright: 2004, Jiang Lei <trist...@deluxe.ocn.ne.jp>
-Copyright: 1999-2005, Joe Orton <j...@manyfish.co.uk>
+Files: lib/neon/ne_dates.c
+Copyright:
+ 2004 Jiang Lei <trist...@deluxe.ocn.ne.jp>
+ 1999-2005 Joe Orton <j...@manyfish.co.uk>
License: LGPL-2+
License: LGPL-2+
@@ -94,9 +120,8 @@ License: LGPL-2+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser
General Public License for more details.
.
- You should have received a copy of the GNU Lesser General Public License
- along with this package; if not, write to the Free Software Foundation,
- Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, see <http://www.gnu.org/licenses/>.
.
- On Debian systems, the complete text of the GNU Lesser General Public License
- can be found in `/usr/share/common-licenses/LGPL-2'.
+ On Debian systems, the complete text of the GNU Library General
+ Public License can be found in "/usr/share/common-licenses/LGPL-2".
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 413a713..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,8 +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
-30_bts320586_manpage_document_sftp
diff --git a/debian/patches/01_remote_dynamic_rc.dpatch b/debian/patches/01-remote-dynamic-rc.patch
old mode 100755
new mode 100644
similarity index 94%
rename from debian/patches/01_remote_dynamic_rc.dpatch
rename to debian/patches/01-remote-dynamic-rc.patch
index 4edbd19..54c6326
--- 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
old mode 100755
new mode 100644
similarity index 72%
rename from debian/patches/02_french-po-fix.dpatch
rename to debian/patches/02-french-po-fix.patch
index 39cb8e7..878e15c
--- 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
old mode 100755
new mode 100644
similarity index 70%
rename from debian/patches/03_wrong_memory_397155.dpatch
rename to debian/patches/03-wrong-memory-397155.patch
index ede24cb..1be8028
--- 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
old mode 100755
new mode 100644
similarity index 99%
rename from debian/patches/04_manpages_addition_fixes.dpatch
rename to debian/patches/04-manpages-addition-fixes.patch
index 2d1d24d..31ef667
--- 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 100755
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
old mode 100755
new mode 100644
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
--- 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
old mode 100755
new mode 100644
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
--- 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/30_bts320586_manpage_document_sftp.dpatch b/debian/patches/30-bts320586-manpage-document-sftp.patch
old mode 100755
new mode 100644
similarity index 85%
rename from debian/patches/30_bts320586_manpage_document_sftp.dpatch
rename to debian/patches/30-bts320586-manpage-document-sftp.patch
index 8a979cb..de2ed59
--- a/debian/patches/30_bts320586_manpage_document_sftp.dpatch
+++ b/debian/patches/30-bts320586-manpage-document-sftp.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 30_bts320586_manpage_add_sftp_info.dpatch by Christian Kujau <li...@nerdbynature.de>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Document SFTP sitecopy functionality
+From: Christian Kujau <li...@nerdbynature.de>
+Subject: Document SFTP sitecopy functionality
-@DPATCH@
diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' sitecopy~/doc/sitecopy.1 sitecopy/doc/sitecopy.1
--- sitecopy~/doc/sitecopy.1 2011-01-03 00:03:07.596559823 +0100
+++ sitecopy/doc/sitecopy.1 2011-01-03 00:03:07.852560823 +0100
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..8de3393
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,8 @@
+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
+30-bts320586-manpage-document-sftp.patch
diff --git a/debian/rules b/debian/rules
index 95462cc..eb344cb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,7 +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 +26,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,14 +42,7 @@ 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
-
+ cp -vf /usr/share/misc/config.sub /usr/share/misc/config.guess .
[ -d build-console ] || mkdir build-console
cd build-console && \
../configure $(confflags) CFLAGS="$(CFLAGS)" \
@@ -64,12 +60,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 \
@@ -77,8 +73,11 @@ clean: unpatch
[ ! -f Makefile ] || $(MAKE) distclean
- rm -rf build-console config.guess config.sub
- dh_clean po/*.gmo configure
+ rm -rf build-console
+ rm -f config.guess config.sub po/*.gmo configure
+ # Restore *.po files; delete "Language" line added by build process
+ sed -i '/Language:/d' po/*.po
+ dh_clean
install: install-stamp
install-stamp: $(TARGETS:%=install-%)
@@ -90,7 +89,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.10
