CVS:oo-deb/debian changelog,1.417.2.7,1.417.2.8 rules,1.253.2.1,1.253.2.2

[Rene Engelhard <rene@gluck.debian.org>]

Update of /cvs/debian-openoffice/oo-deb/debian
In directory gluck:/tmp/cvs-serv15761/debian

Modified Files:
      Tag: OPENOFFICE_ORG_1_1_4
	changelog rules 
Log Message:
    - install and make the GNOME/KDE menus use
      ximian-openoffice-{calc,writer,draw,impress,math,template,web}
      as icons (closes: #294634) and move the oopadmin entry from Office to
      System [RE]


Index: changelog
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/changelog,v
retrieving revision 1.417.2.7
retrieving revision 1.417.2.8
diff -u -d -r1.417.2.7 -r1.417.2.8
--- changelog	2 Feb 2005 17:24:59 -0000	1.417.2.7
+++ changelog	16 Feb 2005 18:23:39 -0000	1.417.2.8
@@ -23,13 +23,17 @@
     - link to README.Debian.gz in /usr/share/doc/openoffice.org (provided
       by openoffice.org-debian-files) from -kde and -gtk-gnome (it contains
       the info that the fpickers are disabled by default) [RE]
+    - install and make the GNOME/KDE menus use
+      ximian-openoffice-{calc,writer,draw,impress,math,template,web}
+      as icons (closes: #294634) and move the oopadmin entry from Office to
+      System [RE]
   * debian/ttf-opensymbol.postrm.in:
     - use rm -f for trying to remove fonts.cache* (closes: #288515) [RE]
   * debian/scripts/vars: update [RE]
   * debian/MANIFEST.*: update [RE]
   * debian/openoffice.org.install: update [RE]
 
- -- Rene Engelhard <rene@debian.org>  Wed,  2 Feb 2005 17:33:14 +0100
+ -- Rene Engelhard <rene@debian.org>  Wed, 16 Feb 2005 19:19:18 +0100
 
 openoffice.org (1.1.3-4) unstable; urgency=low
 

Index: rules
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/rules,v
retrieving revision 1.253.2.1
retrieving revision 1.253.2.2
diff -u -d -r1.253.2.1 -r1.253.2.2
--- rules	31 Jan 2005 22:28:11 -0000	1.253.2.1
+++ rules	16 Feb 2005 18:23:39 -0000	1.253.2.2
@@ -353,7 +353,7 @@
 	fi
 
 	# we do not need them and they make problem with dpkg-source....
-	rm -f $(OOO_BUILD)/desktop/*.png $(OOO_BUILD)/www/*.png \
+	rm -f $(OOO_BUILD)/www/*.png \
 		$(OOO_BUILD)/www/images/*.png $(OOO_BUILD)/templates/*.s* \
 		$(OOO_BUILD)/www/l10n/*.gif \
 		$(OOO_BUILD)/src/open*bmp $(OOO_BUILD)/src/file-bug-*.bmp
@@ -437,7 +437,19 @@
           touch -r $(OOO_BUILD)/fonts/opens___.ttf.uu $(OOO_BUILD)/fonts/opens___.ttf ;\
 	fi
 	rm -f $(OOO_BUILD)/fonts/opens___.ttf $(OOO_BUILD)/fonts/symbols.xls
-	
+
+	# uuencode Ximian desktop icons
+	for i in calc draw impress math template web writer; do \
+	  if [ -s $(OOO_BUILD)/desktop/ximian-openoffice-$$i.png ]; then \
+	    uuencode $(OOO_BUILD)/desktop/ximian-openoffice-$$i.png \
+		ximian-openoffice-$$i.png \
+		>> $(OOO_BUILD)/desktop/ximian-openoffice-$$i.png.uu &&\
+	    touch -r $(OOO_BUILD)/desktop/ximian-openoffice-$$i.png.uu \
+		$(OOO_BUILD)/desktop/ximian-openoffice-$$i.png ;\
+	  fi; \
+	done
+	rm -f $(OOO_BUILD)/desktop/*.png
+
 	dh_clean
 
 	rm -rf $(STAMP_DIR) $(DEBTREEDIR) stlport-home
@@ -583,6 +595,16 @@
 	  touch -r $(OOO_BUILD)/fonts/opens___.ttf $(OOO_BUILD)/fonts/opens___.ttf.uu ;\
 	fi
 
+	# uuencode Ximian desktop icons
+	for i in calc draw impress math template web writer; do \
+	  if [ ! -s $(OOO_BUILD)/desktop/ximian-openoffice-$$i.png ]; then \
+	    uudecode -o $(OOO_BUILD)/desktop/ximian-openoffice-$$i.png \
+		$(OOO_BUILD)/desktop/ximian-openoffice-$$i.png.uu ;\
+	    touch -r $(OOO_BUILD)/desktop/ximian-openoffice-$$i.png.uu \
+		$(OOO_BUILD)/desktop/ximian-openoffice-$$i.png ;\
+	  fi; \
+	done
+
 	# uudecode libwpd snapshot
 	if [ ! -s $(SOURCE_TREE)/libwpd/download/$(LIBWPD_VER).tar.gz ]; then \
 	  uudecode -o $(SOURCE_TREE)/libwpd/download/$(LIBWPD_VER).tar.gz \
@@ -1164,11 +1186,16 @@
 	        -e 's,Exec="\?/.*/usr/lib/openoffice$(VER)/program/s\?\([^"]*\)"\?,Exec=/usr/bin/oo\1$(VER),' \
 		-e 's,/oooffice ,/ooffice ,' \
 		-e 's,Icon=.*/\([^/]*\.png\),Icon=\1,' \
+		-e 's,Icon=ooo_\([cwdimt].*\),Icon=ximian-openoffice-\1,' \
 		-e 's,\.png,,' \
 	        < "$$I" > "$$I.new" ;\
 	    rm "$$I"; mv "$$I.new" "$$I" ;\
 	done
 
+	# move Printeradmin into Application;System;
+	perl -pi -e 's/Application;Office/Application;System/' \
+	 $(MAINPKGDIR)/usr/share/applications/ooo$(BUILDNUM)printeradmin.desktop
+
 	# insert NoDisplay=true to force the extra dir not being displayed
 	# on KDE 3.2
 	echo "NoDisplay=true" >> \
@@ -1205,6 +1232,9 @@
 	mkdir -p debian/ttf-opensymbol/usr/share/fonts/truetype/openoffice
 	install -m644 $(OOO_BUILD)/fonts/opens___.ttf \
 		debian/ttf-opensymbol/usr/share/fonts/truetype/openoffice
+
+	cp $(OOO_BUILD)/desktop/*.png \
+		$(MAINPKGDIR)/usr/share/icons/hicolor/48x48/apps
 
 	touch $@