[xml/sgml-pkgs] Bug#248910: xml-core: bugfix for #248910

[guillaume pernot]

This is a multi-part MIME message sent by reportbug.

--===============1282535270==
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

Package: xml-core
Version: 0.09
Severity: normal
Followup-For: Bug #248910


this patch does the trick on woody, sarge and sid


-- System Information:
Debian Release: 3.0
Architecture: i386 (i686)
Kernel: Linux 2.4.23-praksys
Locale: LANG=C, LC_CTYPE=C

*** 15praksys-fix-debhelper.diff
diff -ruN xml-core-0.09-old/debhelper/dh_installxmlcatalogs xml-core-0.09/debhelper/dh_installxmlcatalogs
--- xml-core-0.09-old/debhelper/dh_installxmlcatalogs	Sun Feb 29 04:14:37 2004
+++ xml-core-0.09/debhelper/dh_installxmlcatalogs	Thu Jul  1 11:35:11 2004
@@ -227,8 +227,8 @@
 						die("error: package command with ID '$id' uses non-existent catalog '$local'\n");
 					}
 					
-					$ADD_PACKAGE .= "\t" . add_xmlcat_cmd($package, $type, $id, $local) . "\\n";
-					$DEL_PACKAGE .= "\t" . del_xmlcat_cmd($package, $type, $id) . "\\n";
+					$ADD_PACKAGE .= "\t" . add_xmlcat_cmd($package, $type, $id, $local) . ";";
+					$DEL_PACKAGE .= "\t" . del_xmlcat_cmd($package, $type, $id) . ";";
 
 				}
 			} elsif ( $line->[0] eq 'root' ) {
@@ -236,8 +236,8 @@
 
 					my $type = $line->[1];
 					my $id	 = $line->[2];
-					$ADD_ROOT .= "\t" . add_xmlcat_cmd($package, $type, $id) . "\\n";
-					$DEL_ROOT .= "\t" . del_xmlcat_cmd($package, $type, $id, 1) . "\\n";
+					$ADD_ROOT .= "\t" . add_xmlcat_cmd($package, $type, $id) . ";";
+					$DEL_ROOT .= "\t" . del_xmlcat_cmd($package, $type, $id, 1) . ";";
 
 				}
 			} elsif ( $line->[0] eq 'root-and-package' ) {
@@ -253,10 +253,10 @@
 						die("error: root-and-package command with ID '$id' uses non-existent catalog '$local'\n");
 					}
 
-					$ADD_PACKAGE .= "\t" . add_xmlcat_cmd($package, $type, $id, $local) . "\\n";
-					$DEL_PACKAGE .= "\t" . del_xmlcat_cmd($package, $type, $id) . "\\n";
-					$ADD_ROOT    .= "\t" . add_xmlcat_cmd($package, $type, $id) . "\\n";
-					$DEL_ROOT    .= "\t" . del_xmlcat_cmd($package, $type, $id, 1) . "\\n";
+					$ADD_PACKAGE .= "\t" . add_xmlcat_cmd($package, $type, $id, $local) . ";";
+					$DEL_PACKAGE .= "\t" . del_xmlcat_cmd($package, $type, $id) . ";";
+					$ADD_ROOT    .= "\t" . add_xmlcat_cmd($package, $type, $id) . ";";
+					$DEL_ROOT    .= "\t" . del_xmlcat_cmd($package, $type, $id, 1) . ";";
 
 				}
 			} else {

--===============1282535270==
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename="15praksys-fix-debhelper.diff"

diff -ruN xml-core-0.09-old/debhelper/dh_installxmlcatalogs xml-core-0.09/debhelper/dh_installxmlcatalogs
--- xml-core-0.09-old/debhelper/dh_installxmlcatalogs	Sun Feb 29 04:14:37 2004
+++ xml-core-0.09/debhelper/dh_installxmlcatalogs	Thu Jul  1 11:35:11 2004
@@ -227,8 +227,8 @@
 						die("error: package command with ID '$id' uses non-existent catalog '$local'\n");
 					}
 					
-					$ADD_PACKAGE .= "\t" . add_xmlcat_cmd($package, $type, $id, $local) . "\\n";
-					$DEL_PACKAGE .= "\t" . del_xmlcat_cmd($package, $type, $id) . "\\n";
+					$ADD_PACKAGE .= "\t" . add_xmlcat_cmd($package, $type, $id, $local) . ";";
+					$DEL_PACKAGE .= "\t" . del_xmlcat_cmd($package, $type, $id) . ";";
 
 				}
 			} elsif ( $line->[0] eq 'root' ) {
@@ -236,8 +236,8 @@
 
 					my $type = $line->[1];
 					my $id	 = $line->[2];
-					$ADD_ROOT .= "\t" . add_xmlcat_cmd($package, $type, $id) . "\\n";
-					$DEL_ROOT .= "\t" . del_xmlcat_cmd($package, $type, $id, 1) . "\\n";
+					$ADD_ROOT .= "\t" . add_xmlcat_cmd($package, $type, $id) . ";";
+					$DEL_ROOT .= "\t" . del_xmlcat_cmd($package, $type, $id, 1) . ";";
 
 				}
 			} elsif ( $line->[0] eq 'root-and-package' ) {
@@ -253,10 +253,10 @@
 						die("error: root-and-package command with ID '$id' uses non-existent catalog '$local'\n");
 					}
 
-					$ADD_PACKAGE .= "\t" . add_xmlcat_cmd($package, $type, $id, $local) . "\\n";
-					$DEL_PACKAGE .= "\t" . del_xmlcat_cmd($package, $type, $id) . "\\n";
-					$ADD_ROOT    .= "\t" . add_xmlcat_cmd($package, $type, $id) . "\\n";
-					$DEL_ROOT    .= "\t" . del_xmlcat_cmd($package, $type, $id, 1) . "\\n";
+					$ADD_PACKAGE .= "\t" . add_xmlcat_cmd($package, $type, $id, $local) . ";";
+					$DEL_PACKAGE .= "\t" . del_xmlcat_cmd($package, $type, $id) . ";";
+					$ADD_ROOT    .= "\t" . add_xmlcat_cmd($package, $type, $id) . ";";
+					$DEL_ROOT    .= "\t" . del_xmlcat_cmd($package, $type, $id, 1) . ";";
 
 				}
 			} else {

--===============1282535270==--