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

./packages/openofficeorg/3.1/experimental r1349: sysui36 adds startcenter.desktop upstream



------------------------------------------------------------
revno: 1349
committer: Rene Engelhard <rene@debian.org>
branch nick: experimental
timestamp: Fri 2008-12-12 23:17:14 +0100
message:
  sysui36 adds startcenter.desktop upstream
removed:
  startcenter.desktop.in
modified:
  changelog
  rules
=== modified file 'changelog'
--- a/changelog	2008-12-12 22:04:20 +0000
+++ b/changelog	2008-12-12 22:17:14 +0000
@@ -14,6 +14,8 @@
       we have OOos patches included
     - update xulrunner build-dep in MOZILLA=libxul case for current reality
     - various 3.1-related updates
+  * debian/rules, debian/startcenter.desktop: remove own startcenter.desktop;
+    OOo now has one upstream
 
  -- Rene Engelhard <rene@debian.org>  Sun, 07 Dec 2008 19:40:24 +0100
 

=== modified file 'rules'
--- a/rules	2008-12-11 15:16:44 +0000
+++ b/rules	2008-12-12 22:17:14 +0000
@@ -2157,7 +2157,7 @@
 ifeq "$(USE_OOO_BUILD_DESKTOPS)" "n"
 	# menu files from sysui
 	dirname="`cd $(SOURCE_TREE)/sysui/$(shell . $(SOURCE_TREE)/*.sh; echo $$OUTPATH$$PROEXT)/misc/desktopshare >/dev/null; pwd`" ;\
-	for p in writer calc impress draw math base; do \
+	for p in writer calc impress draw math base startcenter; do \
 		mkdir -p -m755 $(PKGDIR)-$$p/usr/share/applications ;\
 		sed -e 's,Exec=$${UNIXPRODUCTNAME}$${PRODUCTVERSION} \(.*\) %U,Exec=ooffice$(VER) \1 %U,' \
 		    -e 's,Icon=$${WITHOUTDOTUNIXPRODUCTNAME}[0123456789]\+,Icon=ooo,' \
@@ -2626,8 +2626,6 @@
 		$(PKGDIR)-common/usr/share/mime/packages
 
 	mkdir -p $(PKGDIR)-common/usr/share/applications
-	sed 's/@VER@/$(VER)/g' debian/startcenter.desktop.in \
-		> $(PKGDIR)-common/usr/share/applications/ooo-startcenter.desktop
 
 	# install openoffice-xlate-lang
 	install -d -m755 $(PKGDIR)-common/usr/share/$(OODIRNAME)/bin
@@ -2970,6 +2968,7 @@
 			$(PKGDIR)-common/usr/share/icons/hicolor/$$i/mimetypes/application-vnd.openofficeorg.extension.png; \
 	done
 	perl -pi -e "s/Icon=openofficeorg.*-extension/Icon=application-vnd.openofficeorg.extension.png/" $(PKGDIR)-common/usr/share/mimelnk/application/vnd.openofficeorg.extension.desktop
+	perl -pi -e 's,MimeType=,MimeType=application/vnd.openofficeorg.extension,' $(PKGDIR)-common/usr/share/applications/ooo-startcenter.desktop
 endif
 
 	# fix permission

=== removed file 'startcenter.desktop.in'
--- a/startcenter.desktop.in	2008-11-12 07:16:10 +0000
+++ b/startcenter.desktop.in	1970-01-01 00:00:00 +0000
@@ -1,12 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=OpenOffice.org@VER@
-Comment=OpenOffice.org
-TryExec=ooffice@VER@
-Exec=ooffice@VER@ %U
-Icon=ooo-writer.png
-Terminal=false
-Type=Application
-Categories=Office
-StartupNotify=true
-MimeType=application/vnd.openofficeorg.extension


Reply to: