[SCM] LibreOffice packaging repository branch, debian-experimental-3.4.0, updated. d678be23a075d74298fac98deeff96dc3e2771ee

["Rene Engelhard" <rene@debian.org>]

The following commit has been merged in the debian-experimental-3.4.0 branch:
commit d69ea86fee7b01e44be16b6d137c9be1c4ce2105
Author: Rene Engelhard <rene@debian.org>
Date:   Sat Jun 4 21:20:11 2011 +0000

    temporarily disable installing of gengal...

diff --git a/changelog b/changelog
index 3c24a34..58ee613 100644
--- a/changelog
+++ b/changelog
@@ -18,6 +18,8 @@ libreoffice (1:3.4.0-1) UNRELEASED; urgency=low
     - remove SMALL_SYMBOLS option, gone upstream
     - temporarily disable -evolution and -filter-binfilter until we get
       the (de-)registering of them fixed
+    - temprarily don't install gengal, not built anymore since the switch to
+      GNU Make...
   * debian/control.sdk.in, debian/rules: 
     - stop building with STLport on i386, just create a symlink in ure.
       Should suffice for compat with binary-only OOo extensions
diff --git a/rules b/rules
index 1258806..46ff7f7 100755
--- a/rules
+++ b/rules
@@ -1897,17 +1897,17 @@ ifeq "$(BUILD_GTK)" "y"
 		$(PKGDIR)-gnome/$(OODIR)/share/registry
 endif
 
-ifeq "$(PACKAGE_SDK)" "y"
-	# move gengal stuff into -dev
-	mkdir -p $(PKGDIR)-dev/$(OODIR)/program
-	mv $(PKGDIR)-core/$(OODIR)/program/gengal* \
-		$(PKGDIR)-dev/$(OODIR)/program
-	mv $(PKGDIR)-common/$(OODIR)/program/gengal  \
-		$(PKGDIR)-dev/$(OODIR)/program
-else
-	rm -f $(PKGDIR)-core/$(OODIR)/program/gengal*
-	rm -f $(PKGDIR)-common/$(OODIR)/program/gengal
-endif
+#ifeq "$(PACKAGE_SDK)" "y"
+#	# move gengal stuff into -dev
+#	mkdir -p $(PKGDIR)-dev/$(OODIR)/program
+#	mv $(PKGDIR)-core/$(OODIR)/program/gengal* \
+#		$(PKGDIR)-dev/$(OODIR)/program
+#	mv $(PKGDIR)-common/$(OODIR)/program/gengal  \
+#		$(PKGDIR)-dev/$(OODIR)/program
+#else
+#	rm -f $(PKGDIR)-core/$(OODIR)/program/gengal*
+#	rm -f $(PKGDIR)-common/$(OODIR)/program/gengal
+#endif
 
 ifeq "$(PACKAGE_SDK)" "y"
 	# move SDK documentation into own package
@@ -3057,10 +3057,10 @@ ifeq "$(USE_OOO_BUILD_DESKTOPS)" "n"
 	perl -pi -e "s/Icon=openofficeorg.*-extension/Icon=application-vnd.openofficeorg.extension.png/" $(PKGDIR)-common/usr/share/mimelnk/application/vnd.openofficeorg.extension.desktop
 endif
 
-ifeq "$(PACKAGE_SDK)" "y"
-	# fix permission
-	chmod 644 $(PKGDIR)-common/$(OODIR)/program/gengalrc
-endif
+#ifeq "$(PACKAGE_SDK)" "y"
+#	# fix permission
+#	chmod 644 $(PKGDIR)-common/$(OODIR)/program/gengalrc
+#endif
 
 	# install extension shell lib for use by extensions not from here
 	install -D -m644 debian/shell-lib-extensions.sh \

-- 
LibreOffice packaging repository