[SCM] LibreOffice packaging repository branch, debian-experimental-3.5, updated. libreoffice_3.5.0_rc3-1-12-ge7174d0
The following commit has been merged in the debian-experimental-3.5 branch:
commit e7174d0b4d69188408dfcca510c11aaa7b8dfeda
Author: Rene Engelhard <rene@debian.org>
Date: Mon Feb 13 23:55:35 2012 +0100
remove gengalrc...
diff --git a/changelog b/changelog
index 86695f1..c295d72 100644
--- a/changelog
+++ b/changelog
@@ -5,7 +5,7 @@ libreoffice (1:3.5.0-1) UNRELEASED; urgency=low
* debian/patches/no-rcX-in-final.diff: don't show rc3, it's not a rc
amymore...
* debian/patches/patches/make-gengal-work-again.diff: register gengal.bin
- executable to get proper rpath
+ executable to get proper rpath and remove gengalrc
* debian/rules:
- install found .gdb-py files into respective -dbg packages
diff --git a/patches/make-gengal-work-again.diff b/patches/make-gengal-work-again.diff
index a8a3c26..5d57e9a 100644
--- a/patches/make-gengal-work-again.diff
+++ b/patches/make-gengal-work-again.diff
@@ -2,7 +2,7 @@ diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index 34ed8a9..c872244 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
-@@ -124,6 +124,35 @@ End
+@@ -124,6 +124,28 @@ End
End
#endif
@@ -28,13 +28,6 @@ index 34ed8a9..c872244 100644
+
+#endif
+
-+File gid_File_Profile_Gengal
-+ BIN_FILE_BODY;
-+ Dir = gid_Brand_Dir_Program;
-+ Styles = (PACKED);
-+ Name = PROFILENAME(gengal);
-+End
-+
#if !defined(WITHOUT_MOZILLA) && defined(UNX) && !defined(QUARTZ)
File gid_File_Bin_Pluginapp
@@ -142,7 +135,7 @@ new file mode 100644
index 0000000..d5afd59
--- /dev/null
+++ b/svx/Package_gengal.mk
-@@ -0,0 +1,32 @@
+@@ -0,0 +1,31 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -171,7 +164,6 @@ index 0000000..d5afd59
+#*************************************************************************
+
+$(eval $(call gb_Package_Package,svx_gengal,$(SRCDIR)/svx/source/gengal))
-+$(eval $(call gb_Package_add_file,svx_gengal,bin/gengalrc,gengalrc.in))
+$(eval $(call gb_Package_add_file,svx_gengal,bin/gengal,gengal.sh))
+
+# vim: set noet ts=4 sw=4:
@@ -319,24 +311,6 @@ index 0000000..5173fb4
+
+# execute binary
+exec "$sd_prog/$sd_binary" "$@"
-diff --git a/svx/source/gengal/gengalrc.in b/svx/source/gengal/gengalrc.in
-new file mode 100644
-index 0000000..00ae5eb
---- /dev/null
-+++ b/svx/source/gengal/gengalrc.in
-@@ -0,0 +1,12 @@
-+OOO_INSTALL_PREFIX_URL=file://${OOO_INSTALL_PREFIX}
-+OOO_BASIS_URL=${OOO_INSTALL_PREFIX_URL}/basis-link
-+OOO_BASIS_BIN_URL=${OOO_BASIS_URL}/program
-+OOO_URE_URL=${OOO_BASIS_URL}/ure-link
-+#
-+#CFG_INIFILE=${OOO_BASIS_BIN_URL}/configmgrrc
-+#BaseInstallation=${OOO_BASIS_URL}
-+BRAND_BASE_DIR=${OOO_INSTALL_PREFIX_URL}
-+OOO_BASE_DIR=${OOO_BASIS_URL}
-+#
-+UNO_TYPES=${OOO_URE_URL}/share/misc/types.rdb ${OOO_BASIS_BIN_URL}/offapi.rdb
-+UNO_SERVICES=${OOO_URE_URL}/share/misc/services.rdb ${OOO_BASIS_BIN_URL}/services.rdb
--- a/Repository.mk-old 2012-02-13 22:35:59.000000000 +0100
+++ b/Repository.mk 2012-02-13 22:36:16.000000000 +0100
@@ -74,6 +74,7 @@
--
LibreOffice packaging repository
Reply to: