[SCM] LibreOffice packaging repository branch, master, updated. libreoffice_4.0.3-2-4-g671bf2c
The following commit has been merged in the master branch:
commit a00bd17f9cb0c0ae6144bdb0ed9c1e5ca21d7a6f
Author: Rene Engelhard <rene@debian.org>
Date: Fri May 10 22:39:06 2013 +0200
move libxmlreader.so and libreg.so.3 into uno-libs3 as libuno_cppuhelpergcc3.so.3 now links to it
diff --git a/changelog b/changelog
index 51c247d..c033a8f 100644
--- a/changelog
+++ b/changelog
@@ -8,8 +8,11 @@ libreoffice (1:4.0.3-2) unstable; urgency=low
* debian/rules:
- 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)
- -- Rene Engelhard <rene@debian.org> Fri, 10 May 2013 16:58:08 +0200
+ -- Rene Engelhard <rene@debian.org> Fri, 10 May 2013 22:36:52 +0200
libreoffice (1:4.0.3-1) unstable; urgency=low
diff --git a/control b/control
index 806e296..560a860 100644
--- a/control
+++ b/control
@@ -4034,7 +4034,7 @@ Package: uno-libs3
Section: libs
Architecture: amd64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc
Depends: ${misc:Depends}, ${shlibs:Depends}
-Replaces: ure (<< 1.4+OOo3.0.0~beta2-1)
+Replaces: ure (<< 4.0.3-2)
Description: LibreOffice UNO runtime environment -- public shared libraries
The Uno Runtime Environment (URE) is the well-known UNO component model
of LibreOffice, packaged up as an individual product.
diff --git a/control.ure.in b/control.ure.in
index 58b5c14..2406075 100644
--- a/control.ure.in
+++ b/control.ure.in
@@ -2,7 +2,7 @@ Package: uno-libs3
Section: libs
Architecture: %OOO_ARCHS%
Depends: ${misc:Depends}, ${shlibs:Depends}
-Replaces: ure (<< 1.4+OOo3.0.0~beta2-1)
+Replaces: ure (<< 4.0.3-2)
Description: LibreOffice UNO runtime environment -- public shared libraries
The Uno Runtime Environment (URE) is the well-known UNO component model
of LibreOffice, packaged up as an individual product.
diff --git a/rules b/rules
index 313db68..25d51da 100755
--- a/rules
+++ b/rules
@@ -2144,6 +2144,11 @@ endif
mv $$i debian/uno-libs3/$(OOUREDIR)/lib; \
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 libxmlreader.so libreg.so.3; do \
+ mv debian/ure/$(OOUREDIR)/lib/$$ \
+ debian/uno-libs3/$(OOUREDIR)/lib; \
+ done
ifeq "$(BUILD_KDE)" "y"
# install files for KDEs "create new" ...
--
LibreOffice packaging repository
Reply to: