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

r900 ./packages/openofficeorg/2.3/experimental: fix ooo-extension.desktop fixing



------------------------------------------------------------
revno: 900
committer: Rene Engelhard <rene@debian.org>
branch nick: experimental
timestamp: Mon 2007-10-01 15:51:47 +0200
message:
  fix ooo-extension.desktop fixing
modified:
  changelog
  rules
=== modified file 'changelog'
--- a/changelog	2007-09-27 11:19:44 +0000
+++ b/changelog	2007-10-01 13:51:47 +0000
@@ -1,7 +1,7 @@
 openoffice.org (1:2.3.0-1.2pre) experimental; urgency=low
 
   * ooo-build:
-    - update (r10345/OOO_BUILD_2_3_0_2)
+    - update (r10366)
 
   [ Rene Engelhard ]
   * debian/rules:
@@ -10,6 +10,7 @@
     - migrate from num-cpus= to parallel= in DEB_BUILD_OPTIONS, the latter
       is the quasi standard and will also be used by -j of the new
       dpkg-buildpackage
+    - fix ooo-extension.desktop fixing
   * debian/control.in:
     - make -report-builder depend on -java-common (>= 1:2.3.0~oog680m1) as
       that apparently is needed
@@ -25,7 +26,7 @@
   * debian/control.mono.in:
     - enhanced package description
 
- -- Rene Engelhard <rene@debian.org>  Thu, 27 Sep 2007 13:15:44 +0200
+ -- Rene Engelhard <rene@debian.org>  Mon, 01 Oct 2007 15:50:44 +0200
 
 openoffice.org (1:2.3.0-1) experimental; urgency=low
 

=== modified file 'rules'
--- a/rules	2007-09-25 09:37:40 +0000
+++ b/rules	2007-10-01 13:51:47 +0000
@@ -1793,7 +1793,8 @@
 	sed -i -e 's/Office;/Office;System;/' $(PKGDIR)-common/usr/share/applications/ooo$(VER)-extension.desktop
 	# invalid, according to lintian. make it shut up.
 	for i in writer calc impress draw math base extension; do \
-		perl -pi -e 's/Application;//; s/X-Red-Hat-Base;//; s/X-SuSE-Core-Office;//; s/X-MandrivaLinux-.*;//;' $(PKGDIR)-$$i/usr/share/applications/ooo$(VER)-$$i.desktop; \
+		if [ "$$i" = "extension" ]; then p=common; else p=$$i; done; \
+		perl -pi -e 's/Application;//; s/X-Red-Hat-Base;//; s/X-SuSE-Core-Office;//; s/X-MandrivaLinux-.*;//;' $(PKGDIR)-$$p/usr/share/applications/ooo$(VER)-$$i.desktop; \
 	done
 	perl -pi -e 's/Application;//' $(PKGDIR)-gtk/$(OODIR)/share/xdg/qstart.desktop
 else


Reply to: