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

./packages/openofficeorg/3.3.0/unstable r2139: actually commit 3.3.0-3



------------------------------------------------------------
revno: 2139
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Fri 2011-02-11 12:04:44 +0100
message:
  actually commit 3.3.0-3
modified:
  changelog
  control
  rules
=== modified file 'changelog'
--- a/changelog	2011-02-07 10:19:06 +0000
+++ b/changelog	2011-02-11 11:04:44 +0000
@@ -1,3 +1,13 @@
+openoffice.org (1:3.3.0-3) unstable; urgency=low
+
+  * make -common break the extensions (only those built from OOo for now
+    unless we know the version of the transitional packages of the others)
+    in version (<< 1:3.3.0-1) as the transitional packages will fullfill
+    their deps, but the expected /usr/lib/openoffice/program/unopkg is not
+    there anymore.
+
+ -- Rene Engelhard <rene@debian.org>  Wed, 09 Feb 2011 01:28:10 +0000
+
 openoffice.org (1:3.3.0-2) unstable; urgency=low
 
   * upload to unstable 

=== modified file 'control'
--- a/control	2011-01-26 20:50:13 +0000
+++ b/control	2011-02-11 11:04:44 +0000
@@ -1246,6 +1246,7 @@
 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)
 Description: office productivity suite -- arch-independent files
  This is a transitional package, replacing the OpenOffice.org packaging
  with the LibreOffice packaging.

=== modified file 'rules'
--- a/rules	2011-01-26 16:36:53 +0000
+++ b/rules	2011-02-11 11:04:44 +0000
@@ -28,6 +28,11 @@
 	cat debian/control.ooo >> debian/control
 	rm -f debian/control.ooo
 
+	# break transitional 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)#' debian/control
+
 	# got renamed in OOo 3.3
 	perl -pi -e 's#(Package:.*hi$$)#\1-in#' debian/control
 
@@ -35,6 +40,7 @@
 	# rm_conffiles office.sh while it's still the file libreoffice has
 	perl -pi -e 's#(Depends: libreoffice-common$$)#\1 \(>= 1:3.3.0~rc4-2\)#' debian/control
 
+
 .DELETE_ON_ERROR: debian/control
 
 build: control


Reply to: