rev 5744 - in branches/etch/packages/kdeadmin/debian: . patches

[Modestas Vainius]

Author: modax-guest
Date: 2007-03-12 22:53:21 +0000 (Mon, 12 Mar 2007)
New Revision: 5744

Added:
   branches/etch/packages/kdeadmin/debian/patches/02_knetworkconf_recognize_allow-stanzas.diff
Modified:
   branches/etch/packages/kdeadmin/debian/changelog
Log:
Fix for RC bug #410144. Compilation verified. Patch tested.

Modified: branches/etch/packages/kdeadmin/debian/changelog
===================================================================
--- branches/etch/packages/kdeadmin/debian/changelog	2007-03-12 08:59:58 UTC (rev 5743)
+++ branches/etch/packages/kdeadmin/debian/changelog	2007-03-12 22:53:21 UTC (rev 5744)
@@ -1,3 +1,17 @@
+kdeadmin (4:3.5.5-4) unstable; urgency=high
+
+  * Urgency high because this upload fixes RC bug.
+
+  +++ Changes by Modestas Vainius:
+
+  * knetworkconf RC bug fix: recognize allow-* statements in
+    /etc/network/interfaces as stanzas, not as ordinary options. This
+    misrecognition led to corruption of the interfaces file in case allow-*
+    stanza followed the iface stanza that new options were added to. Patch
+    no. 02 (Closes: #410144)
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 13 Mar 2007 00:49:38 +0200
+
 kdeadmin (4:3.5.5-3) unstable; urgency=medium
 
   +++ Changes by Sune Vuorela:

Added: branches/etch/packages/kdeadmin/debian/patches/02_knetworkconf_recognize_allow-stanzas.diff
===================================================================
--- branches/etch/packages/kdeadmin/debian/patches/02_knetworkconf_recognize_allow-stanzas.diff	2007-03-12 08:59:58 UTC (rev 5743)
+++ branches/etch/packages/kdeadmin/debian/patches/02_knetworkconf_recognize_allow-stanzas.diff	2007-03-12 22:53:21 UTC (rev 5744)
@@ -0,0 +1,12 @@
+diff -uNr kdeadmin-3.5.6/knetworkconf/backends/replace.pl.in kdeadmin-3.5.6.patched/knetworkconf/backends/replace.pl.in
+--- kdeadmin-3.5.6/knetworkconf/backends/replace.pl.in	2006-01-19 18:20:15.000000000 +0200
++++ kdeadmin-3.5.6.patched/knetworkconf/backends/replace.pl.in	2007-03-12 23:57:26.000000000 +0200
+@@ -1000,7 +1000,7 @@
+ {
+   my ($line) = @_;
+ 
+-  return 1 if $line =~ /^(iface|auto|mapping)[ \t]+[^ \t]/;
++  return 1 if $line =~ /^(iface|auto|mapping|allow-\w+)[ \t]+[^ \t]/;
+   return 0;
+ }
+