./packages/libreoffice/3.3.0/experimental r2318: make patches which are 1:1 in libreoffice-3-3 consistent
------------------------------------------------------------
revno: 2318
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Tue 2011-01-11 21:49:02 +0100
message:
make patches which are 1:1 in libreoffice-3-3 consistent
modified:
patches/buildfix-patches.diff
patches/fix-hr-and-te-translations.diff
patches/fix-wrapper-manpage-install.diff
=== modified file 'patches/buildfix-patches.diff'
--- a/patches/buildfix-patches.diff 2011-01-10 21:18:35 +0000
+++ b/patches/buildfix-patches.diff 2011-01-11 20:49:02 +0000
@@ -9,6 +9,13 @@
# Backport from cbosdo06 CWS
sw-table-frame-uno-fix.diff, i#112564, cbosdo
+
+From 541b60296509f0543c16fb82d504bdc7c3452890 Mon Sep 17 00:00:00 2001
+From: Rene Engelhard <rene@debian.org>
+Date: Mon, 10 Jan 2011 21:15:18 +0000
+Subject: make reportdesign-mention-package-l10n.diff apply again
+
+---
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
@@ -39,3 +46,5 @@
diff --git l10n/source/tr/localize.sdf l10n/source/tr/localize.sdf
index 2e8bfd0..7d1aeb6 100644
--- l10n/source/tr/localize.sdf
+--
+cgit v0.8.3-6-g21f6
=== modified file 'patches/fix-hr-and-te-translations.diff'
--- a/patches/fix-hr-and-te-translations.diff 2011-01-11 20:24:35 +0000
+++ b/patches/fix-hr-and-te-translations.diff 2011-01-11 20:49:02 +0000
@@ -90,6 +90,13 @@
"స్వాతంత్ర్యం వుందని తెలియచేస్తున్నాము మరియు స్వాగతం పలుకుతున్నాము. "
--
cgit v0.8.3-6-g21f6
+
+From f1c9b4b77299abd0f9f812c6bf63f69f575b2db2 Mon Sep 17 00:00:00 2001
+From: Rene Engelhard <rene@debian.org>
+Date: Tue, 11 Jan 2011 20:27:50 +0000
+Subject: update sdfs for hr/te l10n fix
+
+---
diff --git a/po/lo-build-hr.sdf b/po/lo-build-hr.sdf
index b60dd6f..57aa95d 100644
--- libreoffice-3.3.0/libreoffice-build/po/lo-build-hr.sdf
@@ -150,3 +157,6 @@
readlicense_oo docs\readme\readme.xrm 0 readmeitem rpminstall1 rpminstall1 999 en-US If you have a previous version of ${PRODUCTNAME} already installed, then you will need to de-install it before proceeding further. For instructions on how to do that, please read the section below entitled De-installation of a Previous Version of ${PRODUCTNAME}. For instructions on how to install a language pack (after having installed the US English version of ${PRODUCTNAME}), please read the section below entitled Installing a Language Pack. 2002-02-02 02:02:02
readlicense_oo docs\readme\readme.xrm 0 readmeitem rpminstall1 rpminstall1 999 te ఇప్పటికే ${PRODUCTNAME} పాత రూపాంతరము స్ధాపించివున్నట్లయితే, కొనసాగించే ముందు, దానిని తొలగించాలి. సూచనలకోసం క్రింద యివ్వబడిన విభాగం De-installation of a Previous Version of ${PRODUCTNAME} చూడండి. ${PRODUCTNAME}అమెరికన్ ఇంగ్లిషు రూపాంతరము స్థాపన తరువాత భాష కవిలె (లాంగ్వేజ్ పాక్) స్థాపన సూచనలకు, క్రింద వున్న Installing a Language Pack అనే విభాగం చదవండి 2002-02-02 02:02:02
readlicense_oo docs\readme\readme.xrm 0 readmeitem rpminstall2 rpminstall2 999 en-US When you unpack the downloaded archive, you will see that the contents have been decompressed into a sub-directory. Open a file manager window, and change directory to the one starting with "LibO_", followed by the version number and some platform information. 2002-02-02 02:02:02
+--
+cgit v0.8.3-6-g21f6
+
=== modified file 'patches/fix-wrapper-manpage-install.diff'
--- a/patches/fix-wrapper-manpage-install.diff 2011-01-10 21:18:35 +0000
+++ b/patches/fix-wrapper-manpage-install.diff 2011-01-11 20:49:02 +0000
@@ -1,3 +1,9 @@
+From 57a6c6fe5c24523d499125193a564acc5e4657ed Mon Sep 17 00:00:00 2001
+From: Rene Engelhard <rene@debian.org>
+Date: Sat, 08 Jan 2011 03:23:40 +0000
+Subject: update Debian-only parts of package-ooo for new lo*/libreoffice*
+
+---
diff --git a/bin/package-ooo b/bin/package-ooo
index 9127848..3d6b1a6 100755
--- libreoffice-3.3.0/libreoffice-build/bin/package-ooo
@@ -50,3 +56,6 @@
pkg/libreoffice-common/etc/bash_completion.d
mv .$OOINSTBASE/basis$VERSION/program/java-set-classpath \
pkg/libreoffice-common/$OOINSTBASE/program
+--
+cgit v0.8.3-6-g21f6
+
Reply to: