[SCM] LibreOffice packaging repository branch, debian-experimental-3.6, updated. libreoffice_3.5.4-7-154-g30b998a
The following commit has been merged in the debian-experimental-3.6 branch:
commit 4133da9d5c33df6eb454330c958eca8c548d8da9
Author: Rene Engelhard <rene@debian.org>
Date: Wed Aug 15 09:26:55 2012 +0200
sync_extensions unneeded now and javaunopkginstall.xml gone
diff --git a/changelog b/changelog
index bdee305..de50d2e 100644
--- a/changelog
+++ b/changelog
@@ -31,6 +31,9 @@ libreoffice (1:3.6.1~rc1-1) UNRELEASED; urgency=low
- split build into build-{arch,indep}
- use generic python3.pc instead of pythonX.Y(mu).pc
* debian/uno-libs3.symbols: update
+ * debian/shell-lib-extensions.sh, debian/rules,
+ debian/libreoffice-common.lintian.overrides.in: unopkg sync not
+ necessary anymore; remove. javasettingsunopkginstall.xml also gone
-- Rene Engelhard <rene@debian.org> Thu, 03 May 2012 13:44:05 +0200
diff --git a/libreoffice-common.lintian-overrides.in b/libreoffice-common.lintian-overrides.in
deleted file mode 100644
index ff06d09..0000000
--- a/libreoffice-common.lintian-overrides.in
+++ /dev/null
@@ -1 +0,0 @@
-libreoffice-common: file-missing-in-md5sums var/lib/libreoffice/share/config/javasettingsunopkginstall.xml
diff --git a/rules b/rules
index ee7f8f9..67207a7 100755
--- a/rules
+++ b/rules
@@ -1875,7 +1875,7 @@ $(STAMP_DIR)/maintscripts: $(wildcard debian/shell-lib*.sh) $(wildcard debian/*.
grep PLATFORMID debian/vars.$(DEB_HOST_ARCH) >> $$MAINTSCRIPT; \
fi; \
echo "" >> $$MAINTSCRIPT; \
- if egrep -q "(add|remove|validate|sync)_extension" $$MAINTSCRIPT.in; then \
+ if egrep -q "(add|remove|validate)_extension" $$MAINTSCRIPT.in; then \
cat debian/shell-lib-extensions.sh >> $$MAINTSCRIPT; \
fi; \
sed -n '/^#INCLUDE_SHELL_LIB#$$/,$$p' < $$MAINTSCRIPT.in | sed -e '/^#INCLUDE_SHELL_LIB#$$/d' >> $$MAINTSCRIPT; \
@@ -2494,12 +2494,6 @@ endif
# share/uno_packages/cache...
rm -rf $(PKGDIR)-common/$(OODIR)/presets/uno_packages
- # move javasettingsunopkginstall.xml to /var/lib
- mkdir -p $(PKGDIR)-common/$(shell echo $(OODIR) | sed -e s/usr/var/)/share/config
- mv $(PKGDIR)-common/$(OODIR)/share/config/javasettingsunopkginstall.xml \
- $(PKGDIR)-common/$(shell echo $(OODIR) | sed -e s/usr/var/)/share/config/javasettingsunopkginstall.xml
- ln -s /$(shell echo $(OODIR) | sed -e s/usr/var/)/share/config/javasettingsunopkginstall.xml \
- $(PKGDIR)-common/$(OODIR)/share/config/javasettingsunopkginstall.xml
# set PYTHONPATH in unopkg
perl -pi -e 's,unset XENVIRONMENT,unset XENVIRONMENT\n\nexport PYTHONPATH=\"/$(OODIR)/program\"\n\n,' \
$(PKGDIR)-common/$(OODIR)/program/unopkg
@@ -3063,7 +3057,7 @@ ifeq "$(ENABLE_REPORTDESIGN)" "y"
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 -Xjavasettingsunopkginstall.xml
+ dh_md5sums -i
dh_builddeb -i $(DEBHELPER_OPTIONS) $(BUILDDEB_OPTIONS)
touch $@
diff --git a/shell-lib-extensions.sh b/shell-lib-extensions.sh
index 299c6b2..347a0f2 100644
--- a/shell-lib-extensions.sh
+++ b/shell-lib-extensions.sh
@@ -5,24 +5,3 @@ validate_extensions() {
fi
}
-sync_extensions() {
- INSTDIR=`mktemp -d`
- export PYTHONPATH="/@OODIR@/program"
- if [ -L /usr/lib/libreoffice/basis-link ]; then
- d=/var/lib/libreoffice/`readlink /usr/lib/libreoffice/basis-link`/
- else
- d=/usr/lib/libreoffice
- fi
- if HOME=$INSTDIR /usr/lib/libreoffice/program/unopkg list --bundled >/dev/null 2>/dev/null; then
- if [ -e /usr/lib/libreoffice/share/prereg/bundled ] && readlink /usr/lib/libreoffice/share/prereg/bundled 2>&1 >/dev/null && [ -L $d/ure-link ]; then
- HOME=$INSTDIR \
- /usr/lib/libreoffice/program/unopkg sync -v --bundled \
- "-env:BUNDLED_EXTENSIONS_USER=file:///usr/lib/libreoffice/share/prereg/bundled" \
- "-env:UserInstallation=file://$INSTDIR" \
- "-env:UNO_JAVA_JFW_INSTALL_DATA=file://$d/share/config/javasettingsunopkginstall.xml" \
- "-env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1"
- fi
- fi
- rm -rf $INSTDIR
-}
-
--
LibreOffice packaging repository
Reply to: