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

./packages/openofficeorg/3.0/experimental r1155: update for upcoming m3; new extension ids



------------------------------------------------------------
revno: 1155
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Sun 2008-07-06 23:37:15 +0200
message:
  update for upcoming m3; new extension ids
renamed:
  openoffice.org-presenter-screen.postinst.in => openoffice.org-presenter-console.postinst.in
  openoffice.org-presenter-screen.preinst.in => openoffice.org-presenter-console.preinst.in
  openoffice.org-presenter-screen.prerm.in => openoffice.org-presenter-console.prerm.in
  openoffice.org-presenter-screen.script.bug.in => openoffice.org-presenter-console.script.bug.in
modified:
  changelog
  control.presenter.in
  openoffice.org-presentation-minimizer.preinst.in
  openoffice.org-presentation-minimizer.script.bug.in
  openoffice.org-wiki-publisher.preinst.in
  openoffice.org-wiki-publisher.script.bug.in
  openoffice.org-presenter-console.script.bug.in
=== modified file 'changelog'
--- a/changelog	2008-07-06 21:28:19 +0000
+++ b/changelog	2008-07-06 21:37:15 +0000
@@ -1,6 +1,6 @@
-openoffice.org (1:3.0.0~beta2~beb300m2-0.1pre) experimental; urgency=low
+openoffice.org (1:3.0.0~beta3~beb300m3-0.1pre) experimental; urgency=low
 
-  * OpenOffice 3.0.0 beta2 milestone 2 (BEB300_m2)
+  * OpenOffice 3.0.0 beta2 milestone 3 (BEB300_m3)
     - Base now doesn't quit anymore on "recently used files" in the wizard
       when those got deleted/moved (closes: #452810)
     - now properly complains about missing permissions when trying to write
@@ -46,7 +46,7 @@
     debian/control.{minimizer,presenter,mediawiki}.in,
     debian/openoffice.org*.{preinst,prerm,postinst}.in,
     debian/openoffice.org*.{script.bug}:
-    - package the new Presenter Screen, Wiki Publisher and PDF Import 
+    - package the new Presenter Console, Wiki Publisher and PDF Import 
       extensions 
     - update/add Presentation Minimizer conditionals
   * debian/broffice.org.{preinst,postrm}.in,
@@ -59,6 +59,7 @@
   * debian/control.in:
     - s/cupsys/cups/
     - remove xutils build-dep, nas was using xmkmf and it's long gone here
+  * debian/openoffice.org-presentation-minmizer*: update for new ID
 
  -- Rene Engelhard <rene@debian.org>  Sun, 06 Jul 2008 23:18:26 +0200
 

=== modified file 'control.presenter.in'
--- a/control.presenter.in	2008-05-21 19:50:32 +0000
+++ b/control.presenter.in	2008-07-06 21:37:15 +0000
@@ -1,7 +1,10 @@
-Package: openoffice.orgVER-presenter-screen
+Package: openoffice.orgVER-presenter-console
 Section: misc
 Priority: optional
 Architecture: %OOO_ARCHS%
+Conflicts: openoffice.orgVER-presenter-screen
+Provides: openoffice.orgVER-presenter-screen
+Replaces: openoffice.orgVER-presenter-screen
 Depends: ${shlibs:Depends}, openoffice.orgVER-core (>= 1:3.0.0~bea300~dev300m6), openoffice.orgVER-impress (>= 1:3.0.0~bea300~dev300m6)
 Enhances: openoffice.orgVER-impress
 Description: OpenOffice.org Presenter Console extension

=== modified file 'openoffice.org-presentation-minimizer.preinst.in'
--- a/openoffice.org-presentation-minimizer.preinst.in	2007-10-12 13:13:52 +0000
+++ b/openoffice.org-presentation-minimizer.preinst.in	2008-07-06 21:37:15 +0000
@@ -11,8 +11,12 @@
 
 case "$1" in
 	upgrade)
-		# this is a legacy package, so we need to find it first...
-		id=`/usr/lib/openoffice/program/unopkg list --shared | grep Identifier:.*presentation-minimizer | cut -d":" -f2`
+		if dpkg --compare-versions $1 lt 1:3.0.0~dev300m24; then
+			# this is a legacy package, so we need to find it first...
+			id=`/usr/lib/openoffice/program/unopkg list --shared | grep Identifier:.*presentation-minimizer | cut -d":" -f2`
+		else
+			id=com.sun.star.PresentationMinimizer-$PLATFORMID
+		fi
 		remove_extension $id
 	;;
 esac

=== modified file 'openoffice.org-presentation-minimizer.script.bug.in'
--- a/openoffice.org-presentation-minimizer.script.bug.in	2008-07-02 11:22:15 +0000
+++ b/openoffice.org-presentation-minimizer.script.bug.in	2008-07-06 21:37:15 +0000
@@ -1,2 +1,2 @@
 #!/bin/sh
-/usr/lib/openoffice/program/unopkg list --shared org.openoffice.legacy.sun-presentation-minimizer.oxt >&3
+/usr/lib/openoffice/program/unopkg list --shared com.sun.star.PresentationMinimizer-@PLATFORMID@ >&3

=== renamed file 'openoffice.org-presenter-screen.postinst.in' => 'openoffice.org-presenter-console.postinst.in'
=== renamed file 'openoffice.org-presenter-screen.preinst.in' => 'openoffice.org-presenter-console.preinst.in'
=== renamed file 'openoffice.org-presenter-screen.prerm.in' => 'openoffice.org-presenter-console.prerm.in'
=== renamed file 'openoffice.org-presenter-screen.script.bug.in' => 'openoffice.org-presenter-console.script.bug.in'
--- a/openoffice.org-presenter-screen.script.bug.in	2008-07-02 11:22:15 +0000
+++ b/openoffice.org-presenter-console.script.bug.in	2008-07-06 21:37:15 +0000
@@ -1,2 +1,2 @@
 #!/bin/sh
-/usr/lib/openoffice/program/unopkg list --shared com.sun.PresenterScreen-@PLATFORMID@ >&3
+/usr/lib/openoffice/program/unopkg list --shared com.sun.star.PresenterConsole-@PLATFORMID@ >&3

=== modified file 'openoffice.org-wiki-publisher.preinst.in'
--- a/openoffice.org-wiki-publisher.preinst.in	2008-04-03 21:18:38 +0000
+++ b/openoffice.org-wiki-publisher.preinst.in	2008-07-06 21:37:15 +0000
@@ -11,7 +11,11 @@
 
 case "$1" in
 	upgrade)
-		remove_extension com.sun.wiki-publisher
+		if dpkg --compare-versions $1 lt 1:3.0.0~dev300m24; then
+			remove_extension com.sun.wiki-publisher
+		else
+			remove_extension com.sun.star.WikiPublisher
+		fi
 	;;
 esac
 

=== modified file 'openoffice.org-wiki-publisher.script.bug.in'
--- a/openoffice.org-wiki-publisher.script.bug.in	2008-07-02 11:22:15 +0000
+++ b/openoffice.org-wiki-publisher.script.bug.in	2008-07-06 21:37:15 +0000
@@ -1,2 +1,2 @@
 #!/bin/sh
-/usr/lib/openoffice/program/unopkg list --shared com.sun.wiki-publisher >&3
+/usr/lib/openoffice/program/unopkg list --shared com.sun.star.WikiPublisher >&3


Reply to: