[SCM] LibreOffice packaging repository branch, debian-experimental-3.5, updated. libreoffice_3.5.0_beta2-1-10-g10be1b1
The following commit has been merged in the debian-experimental-3.5 branch:
commit 9194f49144d2918b539fc6de5c5210ef226f65cf
Author: Rene Engelhard <rene@debian.org>
Date: Thu Dec 29 18:50:56 2011 +0000
try to fix the patch instead
diff --git a/changelog b/changelog
index 3a4e7ca..b7ca14f 100644
--- a/changelog
+++ b/changelog
@@ -1,13 +1,14 @@
-libreoffice (1:3.5.0~beta2-2) UNRELASED; urgency=low
+libreoffice (1:3.5.0~beta2-2) UNRELEASED; urgency=low
* debian/patches/fix-ARM-detetcion-in-set-soenv.diff: as name says
-
+ * debian/patches/make-package-modules-not-suck.diff: add missing , so
+ that kde4be1.uno.so correctly ends up in -kde
+
* debian/rules:
- force boost to 1.46 due to ICE with 1.48
- prevent creating bogus gcc- build-dependency on gcj archs
- - move kde4be1.uno.so to -kde where it belongs
- -- Rene Engelhard <rene@debian.org> Thu, 29 Dec 2011 18:25:07 +0100
+ -- Rene Engelhard <rene@debian.org> Thu, 29 Dec 2011 17:50:42 +0000
libreoffice (1:3.5.0~beta2-1) experimental; urgency=low
diff --git a/patches/make-package-modules-not-suck.diff b/patches/make-package-modules-not-suck.diff
index 54a59b3..5243714 100644
--- a/patches/make-package-modules-not-suck.diff
+++ b/patches/make-package-modules-not-suck.diff
@@ -87,11 +87,11 @@ index 55180c5..742cb6e 100644
MOD_NAME_DESC(MODULE_OPTIONAL_KDE);
Styles = (DONTSHOWINUSERINSTALL);
Files = (
-+ gid_File_Bin_Kde_Open_Url
++ gid_File_Bin_Kde_Open_Url,
#ifdef ENABLE_KDE
- gid_File_Lib_Kdebe
+ gid_File_Lib_Kdebe,
-+ gid_File_Lib_Vclplug_Kde
++ gid_File_Lib_Vclplug_Kde,
+ gid_File_Lib_Fps_Kde
#ifdef ENABLE_KDE4
,
diff --git a/rules b/rules
index 38a58cb..41abd46 100755
--- a/rules
+++ b/rules
@@ -1979,10 +1979,6 @@ endif
done
ifeq "$(BUILD_KDE)" "y"
- # FIXME: This is in the KDE module, but somehow gets installed into -core...
- mv $(PKGDIR)-core/$(OODIR)/program/kde4be.so \
- $(PKGDIR)-kde/$(OODIR)/program
-
# install files for KDEs "create new" ...
mkdir -p $(PKGDIR)-kde/usr/share/templates/.source
for i in $(SOURCE_TREE)/extras/source/shellnew/*; do \
--
LibreOffice packaging repository
Reply to: