[SCM] LibreOffice packaging repository branch, debian-experimental-3.5, updated. libreoffice_3.4.3-4-52-g35cbca9

[Rene Engelhard]

The following commit has been merged in the debian-experimental-3.5 branch:
commit 35cbca9ad02145ebea4e3ed82e7cbbb33746e5d6
Author: Rene Engelhard <r...@debian.org>
Date:   Mon Oct 24 18:51:26 2011 +0000

    temporarily don't install gengal anymore

diff --git a/changelog b/changelog
index 5702a25..822dc03 100644
--- a/changelog
+++ b/changelog
@@ -18,11 +18,12 @@ libreoffice (1:3.5.0~alpha0~git20111024-1) UNRELEASED; 
urgency=low
       from libreoffice-builds' distro-configs
     - run new "make check" instead of solenv/bin/subsequenttests and
       manual smoketest
+    - temporarily don't install gengal anymore
   * debian/rules, debian/control.in: 
     - move from self-defined UPSTREAM_VERSION/ARCH etc. to use
       /usr/share/dpkg/*.mk
 
- -- Rene Engelhard <r...@debian.org>  Thu, 20 Oct 2011 23:12:42 +0000
+ -- Rene Engelhard <r...@debian.org>  Mon, 24 Oct 2011 18:50:49 +0000
 
 libreoffice (1:3.4.3-4) unstable; urgency=low
 
diff --git a/rules b/rules
index 8711431..ab4f9d4 100755
--- a/rules
+++ b/rules
@@ -2540,14 +2540,14 @@ endif
        ln -s /var/lib/$(OODIRNAME)/basis$(OOVER)/program/services.rdb \
                
$(PKGDIR)-core/usr/lib/$(OODIRNAME)/basis$(OOVER)/program/services.rdb
 
-ifeq "$(PACKAGE_SDK)" "y"
-       # install gengal stuff into -dev
-       mkdir -p $(PKGDIR)-dev/$(OODIR)/program
-       install -m755 $(SOURCE_TREE)/svx/$(shell . $(SOURCE_TREE)/*Env*.sh; 
echo $$OUTPATH$$PROEXT)/bin/gengal \
-               $(PKGDIR)-dev/$(OODIR)/program/gengal
-       install -m755 $(SOURCE_TREE)/svx/$(shell . $(SOURCE_TREE)/*Env*.sh; 
echo $$OUTPATH$$PROEXT)/bin/gengal.bin \
-               $(PKGDIR)-dev/$(OODIR)/program/gengal.bin
-endif
+#ifeq "$(PACKAGE_SDK)" "y"
+#      # install gengal stuff into -dev
+#      mkdir -p $(PKGDIR)-dev/$(OODIR)/program
+#      install -m755 $(SOURCE_TREE)/svx/$(shell . $(SOURCE_TREE)/*Env*.sh; 
echo $$OUTPATH$$PROEXT)/bin/gengal \
+#              $(PKGDIR)-dev/$(OODIR)/program/gengal
+#      install -m755 $(SOURCE_TREE)/svx/$(shell . $(SOURCE_TREE)/*Env*.sh; 
echo $$OUTPATH$$PROEXT)/bin/gengal.bin \
+#              $(PKGDIR)-dev/$(OODIR)/program/gengal.bin
+#endif
 
        for i in $(ARCH_DEP_PACKAGES); do \
                if [ -e debian/$$i.bug-script.in ]; then \
@@ -3014,12 +3014,12 @@ endif
        # register technical.dic
        perl -pi -e 's/standard.dic;/standard.dic;technical.dic;/' 
$(PKGDIR)-common/$(OODIR)/share/registry/main.xcd
 
-ifeq "$(PACKAGE_SDK)" "y"
-       # install gengal stuff into -dev
-       mkdir -p $(PKGDIR)-dev/$(OODIR)/program
-       install -m644 $(SOURCE_TREE)/svx/$(shell . $(SOURCE_TREE)/*Env*.sh; 
echo $$OUTPATH$$PROEXT)/bin/gengalrc \
-               $(PKGDIR)-common/$(OODIR)/program/gengalrc
-endif
+#ifeq "$(PACKAGE_SDK)" "y"
+#      # install gengal stuff into -dev
+#      mkdir -p $(PKGDIR)-dev/$(OODIR)/program
+#      install -m644 $(SOURCE_TREE)/svx/$(shell . $(SOURCE_TREE)/*Env*.sh; 
echo $$OUTPATH$$PROEXT)/bin/gengalrc \
+#              $(PKGDIR)-common/$(OODIR)/program/gengalrc
+#endif
        touch $@
 
 binary-arch: $(STAMP_DIR)/binary-arch

-- 
LibreOffice packaging repository


-- 
To UNSUBSCRIBE, email to debian-openoffice-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1riqo5-000297...@vasks.debian.org