./packages/libreoffice/3.3.0/experimental r2236: update to git leading to rc2

To: debian-openoffice@lists.debian.org
Subject: ./packages/libreoffice/3.3.0/experimental r2236: update to git leading to rc2
From: Rene Engelhard <rene@debian.org>
Date: Wed, 15 Dec 2010 17:18:50 +0100
Message-id: <E1PTOWf-0004W5-FN@alioth.debian.org>

------------------------------------------------------------
revno: 2236
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Wed 2010-12-15 17:18:50 +0100
message:
  update to git leading to rc2
modified:
  changelog
  patches/splash-progressbarcolor.diff
  rules

=== modified file 'changelog'
--- a/changelog	2010-12-15 16:15:39 +0000
+++ b/changelog	2010-12-15 16:18:50 +0000
@@ -1,4 +1,7 @@
-libreoffice (1:3.3.0~rc1-2) UNRELEASED; urgency=low
+libreoffice (1:3.3.0~rc2~20101214-1) UNRELEASED; urgency=low
+
+  * update to git snapshot as of 20100214
+    - fix config path in soffice (closes: #606432)
 
   * stop versioning libreoffice-build and ext-sources-libreoffice-build
     as releases of them now match LibO releases, makes building from git
@@ -9,11 +12,13 @@
     - add conditional for squeeze-backports (Daniel Baumann)
       (closes: #606368) - disabled for now as lsb_release returns squeeze
       on sid right now...
+    - apparently we need -with-extension-integration explicitly now; install
+      the extensions from debian/tmp instead of -common/-core
   * debian/control.in:
     - remove libreoffice-core conflicts against itself, thanks Julian
       Andres Klode (closes: #606480)
 
- -- Rene Engelhard <rene@debian.org>  Mon, 13 Dec 2010 19:26:30 +0100
+ -- Rene Engelhard <rene@debian.org>  Tue, 14 Dec 2010 23:39:57 +0100
 
 libreoffice (1:3.3.0~rc1-1) experimental; urgency=low
 

=== modified file 'patches/splash-progressbarcolor.diff'
--- a/patches/splash-progressbarcolor.diff	2010-12-15 16:12:36 +0000
+++ b/patches/splash-progressbarcolor.diff	2010-12-15 16:18:50 +0000
@@ -9,8 +9,8 @@
 + 			REGISTRATIONURL http://survey.libreoffice.org/user/index.php
 +-			PROGRESSBARCOLOR 126,170,23
 ++			PROGRESSBARCOLOR 215,7,81
-+ 			PROGRESSSIZE 320,7
-+ 			PROGRESSPOSITION 165,186
++ 			PROGRESSSIZE 319,10
++ 			PROGRESSPOSITION 164,225
 + 			PROGRESSFRAMECOLOR 207,208,211
 diff --git a/patches/dev300/apply b/patches/dev300/apply
 index 485e60d..536caec 100644

=== modified file 'rules'
--- a/rules	2010-12-15 16:17:45 +0000
+++ b/rules	2010-12-15 16:18:50 +0000
@@ -332,7 +332,8 @@
 		--host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
 		--with-system-dicts \
 		--with-additional-sections="$(ADDITIONAL_SECTIONS)" \
-		--enable-broffice
+		--enable-broffice \
+		--with-extension-integration
 
 ifeq "$(USE_SOURCE_TARBALLS)" "y"
   CONFIGURE_FLAGS += --without-git
@@ -2395,14 +2396,6 @@
 
 	find debian/tmp ! -perm -200 | xargs -r chmod u+w
 
-	# move them into -core for proper installation later in install-arch.
-	# The "rest" (arch-indep) is in -common anyways
-	for i in mysql-connector-ooo pdfimport presenter-screen presentation-minimizer; do \
-		mkdir -p $(PKGDIR)-core/$(OOBRANDDIR)/share/extensions; \
-		mv $(PKGDIR)-common/$(OOBRANDDIR)/share/extensions/$$i \
-			$(PKGDIR)-core/$(OOBRANDDIR)/share/extensions; \
-	done
-
 	touch $@
 
 #
@@ -3025,14 +3018,14 @@
 ifeq "$(ENABLE_MINIMIZER)" "y"
 	rm -rf $(PKGDIR)-presentation-minimizer
 	mkdir -p $(PKGDIR)-presentation-minimizer/$(OOBRANDDIR)/share/extensions
-	mv $(PKGDIR)-core/$(OOBRANDDIR)/share/extensions/presentation-minimizer \
+	mv debian/tmp/$(OOBRANDDIR)/share/extensions/presentation-minimizer \
 		$(PKGDIR)-presentation-minimizer/$(OOBRANDDIR)/share/extensions
 endif
 
 ifeq "$(ENABLE_PRESENTER_CONSOLE)" "y"
 	rm -rf $(PKGDIR)-presenter-console
 	mkdir -p $(PKGDIR)-presenter-console/$(OOBRANDDIR)/share/extensions
-	mv $(PKGDIR)-core/$(OOBRANDDIR)/share/extensions/presenter-screen \
+	mv debian/tmp/$(OOBRANDDIR)/share/extensions/presenter-screen \
 		$(PKGDIR)-presenter-console/$(OOBRANDDIR)/share/extensions
 endif
 
@@ -3046,14 +3039,14 @@
 ifeq "$(ENABLE_MYSQLNATIVE)" "y"
 	rm -rf $(PKGDIR)-mysql-connector
 	mkdir -p $(PKGDIR)-mysql-connector/$(OOBRANDDIR)/share/extensions
-	mv $(PKGDIR)-core/$(OOBRANDDIR)/share/extensions/mysql-connector-ooo \
+	mv debian/tmp/$(OOBRANDDIR)/share/extensions/mysql-connector-ooo \
 		$(PKGDIR)-mysql-connector/$(OOBRANDDIR)/share/extensions
 endif
 
 ifeq "$(ENABLE_PDFIMPORT)" "y"
 	rm -rf $(PKGDIR)-pdfimport
 	mkdir -p $(PKGDIR)-pdfimport/$(OOBRANDDIR)/share/extensions
-	mv $(PKGDIR)-core/$(OOBRANDDIR)/share/extensions/pdfimport \
+	mv debian/tmp/$(OOBRANDDIR)/share/extensions/pdfimport \
 		$(PKGDIR)-pdfimport/$(OOBRANDDIR)/share/extensions
 endif
 
@@ -3122,7 +3115,7 @@
 			| sed -e "s/libreoffice/broffice/" | sed -e "s/LibreOffice/BrOffice/" \
 			> debian/broffice$(VER)/usr/share/applications/libreoffice$(VER)-$$i.desktop; \
 	done
-	dirname="`cd $(SOURCE_TREE)/sysui/$(shell . $(SOURCE_TREE)/*Env*.sh; echo $$OUTPATH$$PROEXT)/misc/broffice.org >/dev/null; pwd`" ;\
+	dirname="`cd $(SOURCE_TREE)/sysui/$(shell . $(SOURCE_TREE)/*Env*.sh; echo $$OUTPATH$$PROEXT)/misc/broffice >/dev/null; pwd`" ;\
 	mkdir -p -m755 debian/broffice/usr/share/mimelnk/application ;\
 	sed -e 's,Comment=Extension,Comment=BrOffice $(VER) Extension,' \
 	    -e 's,Icon=broffice[0123456789]-extension,Icon=application-vnd.openofficeorg.extension.png,' \
@@ -3130,13 +3123,13 @@
 	    < $$dirname/extension.desktop \
 	    > debian/broffice/usr/share/mimelnk/application/vnd.openofficeorg.extension.desktop || exit 1
 	mkdir -p debian/broffice/usr/share/application-registry && \
-	cat $(SOURCE_TREE)/sysui/$(shell . $(SOURCE_TREE)/*Env*.sh; echo $$OUTPATH$$PROEXT)/misc/broffice.org/openoffice.applications \
+	cat $(SOURCE_TREE)/sysui/$(shell . $(SOURCE_TREE)/*Env*.sh; echo $$OUTPATH$$PROEXT)/misc/broffice/openoffice.applications \
 		| sed -e s/OFFICENAME/broffice/g \
 		| sed -e s/\%PRODUCTNAME/BrOffice/g \
 		> debian/broffice/usr/share/application-registry/openoffice.applications
 	rm -f debian/broffice/usr/share/mime-info/openoffice.keys; \
 	mkdir -p debian/broffice/usr/share/mime-info/
-	for i in $(SOURCE_TREE)/sysui/$(shell . $(SOURCE_TREE)/*Env*.sh; echo $$OUTPATH$$PROEXT)/misc/broffice.org/*.keys; do \
+	for i in $(SOURCE_TREE)/sysui/$(shell . $(SOURCE_TREE)/*Env*.sh; echo $$OUTPATH$$PROEXT)/misc/broffice/*.keys; do \
 		cat $$i >> debian/broffice/usr/share/mime-info/openoffice.keys; \
 	done
 	mv $(PKGDIR)-common/$(OOBRANDDIR)/program/intro-pt_BR.png \
@@ -3493,7 +3486,7 @@
 	# the *rpt* stuff is a no-op.
 	rm -rf $(PKGDIR)-report-builder
 	mkdir -p $(PKGDIR)-report-builder/$(OOBRANDDIR)/share/extensions
-	mv $(PKGDIR)-common/$(OOBRANDDIR)/share/extensions/report-builder \
+	mv debian/tmp/$(OOBRANDDIR)/share/extensions/report-builder \
 		$(PKGDIR)-report-builder/$(OOBRANDDIR)/share/extensions
 	# unneeded license files
 	for i in THIRDPARTYREADMELICENSE.html readme_en-US.html readme_en-US.txt \
@@ -3506,7 +3499,7 @@
 ifeq "$(ENABLE_MEDIAWIKI)" "y"
 	rm -rf $(PKGDIR)-wiki-publisher
 	mkdir -p $(PKGDIR)-wiki-publisher/$(OOBRANDDIR)/share/extensions
-	mv $(PKGDIR)-common/$(OOBRANDDIR)/share/extensions/wiki-publisher \
+	mv debian/tmp/$(OOBRANDDIR)/share/extensions/wiki-publisher \
 		$(PKGDIR)-wiki-publisher/$(OOBRANDDIR)/share/extensions
 	rm -f $(PKGDIR)-wiki-publisher/$(OOBRANDDIR)/share/extensions/wiki-publisher/license/THIRDPARTYLICENSEREADME.html
 endif
@@ -3615,7 +3608,7 @@
 	done
 
 	dh_installdocs -s -A debian/README.Debian \
-		$(SOURCE_TREE)/instsetoo_native/util/LibreOffice/replace_file/*/00/README \
+		$(SOURCE_TREE)/instsetoo_native/util/LibreOffice/replace_file/*/en-US/README_en-US \
 		$(OOO_BUILD_TREE)/NEWS
 	dh_installdebconf -s
 	dh_installman -s
@@ -3841,7 +3834,7 @@
 	perl -pi -e 's,html/,html /,g' debian/libreoffice-dev-doc.doc-base.udk-common-ref
 endif
 	dh_installdocs -i -A debian/README.Debian \
-		$(SOURCE_TREE)/instsetoo_native/util/LibreOffice/replace_file/*/00/README \
+		$(SOURCE_TREE)/instsetoo_native/util/LibreOffice/replace_file/*/en-US/README_en-US \
 		$(OOO_BUILD_TREE)/NEWS
 	dh_installman -i
 	for i in `find $(PKGDIR)-common -type l -name "o*.1"`; do \

Reply to:

Prev by Date: ./packages/libreoffice/3.3.0/experimental r2235: rm $(STAMP_DIR)/install after we ran the regcomps in install-arch...
Next by Date: ./packages/libreoffice/3.3.0/experimental r2238: oops, forgot to commit USE_SOURCE_TARBALLS=n
Previous by thread: ./packages/libreoffice/3.3.0/experimental r2235: rm $(STAMP_DIR)/install after we ran the regcomps in install-arch...
Next by thread: ./packages/libreoffice/3.3.0/experimental r2238: oops, forgot to commit USE_SOURCE_TARBALLS=n
Index(es):
- Date
- Thread