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

./packages/openofficeorg/3.0/experimental r1310: merge from 2.4.1; fix icon install



------------------------------------------------------------
revno: 1310
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Tue 2008-11-18 00:13:59 +0100
message:
  merge from 2.4.1; fix icon install
modified:
  changelog
  control
  control.in
  control.postgresql.in
  rules
    ------------------------------------------------------------
    revno: 1022.1.191
    committer: Rene Engelhard <rene@debian.org>
    branch nick: debian
    timestamp: Mon 2008-11-17 21:53:58 +0100
    message:
      only suggest postgresql
    modified:
      changelog
      control
      control.postgresql.in
    ------------------------------------------------------------
    revno: 1022.1.192
    committer: Rene Engelhard <rene@debian.org>
    branch nick: debian
    timestamp: Mon 2008-11-17 22:31:12 +0100
    message:
      don't add | java2-runtime to JAVA_RUNTIME_DEPENDS as we don't work with cacao-oj6
    modified:
      changelog
      rules
    ------------------------------------------------------------
    revno: 1022.1.193
    committer: Rene Engelhard <rene@debian.org>
    branch nick: debian
    timestamp: Mon 2008-11-17 22:37:40 +0100
    message:
      onflict against cacao-oj6-jre
    modified:
      changelog
      control
      control.in
=== modified file 'changelog'
--- a/changelog	2008-11-13 11:05:02 +0000
+++ b/changelog	2008-11-17 23:13:59 +0000
@@ -8,12 +8,21 @@
     - src: update GSIs from ftp.linux.cz
   * debian/rules:
     - update ENABLE_GIO conditional, either we want gio or gnome-vfs
-    - install extension.desktop again (to /usr/share/mimelnk) and install
-      icon from it from ooo-build (though nautilus doesn't (yet) recognize it)
+    - install extension.desktop again (to
+      /usr/share/mimelnk/application/vnd.openofficeorg.extension.desktop) and
+      install icons for it from ooo-build (though nautilus/KDE4 doesn't
+      recognize it)
+    - don't add | java2-runtime to JAVA_RUNTIME_DEPENDS as we don't work
+      with cacao-oj6 
   * debian/startcenter.desktop.in:
-    - MimeType=application/vnd.openoffice.org.extension (closes: #502737)
+    - MimeType=application/vnd.openoffice.org.extension so that at leat
+      Mozilla and KDE3 know what to do with oxts (closes: #502737)
+  * debian/control.postgresql.in:
+    - only suggest postgresql
+  * debian/control.in:
+    - conflict against cacao-oj6-jre (closes: #495694)
 
- -- Rene Engelhard <rene@debian.org>  Wed, 12 Nov 2008 01:21:49 +0100
+ -- Rene Engelhard <rene@debian.org>  Mon, 17 Nov 2008 22:03:38 +0100
 
 openoffice.org (1:3.0.0-4) experimental; urgency=low
 

=== modified file 'control'
--- a/control	2008-11-12 07:18:18 +0000
+++ b/control	2008-11-17 23:13:59 +0000
@@ -102,7 +102,7 @@
 Package: openoffice.org-core
 Architecture: i386 powerpc sparc mips mipsel armel s390 m68k amd64 ia64 ppc64
 Depends: openoffice.org-common (>> ${base-version}), ttf-opensymbol, ${shlibs:Depends}, fontconfig, ${mozilla-nss-depends}
-Conflicts: openoffice.org-thesaurus, openoffice.org-unbundled, openoffice.org-l10n-1.9.108, openoffice.org-l10n-1.9.114, openoffice.org-l10n-1.9.121, openoffice.org-1.9.125, oooqs-kde, ooqstart-gnome, openoffice.org-help-de (<< 2.0), openoffice.org-help-en (<< 2.0), openoffice.org-help-el (<< 2.0), openoffice.org-help-es (<< 2.0), openoffice.org-help-fr (<< 2.0), openoffice.org-help-it (<< 2.0), openoffice.org-help-ja (<< 2.0), openoffice.org-help-ko (<< 2.0), openoffice.org-help-pt-br (<< 2.0), openoffice.org-help-sv (<< 2.0), openoffice.org-help-tr (<< 2.0), openoffice.org-help-zh-cn (<< 2.0), openoffice.org-help-zh-tw (<< 2.0), openoffice.org-help-2.0.0, openoffice.org-help-2.0.1, openoffice.org-help-2.0.2, openoffice.org-help-2.0.3, openoffice.org-bin, openoffice.org2-core, openoffice.org-crashrep, openoffice.org2-hunspell, openoffice.org-hunspell, openoffice.org-calc (<< ${Source-Version}), openoffice.org-writer (<< ${Source-Version}), openoffice.org-impress (<< ${Source-Version}), openoffice.org-draw (<< ${Source-Version}), openoffice.org-base (<< ${Source-Version}), openoffice.org-gtk (<< ${Source-Version}), openoffice.org-gnome (<< ${Source-Version}), openoffice.org-kde (<< ${Source-Version}), openoffice.org-evolution (<< ${Source-Version}), openoffice.org-filter-so52 (<< ${Source-Version}), openoffice.org-officebean (<< ${Source-Version}), openoffice.org-dev (<< ${Source-Version}), libcairo2 (= 1.4.8-1), libicu38 (= 3.8~d01-1), cli-uno-bridge (<< 1:3.0.0~dev300m22), openoffice.org-qa-ui-tests (<< ${base-version}), openoffice.org-qa-ui-tests (>= ${base-version}.1)
+Conflicts: openoffice.org-thesaurus, openoffice.org-unbundled, openoffice.org-l10n-1.9.108, openoffice.org-l10n-1.9.114, openoffice.org-l10n-1.9.121, openoffice.org-1.9.125, oooqs-kde, ooqstart-gnome, openoffice.org-help-de (<< 2.0), openoffice.org-help-en (<< 2.0), openoffice.org-help-el (<< 2.0), openoffice.org-help-es (<< 2.0), openoffice.org-help-fr (<< 2.0), openoffice.org-help-it (<< 2.0), openoffice.org-help-ja (<< 2.0), openoffice.org-help-ko (<< 2.0), openoffice.org-help-pt-br (<< 2.0), openoffice.org-help-sv (<< 2.0), openoffice.org-help-tr (<< 2.0), openoffice.org-help-zh-cn (<< 2.0), openoffice.org-help-zh-tw (<< 2.0), openoffice.org-help-2.0.0, openoffice.org-help-2.0.1, openoffice.org-help-2.0.2, openoffice.org-help-2.0.3, openoffice.org-bin, openoffice.org2-core, openoffice.org-crashrep, openoffice.org2-hunspell, openoffice.org-hunspell, openoffice.org-calc (<< ${Source-Version}), openoffice.org-writer (<< ${Source-Version}), openoffice.org-impress (<< ${Source-Version}), openoffice.org-draw (<< ${Source-Version}), openoffice.org-base (<< ${Source-Version}), openoffice.org-gtk (<< ${Source-Version}), openoffice.org-gnome (<< ${Source-Version}), openoffice.org-kde (<< ${Source-Version}), openoffice.org-evolution (<< ${Source-Version}), openoffice.org-filter-so52 (<< ${Source-Version}), openoffice.org-officebean (<< ${Source-Version}), openoffice.org-dev (<< ${Source-Version}), libcairo2 (= 1.4.8-1), libicu38 (= 3.8~d01-1), cli-uno-bridge (<< 1:3.0.0~dev300m22), openoffice.org-qa-ui-tests (<< ${base-version}), openoffice.org-qa-ui-tests (>= ${base-version}.1), cacao-oj6-jre
 Provides: openoffice.org-bundled, openoffice.org2-core, openoffice.org-java, openoffice.org2-hunspell, openoffice.org-hunspell
 Replaces: openoffice.org-bin, openoffice.org (<< 1.9), openoffice.org-gtk (<< 2.0.3+2.0.4m179), openoffice.org2-core, openoffice.org-java, openoffice.org2-hunspell, openoffice.org-hunspell, openoffice.org-common (<< 1:2.3.1), openoffice.org-calc (<< 2.2.1~oof680m15-2), openoffice.org-headless (<< 1:3.0.0~dev300m26)
 Description: OpenOffice.org office suite architecture dependent files
@@ -3393,7 +3393,7 @@
 Architecture: i386 powerpc sparc mips mipsel armel s390 m68k amd64 ia64 ppc64
 Depends: ${shlibs:Depends}, openoffice.org-core (>> 1:2.3.0~oog680m1)
 Conflicts: openoffice.org-java-common (<< 2.3.0~src680m212), openoffice.org-gcj (<< 2.3.0~src680m212)
-Recommends: postgresql
+Suggest: postgresql
 Description: PostgreSQL SDBC driver for OpenOffice.org
  OpenOffice.org is a full-featured office productivity suite that provides
  a near drop-in replacement for Microsoft(R) Office.

=== modified file 'control.in'
--- a/control.in	2008-11-02 21:35:54 +0000
+++ b/control.in	2008-11-17 23:13:59 +0000
@@ -230,7 +230,8 @@
  libicu38 (= 3.8~d01-1),
  cli-uno-bridge (<< 1:3.0.0~dev300m22),
  openoffice.org-qa-ui-tests (<< ${base-version}),
- openoffice.org-qa-ui-tests (>= ${base-version}.1)
+ openoffice.org-qa-ui-tests (>= ${base-version}.1),
+ cacao-oj6-jre
 Provides: openoffice.orgVER-bundled, 
  openoffice.org2-core,
  openoffice.org-java,

=== modified file 'control.postgresql.in'
--- a/control.postgresql.in	2008-02-08 13:40:45 +0000
+++ b/control.postgresql.in	2008-11-17 20:53:58 +0000
@@ -4,7 +4,7 @@
 Architecture: %OOO_ARCHS%
 Depends: ${shlibs:Depends}, openoffice.orgVER-core (>> 1:2.3.0~oog680m1)
 Conflicts: openoffice.orgVER-java-common (<< 2.3.0~src680m212), openoffice.orgVER-gcj (<< 2.3.0~src680m212)
-Recommends: postgresql
+Suggest: postgresql
 Description: PostgreSQL SDBC driver for OpenOffice.org
  OpenOffice.org is a full-featured office productivity suite that provides
  a near drop-in replacement for Microsoft(R) Office.

=== modified file 'rules'
--- a/rules	2008-11-12 07:16:10 +0000
+++ b/rules	2008-11-17 23:13:59 +0000
@@ -579,7 +579,6 @@
   ifneq (,$(filter $(ARCH), amd64 i386))
 	JAVA_RUNTIME_DEPENDS += | sun-java5-jre | sun-java6-jre
   endif
-	JAVA_RUNTIME_DEPENDS += | java5-runtime
 	GCJ_JAWT_DIR=$(shell dirname `dpkg -L $(GCJ_JAWT_DEPENDS) | grep libjawt.so`)
 export JAVA_HOME
 	CONFIGURE_FLAGS += --with-jdk-home=$(JAVA_HOME)
@@ -2961,15 +2960,15 @@
 	# menu files from sysui
 	dirname="`cd $(SOURCE_TREE)/sysui/$(shell . $(SOURCE_TREE)/*.sh; echo $$OUTPATH$$PROEXT)/misc/openoffice.org >/dev/null; pwd`" ;\
 	mkdir -p -m755 $(PKGDIR)-common/usr/share/mimelnk/application ;\
-	sed -e 's,Name=$${PRODUCTNAME} $${PRODUCTVERSION},Name=OpenOffice.org $(VER),' \
+	sed -e 's,Comment=Extension,Comment=OpenOffice.org $(VER) Extension,' \
 	    -e 's/  / /' \
 	    < $$dirname/extension.desktop \
 	    > $(PKGDIR)-common/usr/share/mimelnk/application/vnd.openofficeorg.extension.desktop || exit 1
 	for i in 16x16 22x22 24x24 32x32 48x48; do \
 		install -D -m644 $(CURDIR)/ooo-build/desktop/mimetypes/$$i/application-vnd.openofficeorg.extension.png \
-			$(PKGDIR)-common/usr/share/icons/gnome/mimetypes/$$i/application-vnd.openofficeorg.extension.png; \
+			$(PKGDIR)-common/usr/share/icons/hicolor/$$i/mimetypes/$$i/application-vnd.openofficeorg.extension.png; \
 	done
-	perl -pi -e 's/Icon=openoffice.org$(VER)-extension/Icon=application-vnd.openofficeorg.extension.png/' $(PKGDIR)-common/usr/share/mimelnk/application/vnd.openofficeorg.extension.desktop
+	perl -pi -e "s/Icon=openofficeorg3.*-extension/Icon=application-vnd.openofficeorg.extension.png/" $(PKGDIR)-common/usr/share/mimelnk/application/vnd.openofficeorg.extension.desktop
 endif
 
 	# fix permission


Reply to: