[DRE-commits] r3640 - in packages/booh/trunk/debian: . patches

[Lucas Nussbaum]

Author: lucas
Date: 2009-06-19 09:06:25 +0000 (Fri, 19 Jun 2009)
New Revision: 3640

Added:
   packages/booh/trunk/debian/patches/remove_private_rexml.diff
Modified:
   packages/booh/trunk/debian/patches/gettext_locale.diff
   packages/booh/trunk/debian/patches/series
   packages/booh/trunk/debian/rules
Log:
added patch to remove booh's private copy of REXML

Modified: packages/booh/trunk/debian/patches/gettext_locale.diff
===================================================================
--- packages/booh/trunk/debian/patches/gettext_locale.diff	2009-06-19 07:35:27 UTC (rev 3639)
+++ packages/booh/trunk/debian/patches/gettext_locale.diff	2009-06-19 09:06:25 UTC (rev 3640)
@@ -7,5 +7,5 @@
 -require 'gettext/locale'
 +require 'locale'
  include GetText
- require 'booh/rexml/document'
+ require 'rexml/document'
  include REXML

Added: packages/booh/trunk/debian/patches/remove_private_rexml.diff
===================================================================
--- packages/booh/trunk/debian/patches/remove_private_rexml.diff	                        (rev 0)
+++ packages/booh/trunk/debian/patches/remove_private_rexml.diff	2009-06-19 09:06:25 UTC (rev 3640)
@@ -0,0 +1,66 @@
+--- a/bin/album2booh
++++ b/bin/album2booh
+@@ -36,7 +36,7 @@
+ require 'getoptlong'
+ require 'gettext'
+ include GetText
+-require 'booh/rexml/document'
++require 'rexml/document'
+ include REXML
+ 
+ require 'booh/booh-lib'
+--- a/bin/booh
++++ b/bin/booh
+@@ -31,7 +31,7 @@ require 'gettext'
+ include GetText
+ bindtextdomain("booh")
+ 
+-require 'booh/rexml/document'
++require 'rexml/document'
+ include REXML
+ 
+ require 'booh/booh-lib'
+--- a/bin/booh-backend
++++ b/bin/booh-backend
+@@ -23,7 +23,7 @@ require 'getoptlong'
+ require 'gettext'
+ require 'gettext/locale'
+ include GetText
+-require 'booh/rexml/document'
++require 'rexml/document'
+ include REXML
+ 
+ require 'booh/booh-lib'
+--- a/bin/booh-classifier
++++ b/bin/booh-classifier
+@@ -29,7 +29,7 @@ require 'gettext'
+ include GetText
+ bindtextdomain("booh")
+ 
+-require 'booh/rexml/document'
++require 'rexml/document'
+ include REXML
+ 
+ require 'booh/booh-lib'
+--- a/bin/webalbum2booh
++++ b/bin/webalbum2booh
+@@ -22,7 +22,7 @@
+ require 'getoptlong'
+ require 'gettext'
+ include GetText
+-require 'booh/rexml/document'
++require 'rexml/document'
+ include REXML
+ 
+ require 'booh/booh-lib'
+--- a/lib/booh/booh-lib.rb
++++ b/lib/booh/booh-lib.rb
+@@ -22,7 +22,7 @@ require 'timeout'
+ require 'tempfile'
+ require 'monitor'
+ 
+-require 'booh/rexml/document'
++require 'rexml/document'
+ 
+ require 'gettext'
+ include GetText

Modified: packages/booh/trunk/debian/patches/series
===================================================================
--- packages/booh/trunk/debian/patches/series	2009-06-19 07:35:27 UTC (rev 3639)
+++ packages/booh/trunk/debian/patches/series	2009-06-19 09:06:25 UTC (rev 3640)
@@ -1 +1,2 @@
+remove_private_rexml.diff
 gettext_locale.diff

Modified: packages/booh/trunk/debian/rules
===================================================================
--- packages/booh/trunk/debian/rules	2009-06-19 07:35:27 UTC (rev 3639)
+++ packages/booh/trunk/debian/rules	2009-06-19 09:06:25 UTC (rev 3640)
@@ -7,5 +7,7 @@
 install/booh::
 	mv $(CURDIR)/debian/booh/usr/lib/ruby/1.8/x86_64-linux/libadds.so \
 	$(CURDIR)/debian/booh/usr/lib/ruby/1.8/x86_64-linux/booh/libadds.so
+	# Remove private copy of REXML
+	rm -rf $(CURDIR)/debian/booh/usr/lib/ruby/1.8/booh/rexml
 clean::
 	find data -name '*.mo' -exec rm -f {} \;