Bug#545358: Re: Bug#545358: The patch doesn't seem right

2009-12-09 Thread Vizcaino, Aldo Maria

Hi Maximiliano,

you are right, this bug is also present for example for time-admin, so  
we added debian again, and it works.


We continued investigating system-tools-backends, from upstrem,  
squeeze, and lenny, and this bug was solved on  
system-tools-backends-2.8.2(squeeze), but in  
system-tools-backends-2.8.1(lenny) they define the vars with the  
version (debian-3.0 or debian-4.0..)


Fernando and I think that changing the patch 01_debian_4.0.patch might  
implie changing others patchs.. so it's too complicated, and could be  
solved in the next upgrade.


We attach the patch.


Index: system-tools-backends-2.6.0/Network/Hosts.pm
===
--- system-tools-backends-2.6.0.orig/Network/Hosts.pm	2009-12-07 16:53:59.0 -0300
+++ system-tools-backends-2.6.0/Network/Hosts.pm	2009-12-07 16:54:59.0 -0300
@@ -37,6 +37,7 @@
 {
   my %dist_map =
 	 (
+debian	  = debian,
 redhat-6.2  = redhat-6.2,
 redhat-7.0  = redhat-6.2,
 redhat-7.1  = redhat-6.2,

Index: system-tools-backends-2.6.0/Network/Ifaces.pm
===
--- system-tools-backends-2.6.0.orig/Network/Ifaces.pm	2009-12-07 16:54:08.0 -0300
+++ system-tools-backends-2.6.0/Network/Ifaces.pm	2009-12-07 16:55:36.0 -0300
@@ -1995,6 +1995,7 @@
 {
   my %dist_map =
 	 (
+debian  = debian,
 redhat-6.2  = redhat-6.2,
 redhat-7.0  = redhat-6.2,
 redhat-7.1  = redhat-6.2,

Index: system-tools-backends-2.6.0/Share/SMB.pm
===
--- system-tools-backends-2.6.0.orig/Shares/SMB.pm	2009-12-07 16:58:35.0 -0300
+++ system-tools-backends-2.6.0/Shares/SMB.pm	2009-12-07 17:01:27.0 -0300
@@ -129,6 +129,7 @@
 
   my %dist_map =
   (
+   debian	 = debian,
redhat-6.2  = redhat-6.2,
redhat-7.0  = debian,
redhat-7.1  = debian,

Index: system-tools-backends-2.6.0/Time/TimeDate.pm
===
--- system-tools-backends-2.6.0.orig/Time/TimeDate.pm	2009-12-07 16:58:35.0 -0300
+++ system-tools-backends-2.6.0/Time/TimeDate.pm	2009-12-07 17:02:10.0 -0300
@@ -158,6 +158,7 @@
 {
   my %dist_map =
   (
+   debian  = debian,
redhat-6.2  = redhat-6.2,
redhat-7.0  = redhat-6.2,
redhat-7.1  = redhat-6.2,

Index: system-tools-backends-2.6.0/Time/Platform.pm
===
--- system-tools-backends-2.6.0.orig/Utils/Platform.pm	2009-12-07 16:58:35.0 -0300
+++ system-tools-backends-2.6.0/Utils/Platform.pm	2009-12-07 17:02:46.0 -0300
@@ -115,6 +115,7 @@
 (
  blackpanther-4.0 = mandrake-9.0,
  conectiva-10 = conectiva-9,
+ debian   = debian,
  mandrake-7.1 = redhat-6.2,
  mandrake-7.2 = redhat-6.2,
  mandrake-9.1 = mandrake-9.0,


Bug#545358: Re: Bug#545358: The patch doesn't seem right

2009-12-07 Thread Maximiliano Curia
Hola Fernando López!

El 07/12/2009 a las 02:19 escribiste:
 Did you take in account the patch 01_debian_4.0.patch introduced in the
 version 2.6.0-2lenny2? It replaces the appereances of debian-3.0 for just
 debian.

Ok, I hadn't seen it.

 This patch changes the dicts and I think it may introduce this bug, as for the
 solution I don't know if there is any better but the one we propose actually
 works, we are using it in our Distro and it works.

 We will prepare a full patch in a few days and send you.

The patch (01_debian_4.0.patch) also removes debian-3.0 without adding a
debian from various places (Hosts, TimeDate, SMB). Can you confirm that
those aren't needed?

In any case, it's usually better to use the fix that was applied by upstream,
specially if you want to push the change to stable.

Thanks, 
-- 
Haskell is faster than C++, more concise than Perl, more regular than Python,
more flexible than Ruby, more typeful than C#, more robust than Java, and has
absolutely nothing in common with PHP. -- Audrey Tang
Saludos /\/\ /\  `/



--
To UNSUBSCRIBE, email to debian-bugs-rc-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org