On Fri, Dec 26, 2003 at 04:11:13AM -0800, Bill Kendrick wrote:
> Sorry about that. Originally, there was neither. Then I discovered that
> KDE had an easy way of telling me where to put icons, rather than me having
> to guess, so I used it.
>
> If you can suggest a good way of breaking out the gnome icons part, please
> do and I'll update the Makefile.
I have a patch (attached), but it's not perfect for my packaging needs.
The trouble is, if GNOME_PREFIX is /usr, then tuxpaint.png gets installed in
/usr/share/pixmaps/, but install-icons also installs tuxpaint.png to the
same location. This is actually a problem with the original Makefile, not
my patch. If you build install-icons and install-gnome-icons in the same
.deb, that's not a problem. But the trouble is, I have split the "extra"
(GNOME, KDE) icons into the -data package, but kept the "core" icons in the
arch-specific tuxpaint package because they are needed for the Debian menu
system entry for tuxpaint. So I end up with the same file in two different
debs, which is not allowed.
I "fix" this in my debian/rules by simply removing the extra tuxpaint.png
from tuxpaint-data after doing the make, but it is rather inelegant. I
can't think of a better solution, though. The trouble is, a user may wish
to build either target, and in each case the icon is needed. Simply
checking for the existence of the icon first and not installing if it's
already installed doesn't work, as in my case I'm building into two
different build trees anyway (not to mention the problem this would cause
for updating the icon with a new version).
So I guess the patch is good enough, and I'll just have to live with my
workaround.
Ben
--
,-. nSLUG http://www.nslug.ns.ca [EMAIL PROTECTED]
\`' Debian http://www.debian.org [EMAIL PROTECTED]
` [ gpg 395C F3A4 35D3 D247 1387 2D9E 5A94 F3CA 0B27 13C8 ]
[ pgp 7F DA 09 4B BA 2C 0D E0 1B B1 31 ED C6 A9 39 4F ]
--- tuxpaint-0.9.13.orig/Makefile
+++ tuxpaint-0.9.13/Makefile
@@ -129,7 +129,8 @@
# to do this as superuser ("root"))
install: install-bin install-data install-man install-doc \
- install-gnome install-kde install-kde-icons \
+ install-gnome install-gnome-icons \
+ install-kde install-kde-icons \
install-icon install-gettext install-importscript \
install-default-config install-example-stamps
@echo
@@ -268,9 +269,6 @@
@echo
@echo "...Installing launcher icon into GNOME..."
@if [ "x$(GNOME_PREFIX)" != "x" ]; then \
- install -d $(GNOME_PREFIX)/share/pixmaps; \
- cp data/images/icon.png $(GNOME_PREFIX)/share/pixmaps/tuxpaint.png; \
- chmod 644 $(GNOME_PREFIX)/share/pixmaps/tuxpaint.png; \
install -d $(GNOME_PREFIX)/share/gnome/apps/Graphics; \
cp src/tuxpaint.desktop $(GNOME_PREFIX)/share/gnome/apps/Graphics/; \
chmod 644 $(GNOME_PREFIX)/share/gnome/apps/Graphics/tuxpaint.desktop; \
@@ -278,6 +276,17 @@
make install-gnome GNOME_PREFIX=/usr; \
fi
+install-gnome-icons:
+ @echo
+ @echo "...Installing launcher icon graphics into GNOME..."
+ @if [ "x$(GNOME_PREFIX)" != "x" ]; then \
+ install -d $(GNOME_PREFIX)/share/pixmaps; \
+ cp data/images/icon.png $(GNOME_PREFIX)/share/pixmaps/tuxpaint.png; \
+ chmod 644 $(GNOME_PREFIX)/share/pixmaps/tuxpaint.png; \
+ else \
+ make install-gnome-icons GNOME_PREFIX=/usr; \
+ fi
+
# Install a launcher icon in the KDE menu...
