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

[SCM] LibreOffice packaging repository branch, master, updated. libreoffice_4.0.3-2-4-gf3d1397



The following commit has been merged in the master branch:
commit 4353b52d0060827343e59a93d422d5494b4eef00
Author: Rene Engelhard <rene@debian.org>
Date:   Sat May 11 01:20:57 2013 +0200

    libreg.so.3 needs libstore.so.3...

diff --git a/changelog b/changelog
index be76e14..9cd0510 100644
--- a/changelog
+++ b/changelog
@@ -10,13 +10,14 @@ libreoffice (1:4.0.3-2) unstable; urgency=low
     - build with libboost1.53-dev to work around mdds-using sc unit tests
       failing to build with sids new gcc-4.7
     - move libxmlreader.so (although not versioned...) and libreg.so.3 (although
-      private...) into uno-libs3 as libuno_cppuhelpergcc3.so.3 now links to
-      it (breaks ure->uno-libs3->ure dependency loop)
+      private...) and it's dependency libstore.so.3 into uno-libs3 as
+      libuno_cppuhelpergcc3.so.3 now links to it (breaks ure->uno-libs3->ure
+      dependency loop)
 
    (hopefully breaking those two dependency loops closes: #705158, thanks
     David Kalnischkies - see also #707578)
 
- -- Rene Engelhard <rene@debian.org>  Fri, 10 May 2013 22:36:52 +0200
+ -- Rene Engelhard <rene@debian.org>  Sat, 11 May 2013 01:20:03 +0200
 
 libreoffice (1:4.0.3-1) unstable; urgency=low
 
diff --git a/rules b/rules
index 570d7f2..e7310f9 100755
--- a/rules
+++ b/rules
@@ -2145,7 +2145,8 @@ endif
 		ln -sf /$(OOUREDIR)/lib/`basename $$i` debian/uno-libs3/usr/lib/`basename $$i`; \
 	done
 	# we also need libxmlreader.so and libreg.so.3 (libuno_cppuhelpergcc3.so.3 needs it)
-	for i in libxmlreader.so libreg.so.3; do \
+	# and libstore.so.3 (libreg.so.3 needs it)
+	for i in libxmlreader.so libreg.so.3 libstore.so.3; do \
 		mv debian/ure/$(OOUREDIR)/lib/$$i \
 			debian/uno-libs3/$(OOUREDIR)/lib; \
 	done

-- 
LibreOffice packaging repository


Reply to: