Package: rox
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
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 or if it is ok
to upload this version in a NMU in case you are working on other
issues needing attention.
Thanks,
Jari
>From 59b4732f87037f767e6e184e1d87b36c673ccf6b Mon Sep 17 00:00:00 2001
From: Jari Aalto <[email protected]>
Date: Sat, 28 Apr 2012 17:55:50 +0300
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/changelog | 12 +++++++++
debian/compat | 2 +-
debian/control | 8 +++---
debian/copyright | 2 +-
debian/patches/00list | 13 ----------
debian/patches/{global.dpatch => 05-global.patch} | 26 ++------------------
.../patches/{mimeapps.dpatch => 10-mimeapps.patch} | 8 ++----
debian/patches/{dnd.dpatch => 15-dnd.patch} | 8 ++----
debian/patches/{apprun.dpatch => 20-apprun.patch} | 8 ++----
.../patches/{nostrip.dpatch => 25-nostrip.patch} | 8 ++----
debian/patches/{pt_BR.dpatch => 30-pt-BR.patch} | 8 ++----
.../patches/{asneeded.dpatch => 35-asneeded.patch} | 8 ++----
debian/patches/series | 7 ++++++
debian/rox-filer.postinst | 3 +++
debian/rules | 13 ++++++----
debian/source/format | 1 +
16 files changed, 51 insertions(+), 84 deletions(-)
delete mode 100644 debian/patches/00list
rename debian/patches/{global.dpatch => 05-global.patch} (90%)
rename debian/patches/{mimeapps.dpatch => 10-mimeapps.patch} (82%)
rename debian/patches/{dnd.dpatch => 15-dnd.patch} (68%)
rename debian/patches/{apprun.dpatch => 20-apprun.patch} (67%)
rename debian/patches/{nostrip.dpatch => 25-nostrip.patch} (68%)
rename debian/patches/{pt_BR.dpatch => 30-pt-BR.patch} (99%)
rename debian/patches/{asneeded.dpatch => 35-asneeded.patch} (72%)
create mode 100644 debian/patches/series
mode change 100644 => 100755 debian/rox-filer.postinst
create mode 100644 debian/source/format
diff --git a/debian/changelog b/debian/changelog
index 29b8de1..76449f1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+rox (2.10-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.
+ * Add build-arch and build-indep targets; use dh_prep in rules file.
+ * Fix copyright-refers-to-symlink-license (Lintian).
+ * Fix description-synopsis-starts-with-article (Lintian).
+ * Fix maintainer-script-ignores-errors postinst (Lintian).
+
+ -- Jari Aalto <[email protected]> Sat, 28 Apr 2012 17:55:11 +0300
+
rox (2.10-3) unstable; urgency=low
* Added asneeded.dpatch to fix a missing libdl linking.
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 d16c3ef..0665c63 100644
--- a/debian/control
+++ b/debian/control
@@ -2,9 +2,9 @@ Source: rox
Section: x11
Priority: optional
Maintainer: Francesco Paolo Lovergine <[email protected]>
-Standards-Version: 3.8.2
-Build-Depends: libgtk2.0-dev (>= 2.0.1), libxml2-dev, debhelper (>= 7), file, libatk1.0-dev,
- libglib2.0-dev (>= 2.0.3), libpango1.0-dev, dpatch, libsm-dev, libx11-dev, x11proto-core-dev, libxext-dev, libxi-dev, libxrender-dev, libice-dev,
+Standards-Version: 3.9.3
+Build-Depends: libgtk2.0-dev (>= 2.0.1), libxml2-dev, debhelper (>= 9), file, libatk1.0-dev,
+ libglib2.0-dev (>= 2.0.3), libpango1.0-dev, libsm-dev, libx11-dev, x11proto-core-dev, libxext-dev, libxi-dev, libxrender-dev, libice-dev,
zlib1g-dev, libxrandr-dev, libxft-dev, libexpat1-dev, libxmu-dev, libxmuu-dev, libxp-dev, libxpm-dev, libxt-dev, libxtst-dev,
libxv-dev, shared-mime-info (>= 0.16), libglade2-dev
Homepage: http://rox.sourceforge.net/desktop/ROX-Filer
@@ -16,7 +16,7 @@ Architecture: any
Suggests: file, menu
Depends: ${shlibs:Depends}, shared-mime-info (>= 0.16), ${misc:Depends}
Recommends: zeroinstall-injector
-Description: A simple graphical file manager for X11
+Description: simple graphical file manager for X11
ROX-Filer is a simple and easy to use graphical file manager
for X11 based on the GTK2 library. It uses a uniform
drag-and-drop approach for every operation.
diff --git a/debian/copyright b/debian/copyright
index 6090021..11f87c0 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -18,4 +18,4 @@ Copyright (C) 2000 Thomas Leonard.
You may redistribute copies of ROX-Filer under the terms of
the GNU General Public License.
On Debian systems, the complete text of the GNU General Public
-License can be found in /usr/share/common-licenses/GPL file.
+License can be found in /usr/share/common-licenses/GPL-2 file.
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index b8ae8cb..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-# 'global' patch modifies configure stuff, so do run autoconf once
-# to create a proper patch if you need to recreate it
-# by dpatch-edit-patch. That's not needed for config.h.in.
-# Also removing of possible .orig files is _mandatory_
-#
-global
-mimeapps
-dnd
-apprun
-nostrip
-pt_BR
-asneeded
diff --git a/debian/patches/global.dpatch b/debian/patches/05-global.patch
similarity index 90%
rename from debian/patches/global.dpatch
rename to debian/patches/05-global.patch
index f4d99a1..ad38841 100644
--- a/debian/patches/global.dpatch
+++ b/debian/patches/05-global.patch
@@ -1,28 +1,6 @@
-#! /bin/sh -e
-## global.dpatch by Francesco Paolo Lovergine <[email protected]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+From: Francesco Paolo Lovergine <[email protected]>
+Subject: modify configure stuff
-if [ $# -lt 1 ]; then
- echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
- exit 1
-fi
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
-
-case "$1" in
- -patch) patch -p1 ${patch_opts} < $0;;
- -unpatch) patch -R -p1 ${patch_opts} < $0;;
- *)
- echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
- exit 1;;
-esac
-
-exit 0
-
-@DPATCH@
diff -urNad rox-2.8~/ROX-Filer/src/choices.c rox-2.8/ROX-Filer/src/choices.c
--- rox-2.8~/ROX-Filer/src/choices.c 2008-09-24 17:19:35.000000000 +0200
+++ rox-2.8/ROX-Filer/src/choices.c 2008-09-24 17:26:57.000000000 +0200
diff --git a/debian/patches/mimeapps.dpatch b/debian/patches/10-mimeapps.patch
similarity index 82%
rename from debian/patches/mimeapps.dpatch
rename to debian/patches/10-mimeapps.patch
index 71b35d0..5068293 100644
--- a/debian/patches/mimeapps.dpatch
+++ b/debian/patches/10-mimeapps.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## mimeapps.dpatch by Francesco Paolo Lovergine <[email protected]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+From: Francesco Paolo Lovergine <[email protected]>
+Subject: Use x-terminal-emulator, not xterm
-@DPATCH@
diff -urNad rox-2.9~/Choices/MIME-types/text rox-2.9/Choices/MIME-types/text
--- rox-2.9~/Choices/MIME-types/text 2009-05-10 14:22:54.000000000 +0200
+++ rox-2.9/Choices/MIME-types/text 2009-07-06 23:00:32.000000000 +0200
diff --git a/debian/patches/dnd.dpatch b/debian/patches/15-dnd.patch
similarity index 68%
rename from debian/patches/dnd.dpatch
rename to debian/patches/15-dnd.patch
index 25dd331..b2b8da9 100644
--- a/debian/patches/dnd.dpatch
+++ b/debian/patches/15-dnd.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## dnd.dpatch by Francesco Paolo Lovergine <[email protected]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+From: Francesco Paolo Lovergine <[email protected]>
+Subject: Use x-terminal-emulator, not xterm
-@DPATCH@
diff -urNad rox-2.4~/ROX-Filer/src/dnd.c rox-2.4/ROX-Filer/src/dnd.c
--- rox-2.4~/ROX-Filer/src/dnd.c 2005-08-01 09:10:18.000000000 +0200
+++ rox-2.4/ROX-Filer/src/dnd.c 2005-12-27 09:55:53.000000000 +0100
diff --git a/debian/patches/apprun.dpatch b/debian/patches/20-apprun.patch
similarity index 67%
rename from debian/patches/apprun.dpatch
rename to debian/patches/20-apprun.patch
index a2413a6..9cc14f4 100644
--- a/debian/patches/apprun.dpatch
+++ b/debian/patches/20-apprun.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## apprun.dpatch by Francesco Paolo Lovergine <[email protected]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+From: Francesco Paolo Lovergine <[email protected]>
+Subject: Use x-terminal-emulator, not xterm
-@DPATCH@
diff -urNad rox-2.9~/ROX-Filer/AppRun rox-2.9/ROX-Filer/AppRun
--- rox-2.9~/ROX-Filer/AppRun 2009-05-10 14:22:54.000000000 +0200
+++ rox-2.9/ROX-Filer/AppRun 2009-07-06 23:01:04.000000000 +0200
diff --git a/debian/patches/nostrip.dpatch b/debian/patches/25-nostrip.patch
similarity index 68%
rename from debian/patches/nostrip.dpatch
rename to debian/patches/25-nostrip.patch
index e823171..4902411 100644
--- a/debian/patches/nostrip.dpatch
+++ b/debian/patches/25-nostrip.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## nostrip.dpatch by Francesco Paolo Lovergine <[email protected]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+From: Francesco Paolo Lovergine <[email protected]>
+Subject: remove strip(1) from Makefile
-@DPATCH@
diff -urNad rox-2.9~/ROX-Filer/src/Makefile.in rox-2.9/ROX-Filer/src/Makefile.in
--- rox-2.9~/ROX-Filer/src/Makefile.in 2009-05-10 14:22:54.000000000 +0200
+++ rox-2.9/ROX-Filer/src/Makefile.in 2009-07-06 23:11:51.000000000 +0200
diff --git a/debian/patches/pt_BR.dpatch b/debian/patches/30-pt-BR.patch
similarity index 99%
rename from debian/patches/pt_BR.dpatch
rename to debian/patches/30-pt-BR.patch
index ff353c3..1fa4f4a 100644
--- a/debian/patches/pt_BR.dpatch
+++ b/debian/patches/30-pt-BR.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## pt_BR.dpatch by Francesco Paolo Lovergine <[email protected]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+From: Francesco Paolo Lovergine <[email protected]>
+Subject: Brazilian Portuguese translation update
-@DPATCH@
diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' rox-filer~/ROX-Filer/src/po/pt_BR.po rox-filer/ROX-Filer/src/po/pt_BR.po
--- rox-filer~/ROX-Filer/src/po/pt_BR.po 2009-08-01 16:08:20.000000000 +0200
+++ rox-filer/ROX-Filer/src/po/pt_BR.po 2010-01-24 15:03:42.000000000 +0100
diff --git a/debian/patches/asneeded.dpatch b/debian/patches/35-asneeded.patch
similarity index 72%
rename from debian/patches/asneeded.dpatch
rename to debian/patches/35-asneeded.patch
index eccedd4..5ec6f49 100644
--- a/debian/patches/asneeded.dpatch
+++ b/debian/patches/35-asneeded.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## asneeded.dpatch by Francesco Paolo Lovergine <[email protected]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+From: Francesco Paolo Lovergine <[email protected]>
+Subject: Add linker library -ldl
-@DPATCH@
diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' rox-2.10~/ROX-Filer/src/Makefile.in rox-2.10/ROX-Filer/src/Makefile.in
--- rox-2.10~/ROX-Filer/src/Makefile.in 2011-06-07 13:08:32.000000000 +0200
+++ rox-2.10/ROX-Filer/src/Makefile.in 2011-06-07 13:08:58.000000000 +0200
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..139756c
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,7 @@
+05-global.patch
+10-mimeapps.patch
+15-dnd.patch
+20-apprun.patch
+25-nostrip.patch
+30-pt-BR.patch
+35-asneeded.patch
diff --git a/debian/rox-filer.postinst b/debian/rox-filer.postinst
old mode 100644
new mode 100755
index 178cbaa..8546bb6
--- a/debian/rox-filer.postinst
+++ b/debian/rox-filer.postinst
@@ -1,4 +1,7 @@
#!/bin/sh
+
+set -e
+
if [ "$1" = "configure" ]; then
if [ -x /usr/bin/update-mime-database ]; then
update-mime-database /usr/share/mime/ ;
diff --git a/debian/rules b/debian/rules
index 3b69022..bbbb19e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,16 +13,19 @@ DH_VERBOSE=1
export DH_VERBOSE
endif
-include /usr/share/dpatch/dpatch.make
configure: configure-stamp
-configure-stamp: patch-stamp
+configure-stamp:
dh_testdir
# do nothing
touch configure-stamp
+
+build-arch: build
+build-indep: build
+
build: configure-stamp build-stamp
build-stamp:
dh_testdir
@@ -32,7 +35,7 @@ build-stamp:
touch build-stamp
-clean: myclean unpatch
+clean: myclean
myclean:
dh_testdir
dh_testroot
@@ -44,7 +47,7 @@ myclean:
install: build
dh_testdir
dh_testroot
- dh_clean -k
+ dh_prep
dh_installdirs
cp -r ${BUILDDIR}/Choices ${DESTDIR}/usr/share/rox
@@ -91,4 +94,4 @@ binary-arch: build install
dh_builddeb
binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install patch unpatch myclean
+.PHONY: build clean binary-indep binary-arch binary install myclean
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
