[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[SCM] LibreOffice packaging repository branch, master, updated. libreoffice_3.5.2-1-5-g9633098



The following commit has been merged in the master branch:
commit e188b644688e813187ff6520a008deb6cd3cf8d0
Author: Rene Engelhard <rene@debian.org>
Date:   Thu Apr 5 14:16:24 2012 +0200

    strip ure from uno-libs3.substvars again after the .symbols change

diff --git a/changelog b/changelog
index 02e482f..5e931bb 100644
--- a/changelog
+++ b/changelog
@@ -3,8 +3,11 @@ libreoffice (1:3.5.2-2) UNRELEASED; urgency=low
   * debian/shell-lib-extensions.sh, debian/*bug-script.in:
     use --bundled instead of --shared; that's what we do and without bundled
     we don't get the info with unopkg list
+  * debian/rules:
+    - strip ure from uno-libs3.substvars again after the .symbols change
+      (closes: #667465)
 
- -- Rene Engelhard <rene@debian.org>  Thu, 05 Apr 2012 14:12:44 +0200
+ -- Rene Engelhard <rene@debian.org>  Thu, 05 Apr 2012 14:15:42 +0200
 
 libreoffice (1:3.5.2-1) unstable; urgency=low
 
diff --git a/rules b/rules
index c415216..3cf4d62 100755
--- a/rules
+++ b/rules
@@ -2814,7 +2814,7 @@ ifeq "$(ENABLE_LIBRSVG)" "y"
   endif
 endif
 	# don't make uno-libs3 depend on ure...
-	perl -pi -e 's/, ure \(.*\)$$//' debian/uno-libs3.substvars
+	perl -pi -e 's/, ure$$//' debian/uno-libs3.substvars
 	# .. and prevent ure to depend on itself..
 	perl -pi -e 's/, ure \(.*\)$$//' debian/ure.substvars
 ifeq "$(ENABLE_JAVA)" "y"

-- 
LibreOffice packaging repository


Reply to: