The following commit has been merged in the debian-experimental-4.1 branch:
commit 8af1f266f177be8c7071f63bb10fc735de515ccb
Author: Rene Engelhard <[email protected]>
Date: Mon May 20 13:06:44 2013 +0200
uno-executables-link-to-xmlreader.diff: regcomp/regsingleton gone,
skeletonmaker not using cppuhelper anymore
diff --git a/changelog b/changelog
index beb44d1..dd348c5 100644
--- a/changelog
+++ b/changelog
@@ -1,4 +1,4 @@
-libreoffice (1:4.1.0~beta1~git20130518-1) UNRELEASED; urgency=low
+libreoffice (1:4.1.0~beta1~git20130520-1) UNRELEASED; urgency=low
* new upstream snapshot
diff --git a/patches/uno-executables-link-to-xmlreader.diff
b/patches/uno-executables-link-to-xmlreader.diff
index 691b116..b0486f3 100644
--- a/patches/uno-executables-link-to-xmlreader.diff
+++ b/patches/uno-executables-link-to-xmlreader.diff
@@ -1,25 +1,3 @@
-diff -urN cpputools.old/Executable_regcomp.mk cpputools/Executable_regcomp.mk
---- a/cpputools.old/Executable_regcomp.mk 2013-04-30 14:54:23.000000000
+0200
-+++ b/cpputools/Executable_regcomp.mk 2013-05-17 21:41:13.665548985 +0200
-@@ -34,6 +34,7 @@
- cppu \
- cppuhelper \
- sal \
-+ xmlreader \
- $(gb_UWINAPI) \
- ))
-
-diff -urN cpputools.old/Executable_regsingleton.mk
cpputools/Executable_regsingleton.mk
---- a/cpputools.old/Executable_regsingleton.mk 2013-04-30 14:54:23.000000000
+0200
-+++ b/cpputools/Executable_regsingleton.mk 2013-05-17 21:41:22.977549255
+0200
-@@ -34,6 +34,7 @@
- cppu \
- cppuhelper \
- sal \
-+ xmlreader \
- $(gb_UWINAPI) \
- ))
-
diff -urN cpputools.old/Executable_sp2bv.mk cpputools/Executable_sp2bv.mk
--- a/cpputools.old/Executable_sp2bv.mk 2013-04-30 14:54:23.000000000
+0200
+++ b/cpputools/Executable_sp2bv.mk 2013-05-17 21:41:33.373549555 +0200
@@ -31,13 +9,3 @@ diff -urN cpputools.old/Executable_sp2bv.mk
cpputools/Executable_sp2bv.mk
))
$(eval $(call gb_Executable_add_exception_objects,sp2bv,\
---- a/unodevtools.old/Executable_skeletonmaker.mk 2013-05-18
11:31:49.705153823 +0200
-+++ b/unodevtools/Executable_skeletonmaker.mk 2013-05-18 11:33:07.993156082
+0200
-@@ -41,6 +41,7 @@
- salhelper \
- cppu \
- cppuhelper \
-+ xmlreader \
- ))
-
- $(eval $(call gb_Executable_use_static_libraries,uno-skeletonmaker,\
--
LibreOffice packaging repository
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
Archive: http://lists.debian.org/[email protected]
