./packages/openofficeorg/3.2.1/experimental r1985: merge
------------------------------------------------------------
revno: 1985 [merge]
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Fri 2010-05-14 19:55:33 +0200
message:
merge
modified:
changelog
control
control.lenny_squeeze_transitional.in
rules
=== modified file 'changelog'
--- a/changelog 2010-05-14 17:51:44 +0000
+++ b/changelog 2010-05-14 17:55:33 +0000
@@ -1,3 +1,10 @@
+openoffice.org (1:3.2.1~rc1-3) UNRELEASED; urgency=low
+
+ * debian/control.lenny_squeeze_transitional.in: move packages to
+ localization, where they belong
+
+ -- Rene Engelhard <rene@debian.org> Fri, 14 May 2010 16:39:37 +0200
+
openoffice.org (1:3.2.1~rc1-2) experimental; urgency=low
* ooo-build:
=== modified file 'control'
--- a/control 2010-05-13 16:43:59 +0000
+++ b/control 2010-05-14 17:55:33 +0000
@@ -3699,6 +3699,7 @@
OpenOffice.org without any wrapper layer such as ODBC or JDBC.
Package: openoffice.org-l10n-as-in
+Section: localization
Architecture: all
Depends: openoffice.org-l10n-as
Description: transitional package to openoffice.org-l10n-as
@@ -3708,6 +3709,7 @@
It can be safely removed when openoffice.org-l10n-as is installed.
Package: openoffice.org-l10n-gu-in
+Section: localization
Architecture: all
Depends: openoffice.org-l10n-gu
Description: transitional package to openoffice.org-l10n-gu
@@ -3717,6 +3719,7 @@
It can be safely removed when openoffice.org-l10n-gu is installed.
Package: openoffice.org-l10n-ml-in
+Section: localization
Architecture: all
Depends: openoffice.org-l10n-ml
Description: transitional package to openoffice.org-l10n-ml
@@ -3726,6 +3729,7 @@
It can be safely removed when openoffice.org-l10n-ml is installed.
Package: openoffice.org-l10n-mr-in
+Section: localization
Architecture: all
Depends: openoffice.org-l10n-mr
Description: transitional package to openoffice.org-l10n-mr
@@ -3735,6 +3739,7 @@
It can be safely removed when openoffice.org-l10n-mr is installed.
Package: openoffice.org-l10n-or-in
+Section: localization
Architecture: all
Depends: openoffice.org-l10n-or
Description: transitional package to openoffice.org-l10n-or
@@ -3744,6 +3749,7 @@
It can be safely removed when openoffice.org-l10n-or is installed.
Package: openoffice.org-l10n-ta-in
+Section: localization
Architecture: all
Depends: openoffice.org-l10n-ta
Description: transitional package to openoffice.org-l10n-ta
@@ -3753,6 +3759,7 @@
It can be safely removed when openoffice.org-l10n-ta is installed.
Package: openoffice.org-l10n-te-in
+Section: localization
Architecture: all
Depends: openoffice.org-l10n-te
Description: transitional package to openoffice.org-l10n-te
=== modified file 'control.lenny_squeeze_transitional.in'
--- a/control.lenny_squeeze_transitional.in 2010-04-13 13:31:32 +0000
+++ b/control.lenny_squeeze_transitional.in 2010-05-14 14:41:07 +0000
@@ -1,4 +1,5 @@
Package: openoffice.orgVER-l10n-as-in
+Section: localization
Architecture: all
Depends: openoffice.orgVER-l10n-as
Description: transitional package to openoffice.orgVER-l10n-as
@@ -8,6 +9,7 @@
It can be safely removed when openoffice.orgVER-l10n-as is installed.
Package: openoffice.orgVER-l10n-gu-in
+Section: localization
Architecture: all
Depends: openoffice.orgVER-l10n-gu
Description: transitional package to openoffice.orgVER-l10n-gu
@@ -17,6 +19,7 @@
It can be safely removed when openoffice.orgVER-l10n-gu is installed.
Package: openoffice.orgVER-l10n-ml-in
+Section: localization
Architecture: all
Depends: openoffice.orgVER-l10n-ml
Description: transitional package to openoffice.orgVER-l10n-ml
@@ -26,6 +29,7 @@
It can be safely removed when openoffice.orgVER-l10n-ml is installed.
Package: openoffice.orgVER-l10n-mr-in
+Section: localization
Architecture: all
Depends: openoffice.orgVER-l10n-mr
Description: transitional package to openoffice.orgVER-l10n-mr
@@ -35,6 +39,7 @@
It can be safely removed when openoffice.orgVER-l10n-mr is installed.
Package: openoffice.orgVER-l10n-or-in
+Section: localization
Architecture: all
Depends: openoffice.orgVER-l10n-or
Description: transitional package to openoffice.orgVER-l10n-or
@@ -44,6 +49,7 @@
It can be safely removed when openoffice.orgVER-l10n-or is installed.
Package: openoffice.orgVER-l10n-ta-in
+Section: localization
Architecture: all
Depends: openoffice.orgVER-l10n-ta
Description: transitional package to openoffice.orgVER-l10n-ta
@@ -53,6 +59,7 @@
It can be safely removed when openoffice.orgVER-l10n-ta is installed.
Package: openoffice.orgVER-l10n-te-in
+Section: localization
Architecture: all
Depends: openoffice.orgVER-l10n-te
Description: transitional package to openoffice.orgVER-l10n-te
=== modified file 'rules'
--- a/rules 2010-05-13 16:43:59 +0000
+++ b/rules 2010-05-14 17:55:33 +0000
@@ -277,7 +277,7 @@
--with-installed-ooo-dirname=$(OODIRNAME) \
--mandir=/usr/share/man \
--with-docdir=/usr/share/doc/openoffice.org \
- --with-build-version="ooo-build $(OOO_BUILD_VERSION), Debian package $(BINARY_VERSION)" \
+ --with-build-version="ooo-build $(OOO_BUILD_VERSION), $(DIST) package $(BINARY_VERSION)" \
--disable-strip \
--enable-lockdown \
--with-drink=coffee \
Reply to: