tags 661038 + patch thanks | From: Hector Romojaro <[email protected]> | Subject: Re: Debian packages: removing deprecated dpatch | Date: 4 weeks, 6 days, 5 hours -- 2012-03-03 13:01 EET | Message-ID: <1330772465.3541.49.camel@bulma> | References: <[email protected]> | X-Mailer: Evolution 3.2.2-1 | | Hi Jari, | | I am working on it these days. About the current state of the packages | depending on dpatch: | | * openacs: it's already been converted to 3.0 format and waiting on svn | for upload. | * dotlrn: converting it right now. | * tdom: i have to talk with the co-maintainers of the package about it, | to see if any of them is converting the package. If not, i will take | care of it. | | Thanks for the reminder! | Kind regards, Héctor Romojaro
El sáb, 03-03-2012 a las 04:03 -0500, [email protected] escribió: > Hi, > > The dpatch patch management system has been deprecated for some time. > The Lintian currently flags use of dpatch packages as an error. The > The new 3.0 packaging format is an improved version which, among other > things, contains patch managemet quilt built-in[1]. > > The packages which are using old dpatch: > > dotlrn > openacs > tdom > > I had some free time and I've removed dpatch and convert all patches > to the new package to format 3.0 quilt. The changes were quite > straight forward and don't much change the current style of packaging. > > Please let me know if this is already being worked on or if it is ok > to upload the upgraded version in NMUs. > > Thank you for maintaining software in Debian, > Jari > > [1] http://wiki.debian.org/Projects/DebSrc3.0 > > Hi Hector, 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. Thanks, Jari
>From 973774a7f715a1c5e3804ea592649ab535b03db2 Mon Sep 17 00:00:00 2001 From: Jari Aalto <[email protected]> Date: Fri, 24 Feb 2012 17:05:20 -0500 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 | 8 ---- debian/changelog | 8 ++++ debian/compat | 2 +- debian/control | 4 +- debian/patches/00list | 6 --- debian/patches/{config.dpatch => config.patch} | 8 +--- debian/patches/{install.dpatch => install.patch} | 8 +--- ...bashisms.dpatch => interpreters-bashisms.patch} | 43 ++++++++++---------- ...preters-path.dpatch => interpreters-path.patch} | 8 +--- .../{securityfix.dpatch => securityfix.patch} | 8 +--- debian/patches/series | 6 +++ .../{xinha-iconset.dpatch => xinha-iconset.patch} | 8 +--- debian/rules | 7 +-- debian/source/format | 2 +- 14 files changed, 52 insertions(+), 74 deletions(-) delete mode 100644 debian/README.source delete mode 100644 debian/patches/00list rename debian/patches/{config.dpatch => config.patch} (96%) rename debian/patches/{install.dpatch => install.patch} (81%) rename debian/patches/{interpreters-bashisms.dpatch => interpreters-bashisms.patch} (57%) rename debian/patches/{interpreters-path.dpatch => interpreters-path.patch} (95%) rename debian/patches/{securityfix.dpatch => securityfix.patch} (81%) create mode 100644 debian/patches/series rename debian/patches/{xinha-iconset.dpatch => xinha-iconset.patch} (69%) diff --git a/debian/README.source b/debian/README.source deleted file mode 100644 index 150e49a..0000000 --- a/debian/README.source +++ /dev/null @@ -1,8 +0,0 @@ -This package uses dpatch to manage all modifications to the upstream -source. Changes are stored in the source package as diffs in -debian/patches and applied during the build. - -To get detailed instructions on how to apply the series of patches -and modify them, please read /usr/share/doc/dpatch/README.source.gz - - -- Hector Romojaro <[email protected]> Fri, 16 Oct 2009 13:11:00 +0200 diff --git a/debian/changelog b/debian/changelog index 99e2ea2..3e50459 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +dotlrn (2.5.0+dfsg-2.1) unstable; urgency=low + + * Non-maintainer upload. + * Remove dpatch and upgrade to packaging format "3.0 quilt". + * Update to Standards-Version to 3.9.3 and debhelper to 9. + + -- Jari Aalto <[email protected]> Fri, 24 Feb 2012 17:03:43 -0500 + dotlrn (2.5.0+dfsg-2) unstable; urgency=high * Fixed severe vulnerability in the api-browser: it was possible to pass 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 4963afe..8f34ce4 100644 --- a/debian/control +++ b/debian/control @@ -4,8 +4,8 @@ Priority: optional Maintainer: Hector Romojaro <[email protected]> Uploaders: Francesco Paolo Lovergine <[email protected]> Build-Depends-Indep: po-debconf -Build-Depends: debhelper (>= 7), dpatch -Standards-Version: 3.8.4 +Build-Depends: debhelper (>= 9) +Standards-Version: 3.9.3 Vcs-Browser: http://svn.debian.org/viewsvn/pkg-tcltk/dotlrn/trunk Vcs-Svn: svn://svn.debian.org/svn/pkg-tcltk/dotlrn/trunk Homepage: http://www.dotlrn.org/ diff --git a/debian/patches/00list b/debian/patches/00list deleted file mode 100644 index b0af352..0000000 --- a/debian/patches/00list +++ /dev/null @@ -1,6 +0,0 @@ -config.dpatch -interpreters-path.dpatch -interpreters-bashisms.dpatch -install.dpatch -xinha-iconset.dpatch -securityfix.dpatch diff --git a/debian/patches/config.dpatch b/debian/patches/config.patch similarity index 96% rename from debian/patches/config.dpatch rename to debian/patches/config.patch index e87fba2..af018b1 100644 --- a/debian/patches/config.dpatch +++ b/debian/patches/config.patch @@ -1,10 +1,6 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## config.dpatch by <geox@localhost> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Adaptation of config.tcl and daemontools/run to debian install. +From: <geox@localhost> +Subject: Adaptation of config.tcl and daemontools/run to debian install. -@DPATCH@ diff -urNad trunk~/etc/config.tcl trunk/etc/config.tcl --- trunk~/etc/config.tcl 2009-03-31 19:14:52.000000000 +0200 +++ trunk/etc/config.tcl 2009-10-16 20:36:07.000000000 +0200 diff --git a/debian/patches/install.dpatch b/debian/patches/install.patch similarity index 81% rename from debian/patches/install.dpatch rename to debian/patches/install.patch index 0f772ee..7ebbf32 100644 --- a/debian/patches/install.dpatch +++ b/debian/patches/install.patch @@ -1,10 +1,6 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## install.dpatch by <geox@localhost> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. +From: <geox@localhost> +Subject: Add restart instructions -@DPATCH@ diff -urNad trunk~/packages/acs-bootstrap-installer/installer/install.tcl trunk/packages/acs-bootstrap-installer/installer/install.tcl --- trunk~/packages/acs-bootstrap-installer/installer/install.tcl 2009-01-06 03:07:21.000000000 +0100 +++ trunk/packages/acs-bootstrap-installer/installer/install.tcl 2009-11-21 01:16:15.000000000 +0100 diff --git a/debian/patches/interpreters-bashisms.dpatch b/debian/patches/interpreters-bashisms.patch similarity index 57% rename from debian/patches/interpreters-bashisms.dpatch rename to debian/patches/interpreters-bashisms.patch index c45850c..615fc30 100644 --- a/debian/patches/interpreters-bashisms.dpatch +++ b/debian/patches/interpreters-bashisms.patch @@ -1,14 +1,17 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## interpreters-bashisms.dpatch by Hector Romojaro <[email protected]> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. +From: Hector Romojaro <[email protected]> +Subject: Use plain sh -@DPATCH@ -diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' trunk~/etc/install/functions.sh trunk/etc/install/functions.sh ---- trunk~/etc/install/functions.sh 2004-04-25 11:32:27.000000000 +0200 -+++ trunk/etc/install/functions.sh 2010-05-19 13:03:50.000000000 +0200 -@@ -23,10 +23,10 @@ +--- + etc/install/functions.sh | 4 ++-- + etc/install/install-and-alert.sh | 14 +++++++------- + etc/install/warn-if-installation-errors.sh | 2 +- + packages/acs-lang/bin/check-catalog.sh | 6 +++--- + packages/acs-lang/bin/list-keys.sh | 2 +- + 5 files changed, 14 insertions(+), 14 deletions(-) + +--- a/etc/install/functions.sh ++++ b/etc/install/functions.sh +@@ -24,10 +24,10 @@ interactive=$1 @@ -21,9 +24,8 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' echo "$0: exiting on users request" exit fi -diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' trunk~/etc/install/install-and-alert.sh trunk/etc/install/install-and-alert.sh ---- trunk~/etc/install/install-and-alert.sh 2003-11-04 15:39:04.000000000 +0100 -+++ trunk/etc/install/install-and-alert.sh 2010-05-19 13:14:50.000000000 +0200 +--- a/etc/install/install-and-alert.sh ++++ b/etc/install/install-and-alert.sh @@ -12,11 +12,11 @@ script_path=$(dirname $(which $0)) cd $script_path @@ -72,9 +74,8 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' # Get lines with alert keywords or lines with failed TclWebtest tests error_lines=$(egrep -i "(FAILED: .+\.test)|($alert_keyword)" $installation_output_file) -diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' trunk~/etc/install/warn-if-installation-errors.sh trunk/etc/install/warn-if-installation-errors.sh ---- trunk~/etc/install/warn-if-installation-errors.sh 2003-11-04 15:39:04.000000000 +0100 -+++ trunk/etc/install/warn-if-installation-errors.sh 2010-05-19 12:59:59.000000000 +0200 +--- a/etc/install/warn-if-installation-errors.sh ++++ b/etc/install/warn-if-installation-errors.sh @@ -9,7 +9,7 @@ file_name=$1 @@ -84,9 +85,8 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' alert_keyword=`get_config_param alert_keyword` -diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' trunk~/packages/acs-lang/bin/check-catalog.sh trunk/packages/acs-lang/bin/check-catalog.sh ---- trunk~/packages/acs-lang/bin/check-catalog.sh 2003-10-30 14:10:53.000000000 +0100 -+++ trunk/packages/acs-lang/bin/check-catalog.sh 2010-05-19 12:57:04.000000000 +0200 +--- a/packages/acs-lang/bin/check-catalog.sh ++++ b/packages/acs-lang/bin/check-catalog.sh @@ -34,7 +34,7 @@ export script_path=$(dirname $(which $0)) @@ -114,9 +114,8 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' # No package provided - check all packages for catalog_dir in $(find $package_dir -iname catalog -type d) do -diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' trunk~/packages/acs-lang/bin/list-keys.sh trunk/packages/acs-lang/bin/list-keys.sh ---- trunk~/packages/acs-lang/bin/list-keys.sh 2003-10-31 13:58:29.000000000 +0100 -+++ trunk/packages/acs-lang/bin/list-keys.sh 2010-05-19 12:58:17.000000000 +0200 +--- a/packages/acs-lang/bin/list-keys.sh ++++ b/packages/acs-lang/bin/list-keys.sh @@ -5,7 +5,7 @@ # @author Peter Marklund diff --git a/debian/patches/interpreters-path.dpatch b/debian/patches/interpreters-path.patch similarity index 95% rename from debian/patches/interpreters-path.dpatch rename to debian/patches/interpreters-path.patch index e865f30..8ed8cf8 100644 --- a/debian/patches/interpreters-path.dpatch +++ b/debian/patches/interpreters-path.patch @@ -1,10 +1,6 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## interpreters-path.dpatch by <geox@localhost> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Fixes some paths for interpreters on scripts. +From: <geox@localhost> +Subject: Fixes some paths for interpreters on scripts. -@DPATCH@ diff -urNad dotlrn-2.4.1~/bin/ad-context-server.pl dotlrn-2.4.1/bin/ad-context-server.pl --- dotlrn-2.4.1~/bin/ad-context-server.pl 2001-03-13 23:59:26.000000000 +0100 +++ dotlrn-2.4.1/bin/ad-context-server.pl 2008-08-04 13:07:55.000000000 +0200 diff --git a/debian/patches/securityfix.dpatch b/debian/patches/securityfix.patch similarity index 81% rename from debian/patches/securityfix.dpatch rename to debian/patches/securityfix.patch index b047b96..c167ee5 100644 --- a/debian/patches/securityfix.dpatch +++ b/debian/patches/securityfix.patch @@ -1,10 +1,6 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## securityfix.dpatch by Hector Romojaro <[email protected]> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. +From: Hector Romojaro <[email protected]> +Subject: Add file scurity check -@DPATCH@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' trunk~/packages/acs-api-browser/www/content-page-view.tcl trunk/packages/acs-api-browser/www/content-page-view.tcl --- trunk~/packages/acs-api-browser/www/content-page-view.tcl 2003-05-17 11:38:28.000000000 +0200 +++ trunk/packages/acs-api-browser/www/content-page-view.tcl 2010-11-25 13:35:05.000000000 +0100 diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..ab2aa90 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,6 @@ +config.patch +interpreters-path.patch +interpreters-bashisms.patch +install.patch +xinha-iconset.patch +securityfix.patch diff --git a/debian/patches/xinha-iconset.dpatch b/debian/patches/xinha-iconset.patch similarity index 69% rename from debian/patches/xinha-iconset.dpatch rename to debian/patches/xinha-iconset.patch index d73997f..2fe7784 100644 --- a/debian/patches/xinha-iconset.dpatch +++ b/debian/patches/xinha-iconset.patch @@ -1,10 +1,6 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## xinha-iconset.dpatch by Hector Romojaro <[email protected]> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. +From: Hector Romojaro <[email protected]> +Subject: Add editor_icons -@DPATCH@ diff -urNad trunk~/www/blank-master.adp trunk/www/blank-master.adp --- trunk~/www/blank-master.adp 2008-06-07 22:29:01.000000000 +0200 +++ trunk/www/blank-master.adp 2009-11-21 00:15:36.000000000 +0100 diff --git a/debian/rules b/debian/rules index 830dbf5..194afcd 100755 --- a/debian/rules +++ b/debian/rules @@ -5,7 +5,6 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -include /usr/share/dpatch/dpatch.make get-orig-source: if [ -d "../../tarballs" ]; then \ @@ -15,14 +14,14 @@ get-orig-source: fi; build: -clean: clean1 unpatch +clean: clean1 clean1: dh_testdir dh_testroot dh_clean -install: patch-stamp +install: dh_testdir dh_testroot dh_prep @@ -84,4 +83,4 @@ binary-indep: install dh_builddeb binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install patch unpatch clean1 +.PHONY: build clean binary-indep binary-arch binary install clean1 diff --git a/debian/source/format b/debian/source/format index d3827e7..163aaf8 100644 --- a/debian/source/format +++ b/debian/source/format @@ -1 +1 @@ -1.0 +3.0 (quilt) -- 1.7.9
