[med-svn] r3914 - in trunk/packages/arb/trunk/debian: . patches

[Andreas Tille]

Author: tille
Date: 2009-09-07 11:51:39 +0000 (Mon, 07 Sep 2009)
New Revision: 3914

Removed:
   trunk/packages/arb/trunk/debian/patches/20_replace_rxp_by_xmllint.patch
Modified:
   trunk/packages/arb/trunk/debian/changelog
   trunk/packages/arb/trunk/debian/patches/series
Log:
Upstream is now using xmllint instead of rxp


Modified: trunk/packages/arb/trunk/debian/changelog
===================================================================
--- trunk/packages/arb/trunk/debian/changelog	2009-09-07 11:47:58 UTC (rev 3913)
+++ trunk/packages/arb/trunk/debian/changelog	2009-09-07 11:51:39 UTC (rev 3914)
@@ -9,6 +9,9 @@
   * Standards-Version: 3.8.3 (Added README.source)
   * Build-Depends: dpkg-dev (>= 1.15.4) to make use of
     `dpkg-architecture -qDEB_BUILD_ARCH_BITS` in Makefile
+  * Removed patches which were applied upstream
+    - debian/patches/ARB_release200712_gcc4.3.1.patch
+    - debian/patches/20_replace_rxp_by_xmllint.patch
 
   [ David Paleino ]
   * Removed myself from Uploaders

Deleted: trunk/packages/arb/trunk/debian/patches/20_replace_rxp_by_xmllint.patch
===================================================================
--- trunk/packages/arb/trunk/debian/patches/20_replace_rxp_by_xmllint.patch	2009-09-07 11:47:58 UTC (rev 3913)
+++ trunk/packages/arb/trunk/debian/patches/20_replace_rxp_by_xmllint.patch	2009-09-07 11:51:39 UTC (rev 3914)
@@ -1,13 +0,0 @@
---- arb-0.0.20071207.1.orig/HELP_SOURCE/quietly.pl
-+++ arb-0.0.20071207.1/HELP_SOURCE/quietly.pl
-@@ -21,7 +21,9 @@
- 
- if ($tool ne 'RXP') { die_usage "Expected 'RXP' as 1st arg (not '$tool')"; }
- 
--my $tool_command = "rxp -v -V -V $xmlfile 2>&1 >/dev/null";
-+### rxp is quite outdated and thus use xmllint on Debian
-+# my $tool_command = "rxp -v -V -V $xmlfile 2>&1 >/dev/null";
-+my $tool_command = "xmllint $xmlfile 2>&1 >/dev/null";
- 
- my $tool_out = `$tool_command`;
- if ($? == -1) { die "Failed to execute '$tool_command'" }

Modified: trunk/packages/arb/trunk/debian/patches/series
===================================================================
--- trunk/packages/arb/trunk/debian/patches/series	2009-09-07 11:47:58 UTC (rev 3913)
+++ trunk/packages/arb/trunk/debian/patches/series	2009-09-07 11:51:39 UTC (rev 3914)
@@ -2,7 +2,6 @@
 20_config.makefiles
 30_Makefile_main
 20_Makefiles
-20_replace_rxp_by_xmllint.patch
 20_tmpfile_issue.patch
 tmpfile_CVE-2008-5378.patch
 20_64bit_support_-fPIC.patch