./packages/libreoffice/3.3.0/experimental r2132: version 3.3.0~beta2; make source package work, remove empty .orig (libreoffice-* (except build) is now the .orig.tar.gz
------------------------------------------------------------
revno: 2132
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Tue 2010-10-12 22:33:00 +0200
message:
version 3.3.0~beta2; make source package work, remove empty .orig (libreoffice-* (except build) is now the .orig.tar.gz
removed:
source/options
modified:
changelog
patches/buildfix-patches.diff
patches/installer-globals-max-1-regcomp.diff
patches/package-ooo-libreoffice.diff
rules
source/components
=== modified file 'changelog'
--- a/changelog 2010-10-12 00:40:55 +0000
+++ b/changelog 2010-10-12 20:33:00 +0000
@@ -1,4 +1,4 @@
-libreoffice (1:3.3.0~3.2.99.2-1) UNRELEASED; urgency=low
+libreoffice (1:3.3.0~beta2-1) UNRELEASED; urgency=low
* welcome, LibreOffice 3.3 beta 2 (aka 3.2.99.2)
- includes OpenOffice.org 3.3.0 release branch milestone 9, so:
@@ -58,7 +58,7 @@
* debian/control.in, debian/rules: stop building industrial package
* debian/scripts/fix_bmp_rgb: remove
- -- Rene Engelhard <rene@debian.org> Tue, 12 Oct 2010 02:36:49 +0200
+ -- Rene Engelhard <rene@debian.org> Tue, 12 Oct 2010 22:03:08 +0200
openoffice.org (1:3.2.1-7) unstable; urgency=low
=== modified file 'patches/buildfix-patches.diff'
--- a/patches/buildfix-patches.diff 2010-10-10 17:25:33 +0000
+++ b/patches/buildfix-patches.diff 2010-10-12 20:33:00 +0000
@@ -1,7 +1,7 @@
diff --git a/patches/dev300/debian-splash.diff b/patches/dev300/debian-splash.diff
index da840fa..a01a995 100644
---- libreoffice-3.3.0/build-3-2-99-2/patches/dev300/debian-splash.diff
-+++ libreoffice-3.3.0/build-3-2-99-2/patches/dev300/debian-splash.diff
+--- libreoffice-3.3.0/libreoffice-build-3-2-99-2/patches/dev300/debian-splash.diff
++++ libreoffice-3.3.0/libreoffice-build-3-2-99-2/patches/dev300/debian-splash.diff
@@ -2,8 +2,8 @@
+++ instsetoo_native/util/openoffice.lst 2008-08-06 00:04:01.000000000 +0200
@@ -25,7 +25,7 @@
@@ -15,8 +15,8 @@
PROGRESSSIZE 320,7
diff --git a/patches/dev300/reportdesign-mention-package-l10n.diff b/patches/dev300/reportdesign-mention-package-l10n.diff
index 71b19ed..7066923 100644
---- libreoffice-3.3.0/build-3-2-99-2/patches/dev300/reportdesign-mention-package-l10n.diff
-+++ libreoffice-3.3.0/build-3-2-99-2/patches/dev300/reportdesign-mention-package-l10n.diff
+--- libreoffice-3.3.0/libreoffice-build-3-2-99-2/patches/dev300/reportdesign-mention-package-l10n.diff
++++ libreoffice-3.3.0/libreoffice-build-3-2-99-2/patches/dev300/reportdesign-mention-package-l10n.diff
@@ -1,39 +1,39 @@
-diff --git a/l10n/source/ar/localize.sdf b/l10n/source/ar/localize.sdf
---- l10n/source/ar/localize.sdf
=== modified file 'patches/installer-globals-max-1-regcomp.diff'
--- a/patches/installer-globals-max-1-regcomp.diff 2010-10-01 15:51:24 +0000
+++ b/patches/installer-globals-max-1-regcomp.diff 2010-10-12 20:33:00 +0000
@@ -1,5 +1,5 @@
--- /dev/null 2010-05-24 16:58:35.275686347 +0200
-+++ openoffice.org-3.3.0/build-3-2-99-2/patches/dev300/installer-globals-max-1-regcomp.diff 2010-06-11 00:39:33.000000000 +0200
++++ openoffice.org-3.3.0/libreoffice-build-3-2-99-2/patches/dev300/installer-globals-max-1-regcomp.diff 2010-06-11 00:39:33.000000000 +0200
@@ -0,0 +1,14 @@
+diff --git a/solenv/bin/modules/installer/globals.pm b/solenv/bin/modules/installer/globals.pm
+--- solenv/bin/modules/installer/globals.pm
@@ -17,8 +17,8 @@
+ $fix_number_of_cab_files = 1;
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 3a732ae..5f1c32a 100644
---- openoffice.org-3.3.0/build-3-2-99-2/patches/dev300/apply
-+++ openoffice.org-3.3.0/build-3-2-99-2/patches/dev300/apply
+--- openoffice.org-3.3.0/libreoffice-build-3-2-99-2/patches/dev300/apply
++++ openoffice.org-3.3.0/libreoffice-build-3-2-99-2/patches/dev300/apply
@@ -307,6 +307,10 @@ gcc-HelpLinker.diff
# configmgr paths are not yet existing then
speed-sal-fewer-lstats.diff, i#89730, jholesov
=== modified file 'patches/package-ooo-libreoffice.diff'
--- a/patches/package-ooo-libreoffice.diff 2010-10-12 00:40:55 +0000
+++ b/patches/package-ooo-libreoffice.diff 2010-10-12 20:33:00 +0000
@@ -1,5 +1,5 @@
---- libreoffice-3.3.0/build-3-2-99-2/bin/package-ooo.old 2010-10-11 22:29:06.000000000 +0200
-+++ libreoffice-3.3.0/build-3-2-99-2/bin/package-ooo 2010-10-11 22:29:47.000000000 +0200
+--- libreoffice-3.3.0/libreoffice-build-3-2-99-2/bin/package-ooo.old 2010-10-11 22:29:06.000000000 +0200
++++ libreoffice-3.3.0/libreoffice-build-3-2-99-2/bin/package-ooo 2010-10-11 22:29:47.000000000 +0200
@@ -820,71 +820,71 @@
create_package_directory gid_Module_Root_Ure_Hidden pkg/ure
=== modified file 'rules'
--- a/rules 2010-10-12 00:40:55 +0000
+++ b/rules 2010-10-12 20:33:00 +0000
@@ -77,11 +77,12 @@
#OOO_BUILD_TARBALL_VERSION=$(OOO_BUILD_VERSION)
OOO_BUILD_TARBALL_VERSION=3.2.99.2
OOO_BUILD_TAG=LIBREOFFICE_3_2_99_2
-OOO_BUILD_TREE=build-$(shell echo $(OOO_BUILD_VERSION) | sed -e 's/\./-/g')
+OOO_BUILD_TREE=libreoffice-build-$(shell echo $(OOO_BUILD_VERSION) | sed -e 's/\./-/g')
SOURCE_TREE=$(OOO_BUILD_TREE)/build/libreoffice-$(OOO_BUILD_TARBALL_VERSION)
STAMP_DIR=debian/stampdir
TARFILE_LOCATION=$(CURDIR)/ext-sources
export TARFILE_LOCATION
+USE_SOURCE_TARBALLS=y
ifeq "$(DISTREL)" "lenny"
LENNY_BACKPORT=y
@@ -321,7 +322,11 @@
--with-system-dicts \
--with-additional-sections="$(ADDITIONAL_SECTIONS)"
-CONFIGURE_FLAGS += --with-git
+ifeq "$(USE_SOURCE_TARBALLS)" "y"
+ CONFIGURE_FLAGS += --without-git
+else
+ CONFIGURE_FLAGS += --with-git
+endif
# distro-configs is too late; it already gets searched in unpack
# when we don't do that here, too.
@@ -1632,7 +1637,7 @@
rm -f debian/libreoffice-dtd-officedocument1.0.xmlcatalogs
rm -f download.list
- rm -f $(OOO_BUILD_TREE)/src/ooo-build-$(OOO_BUILD_TARBAL_VERSION)*
+ rm -f $(OOO_BUILD_TREE)/src/libreoffice-$(OOO_BUILD_TARBAL_VERSION)*
rm -f $(OOO_BUILD_TREE)/src/GSI*
for i in ext-sources-$(OOO_BUILD_TREE)/*; do \
@@ -1948,8 +1953,8 @@
done
endif
+ cp -a src/* $(OOO_BUILD_TREE)/src
cp -a ext-sources-$(OOO_BUILD_TREE)/* $(OOO_BUILD_TREE)/src
- #cp -a archive-$(OOO_BUILD_TREE)/* $(OOO_BUILD_TREE)/src
ifneq ($(GCC_VERSION),)
ifneq ($(GCC_VERSION),snapshot)
=== modified file 'source/components'
--- a/source/components 2010-09-16 19:23:56 +0000
+++ b/source/components 2010-10-12 20:33:00 +0000
@@ -1,5 +1,4 @@
ext-sources
-archive-ooo-build-3-2-98-1
-ooo-build-3-2-98-1
-ext-sources-3-2-98-1
+libreoffice-build-3-2-99-2
+ext-sources-libreoffice-build-3-2-99-2
translation-updates-20100529
=== removed file 'source/options'
--- a/source/options 2010-09-15 18:17:50 +0000
+++ b/source/options 1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-create-empty-orig
Reply to: