On Fri, Aug 06, 2010 at 01:05:21AM +0200, Serafeim Zanikolas wrote:
> I've prepared an NMU for pdns (versioned as 2.9.22-6.1) and uploaded it to
> DELAYED/2. Please feel free to tell me if I should delay it longer.

Forgot to attach the NMU patch.

-S
diff -Nurp pdns-2.9.22.orig//debian/changelog pdns-2.9.22/debian/changelog
--- pdns-2.9.22.orig//debian/changelog	2010-07-18 14:48:36.000000000 +0200
+++ pdns-2.9.22/debian/changelog	2010-08-05 19:20:50.000000000 +0200
@@ -1,3 +1,12 @@
+pdns (2.9.22-6.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Install file for init.d virtual facility for pdns-server in the correct
+    place, and add pdns-recursor as an optional dependency. Thanks to Petter
+    Reinholdtsen (Closes: #585966)
+
+ -- Serafeim Zanikolas <s...@debian.org>  Thu, 05 Aug 2010 19:05:50 +0200
+
 pdns (2.9.22-6) unstable; urgency=high
 
   * Provide the virtual facility $named. (Closes: #585966)
diff -Nurp pdns-2.9.22.orig//debian/pdns-server.insserv pdns-2.9.22/debian/pdns-server.insserv
--- pdns-2.9.22.orig//debian/pdns-server.insserv	2010-07-18 13:29:41.000000000 +0200
+++ pdns-2.9.22/debian/pdns-server.insserv	2010-08-05 18:53:20.000000000 +0200
@@ -1 +1 @@
-$named pdns
+$named pdns +pdns-recursor
diff -Nurp pdns-2.9.22.orig//debian/pdns-server.install pdns-2.9.22/debian/pdns-server.install
--- pdns-2.9.22.orig//debian/pdns-server.install	2010-07-18 13:04:58.000000000 +0200
+++ pdns-2.9.22/debian/pdns-server.install	2010-08-05 19:15:54.000000000 +0200
@@ -6,4 +6,3 @@ debian/config/pdns.local usr/share/pdns-
 debian/default/pdns usr/share/pdns-server/
 debian/init.d/pdns etc/init.d/
 debian/resolvconf/pdns etc/resolvconf/update.d/
-debian/pdns-server.insserv etc/insserv.conf.d/pdns-server
diff -Nurp pdns-2.9.22.orig//debian/rules pdns-2.9.22/debian/rules
--- pdns-2.9.22.orig//debian/rules	2010-04-07 22:34:37.000000000 +0200
+++ pdns-2.9.22/debian/rules	2010-08-05 20:40:56.000000000 +0200
@@ -87,6 +87,10 @@ install: build
 	# Install the stuff
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
 	$(MAKE) -C pdns/docs html/index.html
+	# Set up init.d virtual facility
+	mkdir -p $(CURDIR)/debian/pdns-server/etc/insserv.conf.d/
+	cp $(CURDIR)/debian/pdns-server.insserv \
+	   $(CURDIR)/debian/pdns-server/etc/insserv.conf.d/pdns-server
 	
 	dh_install
 

Reply via email to