The following commit has been merged in the master branch:
commit 9e9a22f9d81af296016b396644055c3d1ea29652
Author: Rene Engelhard <r...@debian.org>
Date:   Mon Mar 7 20:04:32 2011 +0000

    add a << 3.3.0-7 to the "rest" of openoffice.org-+ extension breaks

diff --git a/control b/control
index f85085c..641fbd4 100644
--- a/control
+++ b/control
@@ -1565,7 +1565,7 @@ Architecture: all
 Priority: extra
 Section: editors
 Depends: libreoffice-common (>= 1:3.3.0~rc4-2)
-Breaks: openoffice.org-presenter-console (<< 1:3.3.0-1), 
openoffice.org-wiki-publisher (<< 1:3.3.0-1), openoffice.org-sdbc-postgresql 
(<< 1:3.3.0-1), openoffice.org-report-builder (<< 1:3.3.0-1), 
openoffice.org-mysql-connector (<< 1:3.3.0-1), 
openoffice.org-presentation-minimizer (<< 1:3.3.0-1), docvert-openoffice.org, 
openoffice.org-dmaths, openoffice.org-voikko
+Breaks: openoffice.org-presenter-console (<< 1:3.3.0-1), 
openoffice.org-wiki-publisher (<< 1:3.3.0-1), openoffice.org-sdbc-postgresql 
(<< 1:3.3.0-1), openoffice.org-report-builder (<< 1:3.3.0-1), 
openoffice.org-mysql-connector (<< 1:3.3.0-1), 
openoffice.org-presentation-minimizer (<< 1:3.3.0-1), docvert-openoffice.org 
(<< 1:3.3.0-7), openoffice.org-dmaths (<< 1:3.3.0-7), openoffice.org-voikko (<< 
1:3.3.0-7)
 Description: office productivity suite -- arch-independent files
  This is a transitional package, replacing the OpenOffice.org packaging
  with the LibreOffice packaging.
diff --git a/rules b/rules
index fb337e0..3514739 100755
--- a/rules
+++ b/rules
@@ -28,10 +28,10 @@ debian/control: $(wildcard debian/control.in) $(wildcard 
debian/mirror.1und1.de_
        cat debian/control.ooo >> debian/control
        rm -f debian/control.ooo
 
-       # break transitional packages for the extensions. The dependency of 
them would
+       # break old packages for the extensions. The dependency of them would
        # be fullfilled - but we don't have /usr/lib/openoffice/program/unopkg 
here
        # anymore
-       perl -pi -e 's#(.*libreoffice-common.*)$$#\1\nBreaks: 
openoffice.org-presenter-console (<< 1:3.3.0-1), openoffice.org-wiki-publisher 
(<< 1:3.3.0-1), openoffice.org-sdbc-postgresql (<< 1:3.3.0-1), 
openoffice.org-report-builder (<< 1:3.3.0-1), openoffice.org-mysql-connector 
(<< 1:3.3.0-1), openoffice.org-presentation-minimizer (<< 1:3.3.0-1), 
docvert-openoffice.org, openoffice.org-dmaths, openoffice.org-voikko#' 
debian/control
+       perl -pi -e 's#(.*libreoffice-common.*)$$#\1\nBreaks: 
openoffice.org-presenter-console (<< 1:3.3.0-1), openoffice.org-wiki-publisher 
(<< 1:3.3.0-1), openoffice.org-sdbc-postgresql (<< 1:3.3.0-1), 
openoffice.org-report-builder (<< 1:3.3.0-1), openoffice.org-mysql-connector 
(<< 1:3.3.0-1), openoffice.org-presentation-minimizer (<< 1:3.3.0-1), 
docvert-openoffice.org (<< 1:3.3.0-7), openoffice.org-dmaths (<< 1:3.3.0-7), 
openoffice.org-voikko (<< 1:3.3.0-7)#' debian/control
 
        # got renamed in OOo 3.3
        perl -pi -e 's#(Package:.*hi$$)#\1-in#' debian/control

-- 
OpenOffice.org packaging repository


-- 
To UNSUBSCRIBE, email to debian-openoffice-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1pwgfa-0001kg...@alioth.debian.org

Reply via email to