[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

./packages/libreoffice/3.3.0/experimental r2314: update to rc3 tag; add patch for commit I forgot to push and adapt for last minute te l10n change...

------------------------------------------------------------
revno: 2314
committer: Rene Engelhard <rene@debian.org>
branch nick: experimental
timestamp: Mon 2011-01-10 22:18:35 +0100
message:
  update to rc3 tag; add patch for commit I forgot to push and adapt for last minute te l10n change...
added:
  patches/fix-wrapper-manpage-install.diff
modified:
  changelog
  patches/buildfix-patches.diff
  patches/series
  rules

=== modified file 'changelog'
--- a/changelog	2011-01-09 19:56:55 +0000
+++ b/changelog	2011-01-10 21:18:35 +0000
@@ -1,6 +1,6 @@
-libreoffice (1:3.3.0~rc3~20110108-1) UNRELEASED; urgency=low
+libreoffice (1:3.3.0~rc3-1) UNRELEASED; urgency=low
 
-  * update to current git of libreoffice-3-3 branch
+  * LibreOffice 3.3.0 rc3
 
   * debian/rules
     - bump SPI (c) upto 2011 
@@ -28,7 +28,7 @@
     - actually add Replaces: on openoffice.org-common (closes: #602867)
     - change Homepage: to point to www.libreoffice.org
 
- -- Rene Engelhard <rene@debian.org>  Sat, 08 Jan 2011 23:24:19 +0100
+ -- Rene Engelhard <rene@debian.org>  Mon, 10 Jan 2011 20:43:22 +0100
 
 libreoffice (1:3.3.0~rc2-3) experimental; urgency=low
 

=== modified file 'patches/buildfix-patches.diff'
--- a/patches/buildfix-patches.diff	2010-12-15 16:12:36 +0000
+++ b/patches/buildfix-patches.diff	2011-01-10 21:18:35 +0000
@@ -9,3 +9,33 @@
  
  # Backport from cbosdo06 CWS
  sw-table-frame-uno-fix.diff, i#112564, cbosdo
+diff --git a/patches/dev300/reportdesign-mention-package-l10n.diff b/patches/dev300/reportdesign-mention-package-l10n.diff
+index 8aafa94..f8bedba 100644
+--- libreoffice-3.3.0/libreoffice-build/patches/dev300/reportdesign-mention-package-l10n.diff
++++ libreoffice-3.3.0/libreoffice-build/patches/dev300/reportdesign-mention-package-l10n.diff
+@@ -832,17 +832,17 @@ index c999eda..6aa331c 100644
+  dbaccess	source\ui\dlg\ExtensionNotPresent.src	0	modaldialog	RID_EXTENSION_NOT_PRESENT_DLG		HID_EXTENSION_NOT_PRESENT_DLG		0	ta	%PRODUCTNAME %PRODUCTVERSION				2002-02-02 02:02:02
+  dbaccess	source\ui\dlg\CollectionView.src	0	imagebutton	DLG_COLLECTION_VIEW	BTN_EXPLORERFILE_NEWFOLDER			0	ta	-		புதிய அடைவவை உருவாக்கு		2002-02-02 02:02:02
+ diff --git l10n/source/te/localize.sdf l10n/source/te/localize.sdf
+-index be638ff..67ce980 100644
++index ea82090..36c7369 100644
+ --- l10n/source/te/localize.sdf
+ +++ l10n/source/te/localize.sdf
+-@@ -3725,7 +3725,6 @@ dbaccess	source\ui\dlg\ConnectionPage.src	0	string	STR_JDBCDRIVER_SUCCESS				0	t
+- dbaccess	source\ui\dlg\ConnectionPage.src	0	string	STR_JDBCDRIVER_NO_SUCCESS				0	te	JDBCచోదకి దిగుమతిచేయబడలేదు				2002-02-02 02:02:02
+- dbaccess	source\ui\dlg\ConnectionPage.src	0	string	STR_MSACCESS_FILTERNAME				0	te	ఎమ్ ఎస్ యాక్సెస్ ఫైల్				2002-02-02 02:02:02
+- dbaccess	source\ui\dlg\ConnectionPage.src	0	string	STR_MSACCESS_2007_FILTERNAME				0	te	MS యాక్సెస్ 2007 ఫైలు				2002-02-02 02:02:02
+--dbaccess	source\ui\dlg\ExtensionNotPresent.src	0	string	RID_STR_EXTENSION_NOT_PRESENT				0	te	ఒక నివేదికను తెరువుటకు మీకు Sun™ రిపోర్టు బల్డర్ పొడిగింపు అవసరము.\n\nపొడిగింపును డౌన్‌లోడ్ చేసి స్థాపించుటకు 'డౌన్‌లోడ్...' నొక్కుము.				2002-02-02 02:02:02
+- dbaccess	source\ui\dlg\ExtensionNotPresent.src	0	pushbutton	RID_EXTENSION_NOT_PRESENT_DLG	PB_DOWNLOAD			0	te	సమాచార దిగుమతి (~D)				2002-02-02 02:02:02
++@@ -1258,7 +1258,6 @@ dbaccess	source\ui\dlg\queryfilter.src	0	fixedline	DLG_FILTERCRIT	FL_FIELDS			23
++ dbaccess	source\ui\dlg\queryfilter.src	0	string	DLG_FILTERCRIT	STR_NOENTRY			50	te	ఎమి లేదు				2002-02-02 02:02:02
++ dbaccess	source\ui\dlg\queryfilter.src	0	string	DLG_FILTERCRIT	STR_COMPARE_OPERATORS			0	te	=;<>;<;<=;>;>=;విధముగా  ;విధముగా లేని;నల్ ;నల్ కాని				2002-02-02 02:02:02
++ dbaccess	source\ui\dlg\queryfilter.src	0	modaldialog	DLG_FILTERCRIT		HID_DLG_FILTERCRIT		303	te	ప్రమాణపు వడపోత				2002-02-02 02:02:02
++-dbaccess	source\ui\dlg\ExtensionNotPresent.src	0	string	RID_STR_EXTENSION_NOT_PRESENT				0	te	ఒక నివేదికను తెరువుటకు మీకు Sun™ రి పోర్ట్  బల్డర్ పొడిగింపు అవసరము.\n\nపొడిగింపును డౌన్‌లోడ్ చేసి స్థాపించుటకు 'డౌన్‌లోడ్...' నొక్కుము.				2002-02-02 02:02:02
++ dbaccess	source\ui\dlg\ExtensionNotPresent.src	0	pushbutton	RID_EXTENSION_NOT_PRESENT_DLG	PB_DOWNLOAD			0	te	సమాచార దిగుమతి(~D)				2002-02-02 02:02:02
+  dbaccess	source\ui\dlg\ExtensionNotPresent.src	0	modaldialog	RID_EXTENSION_NOT_PRESENT_DLG		HID_EXTENSION_NOT_PRESENT_DLG		0	te	%PRODUCTNAME %PRODUCTVERSIONము				2002-02-02 02:02:02
+- dbaccess	source\ui\dlg\CollectionView.src	0	imagebutton	DLG_COLLECTION_VIEW	BTN_EXPLORERFILE_NEWFOLDER			0	te	-		కోత్త్ర వివరంను సృష్టించుము		2002-02-02 02:02:02
++ dbaccess	source\ui\dlg\AutoControls_tmpl.hrc	0	pushbutton	AUTO_BROWSECONTROLGROUP( AUTO_X, AUTO_Y, AUTOPAGE_X, AUTO_HID)	PB_AUTOBROWSEURL	(AUTO_HID + 1)		0	te	అన్వేషించుము				2002-02-02 02:02:02
+ diff --git l10n/source/tr/localize.sdf l10n/source/tr/localize.sdf
+ index 2e8bfd0..7d1aeb6 100644
+ --- l10n/source/tr/localize.sdf

=== added file 'patches/fix-wrapper-manpage-install.diff'
--- a/patches/fix-wrapper-manpage-install.diff	1970-01-01 00:00:00 +0000
+++ b/patches/fix-wrapper-manpage-install.diff	2011-01-10 21:18:35 +0000
@@ -0,0 +1,52 @@
+diff --git a/bin/package-ooo b/bin/package-ooo
+index 9127848..3d6b1a6 100755
+--- libreoffice-3.3.0/libreoffice-build/bin/package-ooo
++++ libreoffice-3.3.0/libreoffice-build//bin/package-ooo
+@@ -913,13 +913,23 @@ else
+ 			shift
+ 		done
+ 	}
+-	move_wrappers pkg/libreoffice-common ooffice oofromtemplate soffice unopkg
+-	move_wrappers pkg/libreoffice-base oobase
+-	move_wrappers pkg/libreoffice-writer oowriter ooweb
+-	move_wrappers pkg/libreoffice-calc oocalc
+-	move_wrappers pkg/libreoffice-impress ooimpress
+-	move_wrappers pkg/libreoffice-math oomath
+-	move_wrappers pkg/libreoffice-draw oodraw
++	move_wrappers pkg/libreoffice-common soffice unopkg
++	if test "$COMPAT_OOWRAPPERS" = "YES" ; then
++		move_wrappers pkg/libreoffice-common ooffice oofromtemplate
++		move_wrappers pkg/libreoffice-base oobase
++		move_wrappers pkg/libreoffice-writer oowriter ooweb
++		move_wrappers pkg/libreoffice-calc oocalc
++		move_wrappers pkg/libreoffice-impress ooimpress
++		move_wrappers pkg/libreoffice-math oomath
++		move_wrappers pkg/libreoffice-draw oodraw
++	fi
++	move_wrappers pkg/libreoffice-common libreoffice lofromtemplate
++	move_wrappers pkg/libreoffice-base lobase
++	move_wrappers pkg/libreoffice-writer lowriter loweb
++	move_wrappers pkg/libreoffice-calc localc
++	move_wrappers pkg/libreoffice-impress loimpress
++	move_wrappers pkg/libreoffice-math lomath
++	move_wrappers pkg/libreoffice-draw lodraw
+ 	
+ 	# Move all libraries, binaries, *.rdb from -common to -core
+ 	for d in $OOINSTBASE/basis$VERSION/program $OOINSTBASE/program; do \
+@@ -935,10 +945,14 @@ else
+ 
+ 	# install additional ooo-build scripts & misc stuff
+ 	mkdir -p pkg/libreoffice-common/usr/share/man/man1
+-	mv usr/share/man/man1/openoffice$BINSUFFIX.1 \
++	if test "$COMPAT_OOWRAPPERS" = "YES" ; then
++		mv usr/share/man/man1/openoffice$BINSUFFIX.1 \
++			pkg/libreoffice-common/usr/share/man/man1
++	fi
++	mv usr/share/man/man1/libreoffice$BINSUFFIX.1 \
+ 		pkg/libreoffice-common/usr/share/man/man1
+ 	mkdir -p pkg/libreoffice-common/etc/bash_completion.d
+-	mv etc/bash_completion.d/ooffice$BINSUFFIX.sh \
++	mv etc/bash_completion.d/libreoffice$BINSUFFIX.sh \
+ 		pkg/libreoffice-common/etc/bash_completion.d
+ 	mv .$OOINSTBASE/basis$VERSION/program/java-set-classpath \
+ 		pkg/libreoffice-common/$OOINSTBASE/program

=== modified file 'patches/series'
--- a/patches/series	2011-01-08 16:45:41 +0000
+++ b/patches/series	2011-01-10 21:18:35 +0000
@@ -3,3 +3,4 @@
 buildfix-patches.diff
 hack-no-rm-fr-of-smoketest-userconfig.diff
 do-not-switch-workspaces-of-wm.diff
+fix-wrapper-manpage-install.diff

=== modified file 'rules'
--- a/rules	2011-01-08 22:25:27 +0000
+++ b/rules	2011-01-10 21:18:35 +0000
@@ -82,11 +82,10 @@
 TAG=$(shell echo $(MWS) | tr A-Z a-z)-$(MILESTONE)
 GIT_TAG=$(MWS)_$(MILESTONE)
 OOO_BUILD_BRANCH=libreoffice-3-3
-OOO_BUILD_VERSION=3.3.0.2
+OOO_BUILD_VERSION=3.3.0.3
 # in ooo-build releases the same as OOO_BUILD_VERSION
-#OOO_BUILD_TARBALL_VERSION=$(OOO_BUILD_VERSION)
-OOO_BUILD_TARBALL_VERSION=3.3.0.2
-OOO_BUILD_TAG=libreoffice-3.3.0.2
+OOO_BUILD_TARBALL_VERSION=$(OOO_BUILD_VERSION)
+OOO_BUILD_TAG=libreoffice-$(OOO_BUILD_TARBALL_VERSION)
 OOO_BUILD_TREE=libreoffice-build
 SOURCE_TREE=$(OOO_BUILD_TREE)/build/libreoffice-$(OOO_BUILD_TARBALL_VERSION)
 STAMP_DIR=debian/stampdir
Reply to: