Package: directoryassistant
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 59606d9545048fceabdad9d0e56bb68d4839c183 Mon Sep 17 00:00:00 2001
From: Jari Aalto <jari.aa...@cante.net>
Date: Thu, 12 Apr 2012 12:24:27 +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/changelog | 15 +++++++++++++
debian/compat | 2 +-
debian/control | 10 ++++-----
debian/menu | 6 ++++--
debian/patches/01-images.dpatch | 36 ++++++++++----------------------
debian/patches/02-conffile.dpatch | 30 +++++++-------------------
debian/patches/03-initialdialog.dpatch | 28 +++++++------------------
debian/patches/series | 3 +++
debian/rules | 15 +++++++------
debian/source/format | 1 +
10 files changed, 62 insertions(+), 84 deletions(-)
create mode 100644 debian/patches/series
create mode 100644 debian/source/format
diff --git a/debian/changelog b/debian/changelog
index aa87d91..294f854 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,18 @@
+directoryassistant (2.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.1, debhelper to 9, add Homepage.
+ * Add build-arch and build-indep targets; use dh_prep in rules file.
+ * Note: patches were updated with "quilt refresh" to make
+ them apply cleanly.
+ * Fix menu-item-creates-new-section (Lintian).
+ * Fix dh_python-is-obsolete (Lintian).
+ * Fix clean-should-be-satisfied-by-build-depends (Lintian) by switching
+ to Build-Depends in rules file.
+
+ -- Jari Aalto <jari.aa...@cante.net> Thu, 12 Apr 2012 12:23:31 +0300
+
directoryassistant (2.0-1) unstable; urgency=low
* New upstream release.
diff --git a/debian/compat b/debian/compat
index b8626c4..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-4
+9
diff --git a/debian/control b/debian/control
index 11c0997..5f21402 100644
--- a/debian/control
+++ b/debian/control
@@ -2,12 +2,13 @@ Source: directoryassistant
Section: net
Priority: optional
Maintainer: Gustavo Franco <stra...@debian.org>
-Build-Depends-Indep: python (>= 2.3), debhelper (>> 4.0.0), dpatch(>= 1.11)
-Standards-Version: 3.6.2.1
+Build-Depends: python (>= 2.3), debhelper (>= 9)
+Standards-Version: 3.9.3
+Homepage: http://olivier.sessink.nl/directoryassistant
Package: directoryassistant
Architecture: all
-Depends: ${python:Depends}, python-gtk2 (>= 1.99.17-6), python-ldap(>= 1.9.999.pre14-1)
+Depends: ${misc:Depends}, ${python:Depends}, python-gtk2 (>= 1.99.17-6), python-ldap(>= 1.9.999.pre14-1)
Description: small LDAP address book manager
Directory Assistant is a small application for managing a
LDAP address book. The focus is to create a very easy to
@@ -16,5 +17,4 @@ Description: small LDAP address book manager
addresses in an LDAP server.
.
It was written in Python language using GTK+ bindings.
- .
- Website: http://olivier.sessink.nl/directoryassistant/
+
diff --git a/debian/menu b/debian/menu
index 0a7ebee..aaab9b1 100644
--- a/debian/menu
+++ b/debian/menu
@@ -1,2 +1,4 @@
-?package(directoryassistant):needs="X11" section="Apps/Net"\
- title="directoryassistant" command="/usr/bin/directoryassistant"
+?package(directoryassistant):needs="X11" \
+ section="Applications/Network/Communication"\
+ title="directoryassistant" \
+ command="/usr/bin/directoryassistant"
diff --git a/debian/patches/01-images.dpatch b/debian/patches/01-images.dpatch
index d88b84c..3237c21 100644
--- a/debian/patches/01-images.dpatch
+++ b/debian/patches/01-images.dpatch
@@ -1,28 +1,14 @@
-#! /bin/sh -e
-## images.dpatch
-## Gustavo Franco <stra...@acm.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix the images location on 'directoryassistant' script.
+From: Unknown
+Subject: Fix the images location on 'directoryassistant' script.
-if [ $# -ne 1 ]; then
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1
-fi
-case "$1" in
- -patch) patch -f --no-backup-if-mismatch -p0 < $0;;
- -unpatch) patch -f --no-backup-if-mismatch -R -p0 < $0;;
- *)
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1;;
-esac
+---
+ directoryassistant | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
-exit 0
-
---- directoryassistant 2004-01-20 18:14:40.000000000 -0200
-+++ directoryassistant 2004-01-20 18:14:21.000000000 -0200
-@@ -273,7 +273,7 @@
- self.window.set_title("Directory Assistant")
+--- a/directoryassistant
++++ b/directoryassistant
+@@ -455,7 +455,7 @@
+ self.window.set_title("Directory Assistant "+VERSIONSTRING)
self.window.set_border_width(10)
try:
- pixbuf = gtk.gdk.pixbuf_new_from_file('/usr/local/share/directoryassistant/directoryassistant.png')
@@ -30,8 +16,8 @@ exit 0
self.window.set_icon(pixbuf)
except:
pass
-@@ -287,7 +287,7 @@
- vbox.pack_start(hbox, gtk.FALSE, gtk.TRUE)
+@@ -469,7 +469,7 @@
+ vbox.pack_start(hbox, False, True)
try:
image = gtk.Image()
- image.set_from_file('/usr/local/share/directoryassistant/decoration.png')
diff --git a/debian/patches/02-conffile.dpatch b/debian/patches/02-conffile.dpatch
index 859ecaa..90e3fd4 100644
--- a/debian/patches/02-conffile.dpatch
+++ b/debian/patches/02-conffile.dpatch
@@ -1,27 +1,13 @@
-#! /bin/sh -e
-## conffile.dpatch
-## Gustavo Franco <stra...@acm.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Show a nice message if dotfile wasn't found or is wrong.
+From: Unknown
+Subject: Show a nice message if dotfile wasn't found or is wrong.
-if [ $# -ne 1 ]; then
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1
-fi
-case "$1" in
- -patch) patch -f --no-backup-if-mismatch -p0 < $0;;
- -unpatch) patch -f --no-backup-if-mismatch -R -p0 < $0;;
- *)
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1;;
-esac
+---
+ directoryassistant | 1 +
+ 1 file changed, 1 insertion(+)
-exit 0
-
---- directoryassistant.orig 2004-08-14 18:17:07.000000000 -0300
-+++ directoryassistant 2004-08-14 18:19:35.000000000 -0300
-@@ -451,6 +451,7 @@
+--- a/directoryassistant
++++ b/directoryassistant
+@@ -601,6 +601,7 @@
fd = open(filename, 'w')
fd.write("[main]\n#ldapurl = ldap://myserver/\n#bind_dn = cn=myaccount,o=myorg\n#bind_password = mysecret\n#base_dn = ou=Mydepartment,o=myorg\n#startup_search=myname")
fd.close()
diff --git a/debian/patches/03-initialdialog.dpatch b/debian/patches/03-initialdialog.dpatch
index 469a929..3e1a081 100644
--- a/debian/patches/03-initialdialog.dpatch
+++ b/debian/patches/03-initialdialog.dpatch
@@ -1,26 +1,12 @@
-#! /bin/sh -e
-## initialdialog.dpatch
-## Gustavo Franco <stra...@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix the images location on 'directoryassistant' script.
+From: Unknown
+Subject: Fix the images location on 'directoryassistant' script.
-if [ $# -ne 1 ]; then
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1
-fi
-case "$1" in
- -patch) patch -f --no-backup-if-mismatch -p0 < $0;;
- -unpatch) patch -f --no-backup-if-mismatch -R -p0 < $0;;
- *)
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1;;
-esac
+---
+ directoryassistant | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
-exit 0
-
---- directoryassistant 2005-12-22 23:27:08.000000000 -0200
-+++ directoryassistant 2005-12-22 23:28:22.000000000 -0200
+--- a/directoryassistant
++++ b/directoryassistant
@@ -597,7 +597,7 @@
if (os.path.exists(filename)):
message = 'Your configfile '+filename+' does not contain\nboth the required fields ldapurl and basedn.'
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..5b3d9a2
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,3 @@
+01-images.dpatch
+02-conffile.dpatch
+03-initialdialog.dpatch
diff --git a/debian/rules b/debian/rules
index 801944e..fff1843 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,18 +8,18 @@
#export DH_VERBOSE=1
PACKAGE = directoryassistant
-PATCHLIST = $(notdir $(basename $(wildcard debian/patches/*.dpatch)))
-include /usr/share/dpatch/dpatch.make
+build-arch: build
+build-indep: build
-build: build-stamp patch
+build: build-stamp
build-stamp:
dh_testdir
touch build-stamp
-clean: unpatch
+clean:
dh_testdir
dh_testroot
rm -f build-stamp
@@ -29,7 +29,7 @@ clean: unpatch
install: build
dh_testdir
dh_testroot
- dh_clean -k
+ dh_prep
dh_installdirs
# Installing the package.
@@ -46,7 +46,7 @@ binary-indep: build install
dh_installchangelogs
dh_installdocs
dh_link
- dh_python
+ dh_python2
dh_compress
dh_fixperms
dh_installdeb
@@ -59,5 +59,4 @@ binary-indep: build install
binary-arch: build install
binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install \
- patch unpatch
+.PHONY: build clean binary-indep binary-arch binary install
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
