[SCM] OpenOffice.org packaging repository branch, master, updated. 62dd1c26f3aa51b6789c33d9b1feb6333bf1c121

["Rene Engelhard" <rene@debian.org>]

The following commit has been merged in the master branch:
commit 0a249bd3b6270a6ea2d6d95ee0780ada08498467
Author: Rene Engelhard <rene@debian.org>
Date:   Sun Feb 20 21:43:54 2011 +0000

    exclude openoffice.org-evolution as libreoffice-evolution (temporarily) is not built anymore

diff --git a/changelog b/changelog
index d66d22d..fa8c95e 100644
--- a/changelog
+++ b/changelog
@@ -2,6 +2,8 @@ openoffice.org (1:3.3.0-6) UNRELEASED; urgency=low
 
   * debian/control.in:
     - update for new git
+  * debian/scripts/gentranspkgs.py: exclude openoffice.org-evolution
+    as libreoffice-evolution (temporarily) is not built anymore
 
  -- Rene Engelhard <rene@debian.org>  Thu, 17 Feb 2011 16:10:59 +0100
 
diff --git a/control b/control
index 2866504..1e641f0 100644
--- a/control
+++ b/control
@@ -185,17 +185,6 @@ Description: office productivity suite -- Xhosa language package
  .
  It can be safely removed after an upgrade.
 
-Package: openoffice.org-evolution
-Architecture: all
-Priority: extra
-Section: gnome
-Depends: libreoffice-evolution
-Description: office productivity suite -- Evolution addressbook support
- This is a transitional package, replacing the OpenOffice.org packaging
- with the LibreOffice packaging.
- .
- It can be safely removed after an upgrade.
-
 Package: openoffice.org-help-pt
 Architecture: all
 Priority: extra
diff --git a/scripts/gentranspkgs.py b/scripts/gentranspkgs.py
index b533269..2ae4647 100644
--- a/scripts/gentranspkgs.py
+++ b/scripts/gentranspkgs.py
@@ -2,7 +2,7 @@
 
 import re, sys, fileinput
 
-skip_packages = ('openoffice.org-core', 'openoffice.org-report-builder-bin', 'openoffice.org-base-core', 'openoffice.org-dev', 'openoffice.org-dev-doc', 'openoffice.org-dbg', 'openoffice.org-help-sk')
+skip_packages = ('openoffice.org-core', 'openoffice.org-report-builder-bin', 'openoffice.org-base-core', 'openoffice.org-dev', 'openoffice.org-dev-doc', 'openoffice.org-dbg', 'openoffice.org-help-sk', 'openoffice.org-evolution')
 
 def gen_transitonal_packages():
     skip = True

-- 
OpenOffice.org packaging repository