Dear maintainer of linpopup,

A few days ago, I sent you a notice announcing my intent to upload
a NMU of your package to fix its pending l10n issue AND make it switch
to debhelper instead of the obsolete debmake.

You either agreed for this NMU or did not respond to my notices.

The release managers agreed to let the package switched to debmake
enter testing.

I will now upload this NMU to DELAYED/0-DAY (which means an immediate
upload).

The NMU patch is attached to this mail.

The NMU changelog is:


Source: linpopup
Version: 1.2.0-8.2
Distribution: unstable
Urgency: low
Maintainer: Christian Perrier <[EMAIL PROTECTED]>
Date: Sun, 28 Jan 2007 15:13:54 +0100
Closes: 372971 407432
Changes: 
 linpopup (1.2.0-8.2) unstable; urgency=low
 .
   * Non-maintainer upload to fix a pending l10n issue.
   * Debconf templates translation:
     - Dutch added. Closes: #407432
   * Drop debmake and switch to debhelper. Closes: #372971

-- 


diff -Nru linpopup-1.2.0.old/debian/changelog linpopup-1.2.0/debian/changelog
--- linpopup-1.2.0.old/debian/changelog	2007-01-28 14:50:30.735278196 +0100
+++ linpopup-1.2.0/debian/changelog	2007-01-28 15:14:21.553352403 +0100
@@ -1,3 +1,12 @@
+linpopup (1.2.0-8.2) unstable; urgency=low
+
+  * Non-maintainer upload to fix a pending l10n issue.
+  * Debconf templates translation:
+    - Dutch added. Closes: #407432
+  * Drop debmake and switch to debhelper. Closes: #372971
+
+ -- Christian Perrier <[EMAIL PROTECTED]>  Sun, 28 Jan 2007 15:13:54 +0100
+
 linpopup (1.2.0-8.1) unstable; urgency=low
 
   * Non-maintainer upload to fix longstanding l10n issues
diff -Nru linpopup-1.2.0.old/debian/compat linpopup-1.2.0/debian/compat
--- linpopup-1.2.0.old/debian/compat	1970-01-01 01:00:00.000000000 +0100
+++ linpopup-1.2.0/debian/compat	2007-01-28 15:16:05.450095409 +0100
@@ -0,0 +1 @@
+5
diff -Nru linpopup-1.2.0.old/debian/control linpopup-1.2.0/debian/control
--- linpopup-1.2.0.old/debian/control	2007-01-28 14:50:30.731278168 +0100
+++ linpopup-1.2.0/debian/control	2007-01-28 15:15:57.618039396 +0100
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Paul Slootman <[EMAIL PROTECTED]>
 Standards-Version: 3.6.2
-Build-Depends: debmake,libgtk1.2-dev,po-debconf,libxmu-dev
+Build-Depends: libgtk1.2-dev,po-debconf,libxmu-dev, debhelper (> 5.0.0)
 
 Package: linpopup
 Architecture: any
diff -Nru linpopup-1.2.0.old/debian/linpopup.examples linpopup-1.2.0/debian/linpopup.examples
--- linpopup-1.2.0.old/debian/linpopup.examples	1970-01-01 01:00:00.000000000 +0100
+++ linpopup-1.2.0/debian/linpopup.examples	2007-01-28 15:11:11.951996797 +0100
@@ -0,0 +1 @@
+debian/smb.conf
diff -Nru linpopup-1.2.0.old/debian/linpopup.install linpopup-1.2.0/debian/linpopup.install
--- linpopup-1.2.0.old/debian/linpopup.install	1970-01-01 01:00:00.000000000 +0100
+++ linpopup-1.2.0/debian/linpopup.install	2007-01-28 15:14:31.117420794 +0100
@@ -0,0 +1,2 @@
+debian/linpopup.xpm       usr/share/pixmaps
+debian/linpopup-small.xpm usr/share/pixmaps
diff -Nru linpopup-1.2.0.old/debian/po/nl.po linpopup-1.2.0/debian/po/nl.po
--- linpopup-1.2.0.old/debian/po/nl.po	2007-01-28 14:50:30.727278140 +0100
+++ linpopup-1.2.0/debian/po/nl.po	2007-01-28 14:52:25.508069233 +0100
@@ -16,7 +16,7 @@
 "Project-Id-Version: linpopup\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2006-12-03 11:33+0100\n"
-"PO-Revision-Date: 2004-10-28 23:28+0100\n"
+"PO-Revision-Date: 2006-12-28 11:52+0100\n"
 "Last-Translator: Bart Cornelis <[EMAIL PROTECTED]>\n"
 "Language-Team: debian-l10n-dutch <debian-l10n-dutch@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
@@ -32,49 +32,30 @@
 #. Type: note
 #. Description
 #: ../linpopup.templates:1001
-msgid ""
-"You don't have the smbclient package installed. This means that you will NOT "
-"be able to send any messages; you will only be able to receive them."
-msgstr ""
-"U heeft het 'smbclient'-pakket niet geïnstalleerd, u zult bijgevolg NIET in "
-"staat zijn om berichten te versturen; u kunt enkel berichten ontvangen."
+msgid "You don't have the smbclient package installed. This means that you will NOT be able to send any messages; you will only be able to receive them."
+msgstr "U heeft het 'smbclient'-pakket niet geïnstalleerd, u zult bijgevolg NIET in staat zijn om berichten te versturen; u kunt enkel berichten ontvangen."
 
 #. Type: note
 #. Description
 #: ../linpopup.templates:1001
-msgid ""
-"If you do want to send messages with LinPopup, install the smbclient package."
-msgstr ""
-"Als u toch berichten wilt kunnen versturen via LinPopup, zult u het "
-"'smbclient'-pakket dienen te installeren."
+msgid "If you do want to send messages with LinPopup, install the smbclient package."
+msgstr "Als u toch berichten wilt kunnen versturen via LinPopup, zult u het 'smbclient'-pakket moeten installeren."
 
 #. Type: boolean
 #. Description
 #: ../linpopup.templates:2001
 msgid "Add LinPopUp to Samba's config?"
-msgstr "LinPopUp toevoegen in de Samba-configuratie?"
+msgstr "Wilt u LinPopUp toevoegen in de Samba-configuratie?"
 
 #. Type: boolean
 #. Description
 #: ../linpopup.templates:2001
-msgid ""
-"A configuration line for LinPopUp will have to be added to Samba's "
-"${SMBCONF} to enable receiving popup messages. This can be done "
-"automatically.  Select this option if you want that done."
-msgstr ""
-"Om popup-berichten te kunnen ontvangen dient er een configuratieregel "
-"toegevoegd te worden aan Samba's ${SMBCONF}. Dit kan automatisch gedaan "
-"worden. Als u dit wilt activeer dan deze optie."
+msgid "A configuration line for LinPopUp will have to be added to Samba's ${SMBCONF} to enable receiving popup messages. This can be done automatically.  Select this option if you want that done."
+msgstr "Om popup-berichten te kunnen ontvangen dient er een configuratieregel toegevoegd te worden aan Samba's ${SMBCONF}. Dit kan automatisch gedaan worden. Als u dit wilt activeer dan deze optie."
 
 #. Type: boolean
 #. Description
 #: ../linpopup.templates:2001
-#, fuzzy
-msgid ""
-"Currently, to get the popups when they are received, you must have linpopup "
-"running on your X desktop. If that's not the case, the messages are saved so "
-"that you can see them at a later time, when you do start linpopup."
-msgstr ""
-"Om popups bij ontvangst ook effectief te zien te krijgen, dient u linpopup "
-"draaiende te hebben op uw X-desktop. Zoniet zullen berichten opgeslagen "
-"worden, u krijgt ze dan de eerstvolgende keer dat u linpopup start te zien."
+msgid "Currently, to get the popups when they are received, you must have linpopup running on your X desktop. If that's not the case, the messages are saved so that you can see them at a later time, when you do start linpopup."
+msgstr "Momenteel dient u linpopup draaiende te hebben op uw X-desktop om popups ook effectief te zien te krijgen bij ontvangst. Wanneer dat niet het geval is worden berichten opgeslagen, en krijgt u ze pas te zien wanneer u linpopup opstart."
+
diff -Nru linpopup-1.2.0.old/debian/rules linpopup-1.2.0/debian/rules
--- linpopup-1.2.0.old/debian/rules	2007-01-28 14:50:30.731278168 +0100
+++ linpopup-1.2.0/debian/rules	2007-01-30 21:37:54.877422054 +0100
@@ -2,11 +2,18 @@
 # Made with the aid of debmake, by Christoph Lameter,
 # based on the sample debian/rules file for GNU hello by Ian Jackson.
 
-package=linpopup
 topdir=$(shell pwd)
 
-build:
-	$(checkdir)
+configure:
+
+configure-stamp:
+	dh_testdir
+	touch configure-stamp
+
+
+build: configure-stamp build-stamp
+build-stamp:
+	dh_testdir
 	
     # save these to minimize the diff; doesn't make any difference
 	rm -f debian/LinPopUp.1.in debian/LinPopUp.1 debian/INSTALL debian/MANUAL
@@ -19,7 +26,6 @@
 
     # first initialize the documentation to reflect the debian location of stuff
 	cd src; make CFLAGS="-O2 -g -Wall" DESTDIR=/usr PROGNAME=linpopup DOC_DIR=/usr/share/doc/linpopup linpopup docs
-	touch build
 
     # restore these to minimize the diff
 	rm -f extra/LinPopUp.1.in LinPopUp.1 INSTALL MANUAL
@@ -28,8 +34,12 @@
 	mv debian/INSTALL       .
 	mv debian/MANUAL        .
 
+	touch build-stamp
+
 clean:
-	$(checkdir)
+	dh_testdir
+
+	dh_testroot
 	-rm -f build
 	-cd src; make clean PROGNAME=linpopup
 	-rm -f src/LinPopUp
@@ -37,55 +47,54 @@
 	-rm -rf debian/tmp debian/files* core debian/substvars
 	-rm -f extra/linpopup.1.in extra/linpopup.pod linpopup.1
 	debconf-updatepo
+	dh_clean
 
-binary-indep: checkroot build
-	$(checkdir)
+install: install-stamp
+install-stamp: build-stamp
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_installdirs
+
+binary-indep: build install
+	dh_testdir
+	dh_testroot
 # There are no architecture-independent files to be uploaded
 # generated by this package.  If there were any they would be
 # made here.
 
-binary-arch: checkroot build
-	$(checkdir)
-	-rm -rf debian/tmp
-	install -d debian/tmp
-	cd debian/tmp && install -d `cat ../dirs`
+binary-arch: build install
+	dh_testdir
+	dh_testroot
 	cd src; make install \
 		PROGNAME=linpopup \
 		PROGNAME_LNK=LinPopUp \
-		DESTDIR=$(topdir)/debian/tmp/usr \
-		DOC_DIR=$(topdir)/debian/tmp/usr/share/doc/linpopup \
-		INSTALL_MANPATH=$(topdir)/debian/tmp/usr/share/man  \
-		DATA_DIR=$(topdir)/debian/tmp/var/lib/linpopup
-	rm -f debian/tmp/usr/share/doc/linpopup/COPYING
-	rm -f debian/tmp/var/lib/linpopup/messages.dat
-	mv debian/tmp/usr/share/doc/linpopup/ChangeLog debian/tmp/usr/share/doc/linpopup/changelog
-	install -m 644 debian/linpopup.xpm       debian/tmp/usr/share/pixmaps
-	install -m 644 debian/linpopup-small.xpm debian/tmp/usr/share/pixmaps
-	install -m 644 debian/smb.conf debian/tmp/usr/share/doc/linpopup/examples/smb.conf
-	# Must have debmake installed for this to work.
-	debstd -s
-	# install -m 644 -o root -g root debian/linpopup.templates debian/tmp/DEBIAN/templates
-	po2debconf debian/linpopup.templates > debian/tmp/DEBIAN/templates
-	install -m 755 -o root -g root debian/linpopup.config    debian/tmp/DEBIAN/config
-	cd debian/tmp; \
-		find . -type f ! -regex "./DEBIAN/.*" -print0 | \
-			xargs -0 md5sum | sed -e '/\.\//s///' > DEBIAN/md5sums;\
-		chmod 644 DEBIAN/md5sums
-	dpkg-gencontrol -isp
-	chown -R root.root debian/tmp
-	chmod -R go=rX debian/tmp
-	dpkg --build debian/tmp ..
-
-define checkdir
-	test -f debian/rules
-endef
+		DESTDIR=$(topdir)/debian/linpopup/usr \
+		DOC_DIR=$(topdir)/debian/linpopup/usr/share/doc/linpopup \
+		INSTALL_MANPATH=$(topdir)/debian/linpopup/usr/share/man  \
+		DATA_DIR=$(topdir)/debian/linpopup/var/lib/linpopup
+	rm -f debian/linpopup/usr/share/doc/linpopup/COPYING
+	rm -f debian/linpopup/var/lib/linpopup/messages.dat
+	mv debian/linpopup/usr/share/doc/linpopup/ChangeLog debian/linpopup/usr/share/doc/linpopup/changelog
+
+	dh_install
+	dh_installexamples
+	dh_installdebconf
+	dh_installchangelogs
+	dh_installdocs
+	dh_installmenu
+	dh_strip
+	dh_compress
+	dh_fixperms
+	dh_installdeb
+	dh_shlibdeps
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
 
-binary: binary-indep binary-arch
 
-checkroot:
-	$(checkdir)
-	test root = "`whoami`"
+binary: binary-indep binary-arch
 
-.PHONY: binary binary-arch binary-indep clean checkroot
+.PHONY: build clean binary binary-arch binary-indep
 
 # vim:set noet:

Attachment: signature.asc
Description: Digital signature

Reply via email to