rev 5745 - in trunk/packages/kdeadmin/debian: . patches

[Modestas Vainius]

Author: modax-guest
Date: 2007-03-12 22:54:17 +0000 (Mon, 12 Mar 2007)
New Revision: 5745

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

Modified: trunk/packages/kdeadmin/debian/changelog
===================================================================
--- trunk/packages/kdeadmin/debian/changelog	2007-03-12 22:53:21 UTC (rev 5744)
+++ trunk/packages/kdeadmin/debian/changelog	2007-03-12 22:54:17 UTC (rev 5745)
@@ -1,9 +1,18 @@
-kdeadmin (4:3.5.6-2) experimental; urgency=low
+kdeadmin (4:3.5.6-2) experimental; urgency=medium
 
   * UNRELEASED
 
- -- Ana Beatriz Guerrero Lopez <ana at debian.org>  Mon, 29 Jan 2007 09:25:24 +0100
+  +++ 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)
+  * Add myself to Uploaders.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 13 Mar 2007 00:46:38 +0200
+
 kdeadmin (4:3.5.6-1) experimental; urgency=low
 
   * New upstream release.

Modified: trunk/packages/kdeadmin/debian/control
===================================================================
--- trunk/packages/kdeadmin/debian/control	2007-03-12 22:53:21 UTC (rev 5744)
+++ trunk/packages/kdeadmin/debian/control	2007-03-12 22:54:17 UTC (rev 5745)
@@ -2,7 +2,7 @@
 Section: kde
 Priority: optional
 Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
-Uploaders: Isaac Clerencia <isaac at debian.org>, Christopher Martin <chrsmrtn at debian.org>, Adeodato Simó <dato at net.com.org.es>, Josh Metzler <joshdeb at metzlers.org>, Ana Beatriz Guerrero Lopez <ana at debian.org>, Sune Vuorela <debian at pusling.com>, Fathi Boudra <fboudra at free.fr>
+Uploaders: Isaac Clerencia <isaac at debian.org>, Christopher Martin <chrsmrtn at debian.org>, Adeodato Simó <dato at net.com.org.es>, Josh Metzler <joshdeb at metzlers.org>, Ana Beatriz Guerrero Lopez <ana at debian.org>, Sune Vuorela <debian at pusling.com>, Fathi Boudra <fboudra at free.fr>, Modestas Vainius <geromanas at mailas.com>
 Build-Depends: cdbs (>= 0.4.39-0.1), autotools-dev, debhelper (>= 5.0.31), docbook-to-man, gawk, gettext, kdelibs4-dev (>= 4:3.5.6), libbz2-dev, libpam0g-dev, lilo [i386 amd64], sharutils, texinfo, rpm
 Standards-Version: 3.7.2
 

Added: trunk/packages/kdeadmin/debian/patches/02_knetworkconf_recognize_allow-stanzas.diff
===================================================================
--- trunk/packages/kdeadmin/debian/patches/02_knetworkconf_recognize_allow-stanzas.diff	2007-03-12 22:53:21 UTC (rev 5744)
+++ trunk/packages/kdeadmin/debian/patches/02_knetworkconf_recognize_allow-stanzas.diff	2007-03-12 22:54:17 UTC (rev 5745)
@@ -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;
+ }
+