[SCM] LibreOffice packaging repository branch, debian-experimental-4.0, updated. libreoffice_3.6.4-1-200-g8f923a2
The following commit has been merged in the debian-experimental-4.0 branch:
commit 28827aeb38e07bc5990d1d9f996b0ee3946f1a48
Author: Rene Engelhard <rene@debian.org>
Date: Tue Dec 18 16:39:36 2012 +0100
fix install after librelogo magically is now automatically installed..
diff --git a/rules b/rules
index d9e2fb7..d61e3a4 100755
--- a/rules
+++ b/rules
@@ -1784,6 +1784,10 @@ ifneq "$(ENABLE_HELP)" "n"
done
endif
+ifneq "$(PACKAGE_LIBRELOGO)" "y"
+ rm -rf debian/tmp/pkg/libreoffice-librelogo
+endif
+
dh_installdirs -A
dh_install -A --sourcedir=debian/tmp/pkg --fail-missing
@@ -2771,13 +2775,6 @@ endif
# $(PKGDIR)-common/$(OODIR)/program/gengalrc
#endif
-ifeq "$(PACKAGE_LIBRELOGO)" "y"
- rm -rf $(PKGDIR)-librelogo
- mkdir -p $(PKGDIR)-librelogo/$(OODIR)/share/extensions/librelogo
- cd $(PKGDIR)-librelogo/$(OODIR)/share/extensions/librelogo && \
- unzip $(CURDIR)/solver/$(shell . $(SOURCE_TREE)/bin/get_config_variables OUTPATH PROEXT; echo $$OUTPATH$$PROEXT)/bin/librelogo.oxt
-endif
-
touch $@
binary-arch: $(STAMP_DIR)/binary-arch
@@ -3022,7 +3019,10 @@ endif
ln -sf libreoffice.1.gz $$i.gz; \
fi; \
done
- dh_installchangelogs -i -k
+ dh_installchangelogs -i -Nlibreoffice$(VER)-librelogo -k
+ifeq "$(PACKAGE_LIBRELOGO)" "y"
+ dh_installchangelogs -plibreoffice$(VER)-librelogo -k librelogo/source/ChangeLog
+endif
dh_installmime -i
dh_lintian -i
dh_bugfiles -i -A
@@ -3046,7 +3046,6 @@ endif
dh_gencontrol -i $(DEBHELPER_OPTIONS) \
-Nlibreoffice$(VER)-report-builder \
-Nlibreoffice$(VER)-wiki-publisher \
- -Nlibreoffice$(VER)-librelogo \
-Nfonts-opensymbol \
-Nopenoffice.org-dtd-officedocument1.0 -- \
-V'base-version=$(BASE_VERSION)' \
@@ -3077,10 +3076,6 @@ ifeq "$(ENABLE_REPORTDESIGN)" "y"
-V'java-runtime-depends=$(JAVA_RUNTIME_DEPENDS)' \
-v`echo $(BINARY_VERSION) | cut -d: -f1`:$(shell grep "<version" $(SOURCE_TREE)/reportbuilder/util/description.xml | perl -pi -e 's,<version value=\"(.*)\"/>,\1,; s/^\s+//')+LibO`echo $(BINARY_VERSION) | cut -d: -f2`
endif
-ifeq "$(PACKAGE_LIBRELOGO)" "y"
- dh_gencontrol -plibreoffice$(VER)-librelogo -- \
- -v$(shell grep "<version" $(SOURCE_TREE)/librelogo/source/description.xml | perl -pi -e 's,<version value=\"(.*)\" />,\1,; s/^\s+//; s/\s+$$//')+LibO`echo $(BINARY_VERSION) | cut -d: -f2`
-endif
dh_gencontrol -popenoffice.org-dtd-officedocument1.0 -- \
-v$(shell echo `echo $(BINARY_VERSION) | cut -d: -f1` + 1 | bc):1.0+LibO`echo $(BINARY_VERSION) | cut -d: -f2`
dh_md5sums -i
diff --git a/scripts/gid2pkgdirs.sh b/scripts/gid2pkgdirs.sh
index ebfb157..a02156d 100755
--- a/scripts/gid2pkgdirs.sh
+++ b/scripts/gid2pkgdirs.sh
@@ -98,6 +98,7 @@ create_package_directory gid_Module_Brand_Prg_Wrt pkg/libreoffice-
create_package_directory gid_Module_Brand_Prg_Impress pkg/libreoffice-impress
create_package_directory gid_Module_Brand_Prg_Base pkg/libreoffice-base
create_package_directory gid_Module_Optional_Pyuno pkg/python3-uno
+create_package_directory gid_Module_Optional_Pyuno_LibreLogo pkg/libreoffice-librelogo
create_package_directory gid_Module_Optional_Extensions_Script_Provider_For_Python pkg/libreoffice-script-provider-python
create_package_directory gid_Module_Optional_Gnome pkg/libreoffice-gnome
create_package_directory gid_Module_Optional_Kde pkg/libreoffice-kde
--
LibreOffice packaging repository
Reply to: