[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[SCM] OpenOffice.org packaging repository branch, ubuntu-natty-3.3.1, updated. b872adbc575010a90e3de82c64f95faa2279215f



The following commit has been merged in the ubuntu-natty-3.3.1 branch:
commit 89e0215b77c41cd88ec136f367fa5e63de722e6c
Merge: bdcd942c6de0fb884919b086a38b9dc348b0ca3c 4a15692314d4d1962b51e14d53653397ac9848e2
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date:   Thu Mar 10 17:46:19 2011 +0100

    Merge branch 'master' into ubuntu-natty-3.3.1
    
    Conflicts:
    	changelog

diff --combined changelog
index 2ded184,bcf938d..18cea49
--- a/changelog
+++ b/changelog
@@@ -1,22 -1,31 +1,45 @@@
+ openoffice.org (1:3.3.0-7) unstable; urgency=low
+ 
+   * add oo* symlinks (closes: #614840) 
+ 
+   * debian/mirror.1und1.de_debian_dists_experimental_main_binary-amd64_Packages:
+     remove
+   * debian/mirror.1und1.de_debian_dists_sid_main_binary-amd64_Packages:
+     add
+   * debian/rules: update for s/experimental/sid/
+   * debian/control: regenerate (-> also build transitional packages for
+     - openoffice.org-zemberek
+     - openoffice.org-writer2latex
+     - openoffice.org-dmaths
+     - openoffice.org-writer2xhtml
+     - openoffice.org-voikko
+   * debian/scripts/gentranspkgs.py:
+     - exclude openoffice.org-nlpsolver, there was none :-)
+     - fix to also create transitional packages for -libreoffice:
+       + mozilla-openoffice.org
+       + docvert-openoffice.org
+   * debian/scripts/gentranspks.py:
+     - also generate oo.o-{thesaurus,hyphenation} -> {mythes,hyphen}-*
+       transitional packages (closes: #617228); exclude false result
+       openoffice.org-hyphenation-show
+   * debian/source/lintian-overrides: update 
+ 
+  -- Rene Engelhard <rene@debian.org>  Mon, 07 Mar 2011 20:53:23 +0100
+ 
 +openoffice.org (1:3.3.0-6ubuntu1) natty; urgency=low
 +
 +  [ Rene Engelhard ]
 +  * all changes up to 3.3.0-6
 +  * add oo* symlinks (closes: #614840)
 +
 +  [ Bjoern Michaelsen ]
 +  * moving transitional packages from libreoffice to openoffice.org source
 +  * merged master up to 02f0bb37b2c26a43005695b5e7bcdc1fda970621
 +  * add preinst hooks for removal of /usr/share/doc symlinks
 +
 + -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com>  Tue, 01 Mar 2011 23:48:44 +0100
 +
- openoffice.org (1:3.3.0-7) UNRELEASED; urgency=low
- 
-   * add oo* symlinks (closes: #614840) 
- 
-  -- Rene Engelhard <rene@debian.org>  Sat, 26 Feb 2011 16:41:47 +0100
 +
  openoffice.org (1:3.3.0-6) unstable; urgency=low
  
    * debian/control.in:
diff --combined control
index e39ae99,641fbd4..bd1640a
--- a/control
+++ b/control
@@@ -1,8 -1,7 +1,8 @@@
  Source: openoffice.org
  Section: editors
  Priority: extra
 -Maintainer: Debian LibreOffice Maintainers <debian-openoffice@lists.debian.org>
 +Maintainer: Ubuntu Core Developers <ubuntu-devel-discuss@lists.ubuntu.com>
 +XSBC-Original-Maintainer: Debian LibreOffice Maintainers <debian-openoffice@lists.debian.org>
  Uploaders: Rene Engelhard <rene@debian.org>
  Build-Depends: debhelper (>= 6.0.7~), python
  Standards-Version: 3.8.4
@@@ -21,6 -20,17 +21,17 @@@ Description: office productivity suit
   .
   It can be safely removed after an upgrade.
  
+ Package: openoffice.org-thesaurus-en-us
+ Architecture: all
+ Priority: extra
+ Section: text
+ Depends: mythes-en-us
+ Description: English Thesaurus for LibreOffice/OpenOffice.org
+  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-l10n-cy
  Architecture: all
  Priority: extra
@@@ -87,6 -97,28 +98,28 @@@ Description: office productivity suite 
   .
   It can be safely removed after an upgrade.
  
+ Package: openoffice.org-hyphenation-ro
+ Architecture: all
+ Priority: extra
+ Section: text
+ Depends: hyphen-ro
+ Description: Romanian hyphenation patterns for LibreOffice/OpenOffice.org
+  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-thesaurus-de
+ Architecture: all
+ Priority: extra
+ Section: text
+ Depends: mythes-de
+ Description: German Thesaurus for OpenOffice.org/LibreOffice
+  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-l10n-ca
  Architecture: all
  Priority: extra
@@@ -98,6 -130,17 +131,17 @@@ Description: office productivity suite 
   .
   It can be safely removed after an upgrade.
  
+ Package: openoffice.org-hyphenation-af
+ Architecture: all
+ Priority: extra
+ Section: text
+ Depends: hyphen-af
+ Description: Afrikaans hyphenation patterns for LibreOffice/OpenOffice.org
+  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-en-us
  Architecture: all
  Priority: extra
@@@ -109,6 -152,28 +153,28 @@@ Description: office productivity suite 
   .
   It can be safely removed after an upgrade.
  
+ Package: openoffice.org-thesaurus-sk
+ Architecture: all
+ Priority: extra
+ Section: text
+ Depends: mythes-sk
+ Description: Slovak Thesaurus for LibreOffice/OpenOffice.org
+  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-thesaurus-ca
+ Architecture: all
+ Priority: extra
+ Section: text
+ Depends: mythes-ca
+ Description: Catalan Thesaurus for LibreOffice/OpenOffice.org
+  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-l10n-ka
  Architecture: all
  Priority: extra
@@@ -153,6 -218,17 +219,17 @@@ Description: office productivity suite 
   .
   It can be safely removed after an upgrade.
  
+ Package: openoffice.org-hyphenation-sh
+ Architecture: all
+ Priority: extra
+ Section: text
+ Depends: hyphen-sh
+ Description: Serbian (Latin) hyphenation patterns for LibreOffice/OpenOffice.org
+  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-l10n-ku
  Architecture: all
  Priority: extra
@@@ -175,6 -251,17 +252,17 @@@ Description: office productivity suite 
   .
   It can be safely removed after an upgrade.
  
+ Package: openoffice.org-hyphenation-zu
+ Architecture: all
+ Priority: extra
+ Section: text
+ Depends: hyphen-zu
+ Description: Zulu hyphenation patterns for LibreOffice/OpenOffice.org
+  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-l10n-xh
  Architecture: all
  Priority: extra
@@@ -186,6 -273,28 +274,28 @@@ Description: office productivity suite 
   .
   It can be safely removed after an upgrade.
  
+ Package: openoffice.org-hyphenation-sr
+ Architecture: all
+ Priority: extra
+ Section: text
+ Depends: hyphen-sr
+ Description: Serbian (Cyrillic) hyphenation patterns for LibreOffice/OpenOffice.org
+  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-thesaurus-cs
+ Architecture: all
+ Priority: extra
+ Section: text
+ Depends: mythes-cs
+ Description: Czech Thesaurus for LibreOffice/OpenOffice.org
+  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
@@@ -208,6 -317,17 +318,17 @@@ Description: office productivity suite 
   .
   It can be safely removed after an upgrade.
  
+ Package: openoffice.org-thesaurus-de-ch
+ Architecture: all
+ Priority: extra
+ Section: text
+ Depends: mythes-de-ch
+ Description: German Thesaurus for OpenOffice.org/LibreOffice (Swiss Version)
+  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-pl
  Architecture: all
  Priority: extra
@@@ -241,6 -361,28 +362,28 @@@ Description: office productivity suite 
   .
   It can be safely removed after an upgrade.
  
+ Package: openoffice.org-hyphenation-sl
+ Architecture: all
+ Priority: extra
+ Section: text
+ Depends: hyphen-sl
+ Description: Slovenian hyphenation patterns for LibreOffice/OpenOffice.org
+  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-hyphenation-it
+ Architecture: all
+ Priority: extra
+ Section: text
+ Depends: hyphen-it
+ Description: Italian hyphenation patterns for LibreOffice/OpenOffice.org
+  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-l10n-ml
  Architecture: all
  Priority: extra
@@@ -263,12 -405,23 +406,23 @@@ Description: LibreOffice Impress extens
   .
   It can be safely removed after an upgrade.
  
- Package: openoffice.org-l10n-eu
+ Package: openoffice.org-thesaurus-ru
  Architecture: all
  Priority: extra
- Section: localization
- Depends: libreoffice-l10n-eu
- Description: office productivity suite -- Basque language package
+ Section: text
+ Depends: mythes-ru
+ Description: Russian Thesaurus for LibreOffice/OpenOffice.org
+  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-fr
+ Architecture: all
+ Priority: extra
+ Section: doc
+ Depends: libreoffice-help-fr
+ Description: office productivity suite -- French help
   This is a transitional package, replacing the OpenOffice.org packaging
   with the LibreOffice packaging.
   .
@@@ -340,6 -493,17 +494,17 @@@ Description: office productivity suite 
   .
   It can be safely removed after an upgrade.
  
+ Package: openoffice.org-thesaurus-ro
+ Architecture: all
+ Priority: extra
+ Section: text
+ Depends: mythes-ro
+ Description: Romanian Thesaurus for LibreOffice/OpenOffice.org
+  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-l10n-he
  Architecture: all
  Priority: extra
@@@ -362,6 -526,17 +527,17 @@@ Description: office productivity suite 
   .
   It can be safely removed after an upgrade.
  
+ Package: openoffice.org-thesaurus-fr
+ Architecture: all
+ Priority: extra
+ Section: text
+ Depends: mythes-fr
+ Description: French Thesaurus for LibreOffice/OpenOffice.org
+  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-nl
  Architecture: all
  Priority: extra
@@@ -461,6 -636,28 +637,28 @@@ Description: office productivity suite 
   .
   It can be safely removed after an upgrade.
  
+ Package: mozilla-openoffice.org
+ Architecture: all
+ Priority: extra
+ Section: net
+ Depends: mozilla-libreoffice
+ Description: office productivity suite -- Mozilla plugin
+  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-thesaurus-ne
+ Architecture: all
+ Priority: extra
+ Section: text
+ Depends: mythes-ne
+ Description: Nepali Thesaurus for LibreOffice/OpenOffice.org
+  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-l10n-zh-tw
  Architecture: all
  Priority: extra
@@@ -516,12 -713,12 +714,12 @@@ Description: office productivity suite 
   .
   It can be safely removed after an upgrade.
  
- Package: openoffice.org-help-fr
+ Package: openoffice.org-l10n-eu
  Architecture: all
  Priority: extra
- Section: doc
- Depends: libreoffice-help-fr
- Description: office productivity suite -- French help
+ Section: localization
+ Depends: libreoffice-l10n-eu
+ Description: office productivity suite -- Basque language package
   This is a transitional package, replacing the OpenOffice.org packaging
   with the LibreOffice packaging.
   .
@@@ -571,6 -768,17 +769,17 @@@ Description: office productivity suite 
   .
   It can be safely removed after an upgrade.
  
+ Package: openoffice.org-hyphenation-hu
+ Architecture: all
+ Priority: extra
+ Section: text
+ Depends: hyphen-hu
+ Description: Hungarian hyphenation patterns for LibreOffice/OpenOffice.org
+  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-l10n-bs
  Architecture: all
  Priority: extra
@@@ -703,6 -911,17 +912,17 @@@ Description: office productivity suite 
   .
   It can be safely removed after an upgrade.
  
+ Package: openclipart-openoffice.org
+ Architecture: all
+ Priority: extra
+ Section: graphics
+ Depends: openclipart-libreoffice
+ Description: clip art for OpenOffice.org/LibreOffice gallery
+  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-officebean
  Architecture: all
  Priority: extra
@@@ -714,6 -933,17 +934,17 @@@ Description: office productivity suite 
   .
   It can be safely removed after an upgrade.
  
+ Package: openoffice.org-hyphenation-en-us
+ Architecture: all
+ Priority: extra
+ Section: text
+ Depends: hyphen-en-us
+ Description: US English hyphenation patterns for LibreOffice/OpenOffice.org
+  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-l10n-st
  Architecture: all
  Priority: extra
@@@ -802,6 -1032,17 +1033,17 @@@ Description: office productivity suite 
   .
   It can be safely removed after an upgrade.
  
+ Package: openoffice.org-zemberek
+ Architecture: all
+ Priority: extra
+ Section: text
+ Depends: libreoffice-zemberek
+ Description: Turkish spell checker extension for LibreOffice
+  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-da
  Architecture: all
  Priority: extra
@@@ -813,6 -1054,17 +1055,17 @@@ Description: office productivity suite 
   .
   It can be safely removed after an upgrade.
  
+ Package: openoffice.org-thesaurus-hu
+ Architecture: all
+ Priority: extra
+ Section: text
+ Depends: mythes-hu
+ Description: Hungarian Thesaurus for LibreOffice/OpenOffice.org
+  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-de
  Architecture: all
  Priority: extra
@@@ -824,6 -1076,17 +1077,17 @@@ Description: office productivity suite 
   .
   It can be safely removed after an upgrade.
  
+ Package: openoffice.org-writer2latex
+ Architecture: all
+ Priority: extra
+ Section: text
+ Depends: libreoffice-writer2latex
+ Description: Writer/Calc to LaTeX converter extension for LibreOffice
+  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-sl
  Architecture: all
  Priority: extra
@@@ -868,6 -1131,17 +1132,17 @@@ Description: office productivity suite 
   .
   It can be safely removed after an upgrade.
  
+ Package: openoffice.org-hyphenation-fr
+ Architecture: all
+ Priority: extra
+ Section: text
+ Depends: hyphen-fr
+ Description: French hyphenation patterns for LibreOffice/OpenOffice.org
+  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-l10n-ga
  Architecture: all
  Priority: extra
@@@ -1044,6 -1318,17 +1319,17 @@@ Description: office productivity suite 
   .
   It can be safely removed after an upgrade.
  
+ Package: docvert-openoffice.org
+ Architecture: all
+ Priority: extra
+ Section: web
+ Depends: docvert-libreoffice
+ Description: converts word processor files to HTML using LibreOffice
+  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-emailmerge
  Architecture: all
  Priority: extra
@@@ -1077,6 -1362,17 +1363,17 @@@ Description: office productivity suite 
   .
   It can be safely removed after an upgrade.
  
+ Package: openoffice.org-dmaths
+ Architecture: all
+ Priority: extra
+ Section: doc
+ Depends: libreoffice-dmaths
+ Description: Formula editor improvements for LibreOffice
+  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-l10n-lt
  Architecture: all
  Priority: extra
@@@ -1220,6 -1516,17 +1517,17 @@@ Description: office productivity suite 
   .
   It can be safely removed after an upgrade.
  
+ Package: openoffice.org-hyphenation-ca
+ Architecture: all
+ Priority: extra
+ Section: text
+ Depends: hyphen-ca
+ Description: Catalan hyphenation patterns for LibreOffice/OpenOffice.org
+  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-en-gb
  Architecture: all
  Priority: extra
@@@ -1242,12 -1549,23 +1550,23 @@@ Description: office productivity suite 
   .
   It can be safely removed after an upgrade.
  
+ Package: openoffice.org-writer2xhtml
+ Architecture: all
+ Priority: extra
+ Section: text
+ Depends: libreoffice-writer2xhtml
+ Description: Writer/Calc to XHTML converter extension for LibreOffice
+  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-common
  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.
@@@ -1342,6 -1660,17 +1661,17 @@@ Description: office productivity suite 
   .
   It can be safely removed after an upgrade.
  
+ Package: openoffice.org-hyphenation-de
+ Architecture: all
+ Priority: extra
+ Section: text
+ Depends: hyphen-de
+ Description: German hyphenation patterns for LibreOffice/OpenOffice.org
+  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-zh-tw
  Architecture: all
  Priority: extra
@@@ -1375,6 -1704,17 +1705,17 @@@ Description: office productivity suite 
   .
   It can be safely removed after an upgrade.
  
+ Package: openoffice.org-voikko
+ Architecture: all
+ Priority: extra
+ Section: text
+ Depends: libreoffice-voikko
+ Description: Finnish language tools for LibreOffice
+  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-ru
  Architecture: all
  Priority: extra
diff --combined rules
index 6f570b9,3514739..6439e7a
--- a/rules
+++ b/rules
@@@ -19,19 -19,19 +19,19 @@@ clean
  	$(MAKE) -f debian/rules control
  
  control: debian/control
- debian/control: $(wildcard debian/control.in) $(wildcard debian/mirror.1und1.de_debian_dists_experimental_main_binary-amd64_Packages) debian/rules
+ debian/control: $(wildcard debian/control.in) $(wildcard debian/mirror.1und1.de_debian_dists_sid_main_binary-amd64_Packages) debian/rules
  	rm -f debian/control
  
  	cat debian/control.in >> debian/control
  
- 	python debian/scripts/gentranspkgs.py < debian/mirror.1und1.de_debian_dists_experimental_main_binary-amd64_Packages > debian/control.ooo
+ 	python debian/scripts/gentranspkgs.py < debian/mirror.1und1.de_debian_dists_sid_main_binary-amd64_Packages > debian/control.ooo
  	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
@@@ -87,11 -87,6 +87,11 @@@ binary-arch: buil
  
  binary: binary-indep binary-arch
  
 -.PHONY: control
 +regenerate-preinst: debian/control
 +	dh_testdir
 +	debian/scripts/regenerate-preinst $<
 +
 +
 +.PHONY: control regenerate-preinst
  
  # vim:set noet ai sts=8 sw=8 tw=0:

-- 
OpenOffice.org packaging repository


Reply to: