[Initscripts-ng-commits] r1064 - in /trunk/src/insserv/debian: changelog patches/11_debian_conf.patch patches/series

[kelmo-guest at users.alioth.debian.org]

Author: kelmo-guest
Date: Sun Apr  8 22:56:11 2012
New Revision: 1064

URL: http://svn.debian.org/wsvn/initscripts-ng/?sc=1&rev=1064
Log:
Import NMUs of 1.14.0-2.1 & 1.14.0-2.2

Modified:
    trunk/src/insserv/debian/changelog
    trunk/src/insserv/debian/patches/11_debian_conf.patch
    trunk/src/insserv/debian/patches/series

Modified: trunk/src/insserv/debian/changelog
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/changelog?rev=1064&op=diff
==============================================================================
--- trunk/src/insserv/debian/changelog (original)
+++ trunk/src/insserv/debian/changelog Sun Apr  8 22:56:11 2012
@@ -1,3 +1,21 @@
+insserv (1.14.0-2.2) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Fix pending l10n issues. Debconf translations:
+    - Danish (Joe Hansen).  Closes: #619657
+    - Slovak (Slavko).  Closes: #641960
+    - Bokmål, (Bjørn Steensrud).  Closes: #654871
+
+ -- Christian Perrier <bubulle at debian.org>  Sun, 15 Jan 2012 08:11:26 +0100
+
+insserv (1.14.0-2.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Drop definition of $portmap (Closes: #564501).
+  * Add unbound to definition of $named (Closes: #602901).
+
+ -- Luk Claes <luk at debian.org>  Sat, 19 Mar 2011 12:48:34 +0100
+
 insserv (1.14.0-2) unstable; urgency=low
 
   [ Kel Modderman ]

Modified: trunk/src/insserv/debian/patches/11_debian_conf.patch
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/patches/11_debian_conf.patch?rev=1064&op=diff
==============================================================================
--- trunk/src/insserv/debian/patches/11_debian_conf.patch (original)
+++ trunk/src/insserv/debian/patches/11_debian_conf.patch Sun Apr  8 22:56:11 2012
@@ -2,8 +2,10 @@
 Fixes:   None, made as part of Debian porting.
 Status:  Debian specific, showed to upstream.
 ---
---- a/insserv.conf
-+++ b/insserv.conf
+Index: insserv-1.14.0/insserv.conf
+===================================================================
+--- insserv-1.14.0.orig/insserv.conf	2010-02-19 14:08:04.000000000 +0100
++++ insserv-1.14.0/insserv.conf	2011-03-19 12:48:16.000000000 +0100
 @@ -1,29 +1,29 @@
  #
  # All local filesystems are mounted (done during boot phase)
@@ -21,7 +23,7 @@
  # Named is operational
  #
 -$named		+named +dnsmasq +lwresd $network
-+$named		+named +dnsmasq +lwresd +bind9 $network
++$named		+named +dnsmasq +lwresd +bind9 +unbound $network
  
  #
  # All remote filesystems are mounted (note in some cases /usr may
@@ -39,7 +41,7 @@
  
  #
  # SunRPC portmapper available
-@@ -33,9 +33,9 @@ $portmap	portmap
+@@ -33,9 +33,9 @@
  #
  # The system time has been set correctly
  #

Modified: trunk/src/insserv/debian/patches/series
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/patches/series?rev=1064&op=diff
==============================================================================
--- trunk/src/insserv/debian/patches/series (original)
+++ trunk/src/insserv/debian/patches/series Sun Apr  8 22:56:11 2012
@@ -5,3 +5,4 @@
 30_interactive_regexp_match_fix.patch
 92_m68k_alignment.patch
 #100_show.patch
+110_portmap.patch