monkey-bubble r239 - in trunk: . debian pixmaps

[herzi svn gnome org]

Author: herzi
Date: Fri Jan 11 22:45:13 2008
New Revision: 239
URL: http://svn.gnome.org/viewvc/monkey-bubble?rev=239&view=rev

Log:
2008-01-11  Sven Herzberg  <herzi gnome-de org>

	Dropped the old xpm and use the one from the debian folder now. This
	makes the tarball a little smaller and will result in less effort for
	debian packaging.

	* debian/monkey-bubble.xpm: moved into pixmaps
	* debian/rules: don't install the xpm file anymore, it's done
	automatically now
	* pixmaps/Makefile.am: install the .xpm into $(datadir)/monkey-bubble
	* pixmaps/monkey-bubble-icon.xpm: deleted the old, bad icon
	* pixmaps/monkey-bubble.xpm: moved from debian/


Added:
   trunk/pixmaps/monkey-bubble.xpm
      - copied, changed from r238, /trunk/debian/monkey-bubble.xpm
Removed:
   trunk/debian/monkey-bubble.xpm
   trunk/pixmaps/monkey-bubble-icon.xpm
Modified:
   trunk/ChangeLog
   trunk/debian/rules
   trunk/pixmaps/Makefile.am

Modified: trunk/debian/rules
==============================================================================
--- trunk/debian/rules	(original)
+++ trunk/debian/rules	Fri Jan 11 22:45:13 2008
@@ -10,9 +10,6 @@
 	/usr/bin/docbook-to-man debian/monkey-bubble.sgml > debian/monkey-bubble.1
 	/usr/bin/docbook-to-man debian/monkey-srv.sgml > debian/monkey-srv.1
 
-binary-post-install/monkey-bubble::
-	cp debian/monkey-bubble.xpm debian/monkey-bubble/usr/share/pixmaps
-
 clean::
 	rm -f debian/monkey-bubble.1
 	rm -f debian/monkey-srv.1

Modified: trunk/pixmaps/Makefile.am
==============================================================================
--- trunk/pixmaps/Makefile.am	(original)
+++ trunk/pixmaps/Makefile.am	Fri Jan 11 22:45:13 2008
@@ -18,6 +18,9 @@
 icondir=$(datadir)/icons/hicolor/32x32/apps
 icon_DATA=monkey-bubble.png
 
+pixmapsdir=$(datadir)/monkey-bubble
+pixmaps_DATA=monkey-bubble.xpm
+
 gtk_update_icon_cache=gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
 
 install-data-hook: update-icon-cache
@@ -31,5 +34,5 @@
 		echo "***   $(gtk_update_icon_cache)"; \
 	fi
 
-EXTRA_DIST = $(gfx_DATA) $(icon_DATA)
+EXTRA_DIST = $(gfx_DATA) $(icon_DATA) $(pixmaps_DATA)
 

Copied: trunk/pixmaps/monkey-bubble.xpm (from r238, /trunk/debian/monkey-bubble.xpm)
==============================================================================