diff -Nru directoryassistant-2.0/debian/changelog directoryassistant-2.0/debian/changelog --- directoryassistant-2.0/debian/changelog 2012-05-24 18:40:27.000000000 +0000 +++ directoryassistant-2.0/debian/changelog 2012-05-11 15:52:06.000000000 +0000 @@ -1,3 +1,20 @@ +directoryassistant (2.0-1.1) unstable; urgency=low + + * Non-maintainer upload; ACKed by the maintainer. + * Remove deprecated dpatch and upgrade to packaging format "3.0 quilt" + (Closes: #668497). + * Update to Standards-Version to 3.9.3, debhelper to 9. + * 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 no-homepage-field (Lintian). + * Fix menu-item-creates-new-section (Lintian). + * Fix dh_python-is-obsolete by using dh_python2 (Lintian). + * Fix clean-should-be-satisfied-by-build-depends (Lintian) by switching + changing Build-Depends-Indep to Build-Depends. + + -- Jari Aalto Fri, 11 May 2012 18:52:06 +0300 + directoryassistant (2.0-1) unstable; urgency=low * New upstream release. diff -Nru directoryassistant-2.0/debian/compat directoryassistant-2.0/debian/compat --- directoryassistant-2.0/debian/compat 2012-05-24 18:40:27.000000000 +0000 +++ directoryassistant-2.0/debian/compat 2012-04-12 09:13:30.000000000 +0000 @@ -1 +1 @@ -4 +9 diff -Nru directoryassistant-2.0/debian/control directoryassistant-2.0/debian/control --- directoryassistant-2.0/debian/control 2012-05-24 18:40:27.000000000 +0000 +++ directoryassistant-2.0/debian/control 2012-04-12 09:21:45.000000000 +0000 @@ -2,12 +2,13 @@ Section: net Priority: optional Maintainer: Gustavo Franco -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 @@ addresses in an LDAP server. . It was written in Python language using GTK+ bindings. - . - Website: http://olivier.sessink.nl/directoryassistant/ + diff -Nru directoryassistant-2.0/debian/menu directoryassistant-2.0/debian/menu --- directoryassistant-2.0/debian/menu 2012-05-24 18:40:27.000000000 +0000 +++ directoryassistant-2.0/debian/menu 2012-04-12 09:20:48.000000000 +0000 @@ -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 -Nru directoryassistant-2.0/debian/patches/01-images.dpatch directoryassistant-2.0/debian/patches/01-images.dpatch --- directoryassistant-2.0/debian/patches/01-images.dpatch 2012-05-24 18:40:27.000000000 +0000 +++ directoryassistant-2.0/debian/patches/01-images.dpatch 2012-04-12 09:17:02.000000000 +0000 @@ -1,28 +1,14 @@ -#! /bin/sh -e -## images.dpatch -## Gustavo Franco -## -## 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 @@ 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 -Nru directoryassistant-2.0/debian/patches/02-conffile.dpatch directoryassistant-2.0/debian/patches/02-conffile.dpatch --- directoryassistant-2.0/debian/patches/02-conffile.dpatch 2012-05-24 18:40:27.000000000 +0000 +++ directoryassistant-2.0/debian/patches/02-conffile.dpatch 2012-04-12 09:17:04.000000000 +0000 @@ -1,27 +1,13 @@ -#! /bin/sh -e -## conffile.dpatch -## Gustavo Franco -## -## 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 -Nru directoryassistant-2.0/debian/patches/03-initialdialog.dpatch directoryassistant-2.0/debian/patches/03-initialdialog.dpatch --- directoryassistant-2.0/debian/patches/03-initialdialog.dpatch 2012-05-24 18:40:27.000000000 +0000 +++ directoryassistant-2.0/debian/patches/03-initialdialog.dpatch 2012-04-12 09:17:08.000000000 +0000 @@ -1,26 +1,12 @@ -#! /bin/sh -e -## initialdialog.dpatch -## Gustavo Franco -## -## 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 -Nru directoryassistant-2.0/debian/patches/series directoryassistant-2.0/debian/patches/series --- directoryassistant-2.0/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ directoryassistant-2.0/debian/patches/series 2012-04-12 09:13:15.000000000 +0000 @@ -0,0 +1,3 @@ +01-images.dpatch +02-conffile.dpatch +03-initialdialog.dpatch diff -Nru directoryassistant-2.0/debian/rules directoryassistant-2.0/debian/rules --- directoryassistant-2.0/debian/rules 2012-05-24 18:40:27.000000000 +0000 +++ directoryassistant-2.0/debian/rules 2012-04-12 09:23:55.000000000 +0000 @@ -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 @@ install: build dh_testdir dh_testroot - dh_clean -k + dh_prep dh_installdirs # Installing the package. @@ -46,7 +46,7 @@ dh_installchangelogs dh_installdocs dh_link - dh_python + dh_python2 dh_compress dh_fixperms dh_installdeb @@ -59,5 +59,4 @@ 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 -Nru directoryassistant-2.0/debian/source/format directoryassistant-2.0/debian/source/format --- directoryassistant-2.0/debian/source/format 1970-01-01 00:00:00.000000000 +0000 +++ directoryassistant-2.0/debian/source/format 2012-05-24 18:40:27.000000000 +0000 @@ -0,0 +1 @@ +3.0 (quilt)