Revision: 1536
http://gtkpod.svn.sourceforge.net/gtkpod/?rev=1536&view=rev
Author: tmzullinger
Date: 2007-06-08 20:51:23 -0700 (Fri, 08 Jun 2007)
Log Message:
-----------
Add a .desktop file and reorganize the icons.
Modified Paths:
--------------
gtkpod/trunk/ChangeLog_detailed
gtkpod/trunk/Makefile.am
gtkpod/trunk/autogen.sh
gtkpod/trunk/configure.in
gtkpod/trunk/data/Makefile.am
gtkpod/trunk/po/POTFILES.in
Added Paths:
-----------
gtkpod/trunk/data/gtkpod.desktop.in
gtkpod/trunk/data/icons/
gtkpod/trunk/data/icons/32x32/
gtkpod/trunk/data/icons/32x32/Makefile.am
gtkpod/trunk/data/icons/48x48/
gtkpod/trunk/data/icons/48x48/Makefile.am
gtkpod/trunk/data/icons/64x64/
gtkpod/trunk/data/icons/64x64/Makefile.am
gtkpod/trunk/data/icons/Makefile.am
Modified: gtkpod/trunk/ChangeLog_detailed
===================================================================
--- gtkpod/trunk/ChangeLog_detailed 2007-06-09 00:58:05 UTC (rev 1535)
+++ gtkpod/trunk/ChangeLog_detailed 2007-06-09 03:51:23 UTC (rev 1536)
@@ -23,6 +23,22 @@
po/POTFILES.skip:
Fixup 'make distcheck' and add some files missing for i18n.
+ * configure.in
+ Makefile.am
+ data/gtkpod.desktop.in
+ data/Makefile.am
+ data/icons
+ data/icons/48x48
+ data/icons/48x48/Makefile.am
+ data/icons/32x32
+ data/icons/32x32/Makefile.am
+ data/icons/Makefile.am
+ data/icons/64x64
+ data/icons/64x64/Makefile.am
+ autogen.sh
+ po/POTFILES.in:
+ Add a .desktop file and reorganize the icons.
+
2007-06-05 P.G. Richardson <phantom_sf at users.sourceforge.net>
* src/fetchcover.c
Modified: gtkpod/trunk/Makefile.am
===================================================================
--- gtkpod/trunk/Makefile.am 2007-06-09 00:58:05 UTC (rev 1535)
+++ gtkpod/trunk/Makefile.am 2007-06-09 03:51:23 UTC (rev 1536)
@@ -2,11 +2,19 @@
SUBDIRS = src po scripts data
-EXTRA_DIST = \
- autogen.sh \
- TROUBLESHOOTING \
+EXTRA_DIST = \
+ autogen.sh \
+ intltool-extract.in \
+ intltool-merge.in \
+ intltool-update.in \
+ TROUBLESHOOTING \
TODOandBUGS.txt
+DISTCLEANFILES = \
+ intltool-extract \
+ intltool-merge \
+ intltool-update
+
uninstall-hook:
-rmdir --ignore-fail-on-non-empty $(DESTDIR)$(pkgdatadir)/data
-rmdir --ignore-fail-on-non-empty $(DESTDIR)$(pkgdatadir)/scripts
Modified: gtkpod/trunk/autogen.sh
===================================================================
--- gtkpod/trunk/autogen.sh 2007-06-09 00:58:05 UTC (rev 1535)
+++ gtkpod/trunk/autogen.sh 2007-06-09 03:51:23 UTC (rev 1536)
@@ -6,11 +6,11 @@
DIE=0
if [ -n "$GNOME2_DIR" ]; then
- ACLOCAL_FLAGS="-I $GNOME2_DIR/share/aclocal $ACLOCAL_FLAGS"
- LD_LIBRARY_PATH="$GNOME2_DIR/lib:$LD_LIBRARY_PATH"
- PATH="$GNOME2_DIR/bin:$PATH"
- export PATH
- export LD_LIBRARY_PATH
+ ACLOCAL_FLAGS="-I $GNOME2_DIR/share/aclocal $ACLOCAL_FLAGS"
+ LD_LIBRARY_PATH="$GNOME2_DIR/lib:$LD_LIBRARY_PATH"
+ PATH="$GNOME2_DIR/bin:$PATH"
+ export PATH
+ export LD_LIBRARY_PATH
fi
(test -f $srcdir/configure.in) || {
@@ -27,7 +27,7 @@
DIE=1
}
-(grep "^AC_PROG_INTLTOOL" $srcdir/configure.in >/dev/null) && {
+(grep "^IT_PROG_INTLTOOL" $srcdir/configure.in >/dev/null) && {
(intltoolize --version) < /dev/null > /dev/null 2>&1 || {
echo
echo "**Error**: You must have \`intltool' installed."
@@ -60,13 +60,13 @@
(grep "sed.*POTFILES" $srcdir/configure.in) > /dev/null || \
(glib-gettextize --version) < /dev/null > /dev/null 2>&1 || {
if [ -f /etc/debian_version ]
- then
- echo "**Error**: Please apt-get install libglib2.0-dev"
- else
- echo
- echo "**Error**: You must have \`glib' installed."
- echo "You can get it from: ftp://ftp.gtk.org/pub/gtk.";
- echo "When using packages, make sure you also install the -dev package."
+ then
+ echo "**Error**: Please apt-get install libglib2.0-dev"
+ else
+ echo
+ echo "**Error**: You must have \`glib' installed."
+ echo "You can get it from: ftp://ftp.gtk.org/pub/gtk.";
+ echo "When using packages, make sure you also install the -dev
package."
fi
DIE=1
}
@@ -118,32 +118,32 @@
aclocalinclude="$ACLOCAL_FLAGS"
if grep "^AM_GLIB_GNU_GETTEXT" configure.in >/dev/null; then
- echo "Creating $dr/aclocal.m4 ..."
- test -r $dr/aclocal.m4 || touch $dr/aclocal.m4
- echo "Running glib-gettextize... Ignore non-fatal messages."
- echo "no" | glib-gettextize --force --copy
- echo "Making $dr/aclocal.m4 writable ..."
- test -r $dr/aclocal.m4 && chmod u+w $dr/aclocal.m4
+ echo "Creating $dr/aclocal.m4 ..."
+ test -r $dr/aclocal.m4 || touch $dr/aclocal.m4
+ echo "Running glib-gettextize... Ignore non-fatal messages."
+ echo "no" | glib-gettextize --force --copy
+ echo "Making $dr/aclocal.m4 writable ..."
+ test -r $dr/aclocal.m4 && chmod u+w $dr/aclocal.m4
fi
- if grep "^AC_PROG_INTLTOOL" configure.in >/dev/null; then
+ if grep "^IT_PROG_INTLTOOL" configure.in >/dev/null; then
echo "Running intltoolize..."
- intltoolize --copy --force --automake
+ intltoolize --copy --force --automake
fi
if grep "^AM_PROG_XML_I18N_TOOLS" configure.in >/dev/null; then
echo "Running xml-i18n-toolize..."
- xml-i18n-toolize --copy --force --automake
+ xml-i18n-toolize --copy --force --automake
fi
if grep "^AM_PROG_LIBTOOL" configure.in >/dev/null; then
- if test -z "$NO_LIBTOOLIZE" ; then
- echo "Running libtoolize..."
- ${LIBTOOLIZE:-libtoolize} --force --copy
- fi
+ if test -z "$NO_LIBTOOLIZE" ; then
+ echo "Running libtoolize..."
+ ${LIBTOOLIZE:-libtoolize} --force --copy
+ fi
fi
echo "Running aclocal $aclocalinclude ..."
${ACLOCAL:-aclocal} $aclocalinclude
if grep "^AM_CONFIG_HEADER" configure.in >/dev/null; then
- echo "Running autoheader..."
- ${AUTOHEADER:-autoheader}
+ echo "Running autoheader..."
+ ${AUTOHEADER:-autoheader}
fi
echo "Running automake --gnu $am_opt ..."
${AUTOMAKE:-automake} --add-missing --gnu $am_opt
Modified: gtkpod/trunk/configure.in
===================================================================
--- gtkpod/trunk/configure.in 2007-06-09 00:58:05 UTC (rev 1535)
+++ gtkpod/trunk/configure.in 2007-06-09 03:51:23 UTC (rev 1536)
@@ -12,6 +12,8 @@
AC_PROG_CC
AM_PROG_CC_STDC
+IT_PROG_INTLTOOL([0.33])
+
dnl Only use -Wall if we have gcc
if test "x$GCC" = "xyes"; then
if test -z "`echo "$CFLAGS" | grep "\-Wall" 2> /dev/null`" ; then
@@ -179,6 +181,10 @@
po/Makefile.in
scripts/Makefile
data/Makefile
+data/icons/Makefile
+data/icons/32x32/Makefile
+data/icons/48x48/Makefile
+data/icons/64x64/Makefile
])
echo "
Modified: gtkpod/trunk/data/Makefile.am
===================================================================
--- gtkpod/trunk/data/Makefile.am 2007-06-09 00:58:05 UTC (rev 1535)
+++ gtkpod/trunk/data/Makefile.am 2007-06-09 03:51:23 UTC (rev 1536)
@@ -1,3 +1,10 @@
+SUBDIRS = icons
+
+desktopdir = $(datadir)/applications
+desktop_in_files = gtkpod.desktop.in
+desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
[EMAIL PROTECTED]@
+
appdatadir = $(pkgdatadir)/data
appdata_DATA = \
gtkpod.glade \
@@ -6,20 +13,19 @@
default-cover.png \
gtkpod-add-dirs.png \
gtkpod-add-files.png \
- gtkpod-add-playlists.png \
+ gtkpod-add-playlists.png \
+ gtkpod-icon-32-2.png \
gtkpod-icon-32.png \
- gtkpod-icon-32x32-2.png \
- gtkpod-icon-32x32.png \
gtkpod-icon-48.png \
- gtkpod-icon-48x48.png \
- gtkpod-icon-64x64.png \
gtkpod-logo.png \
gtkpod-new-playlist.png \
gtkpod-read.png \
gtkpod-sync.png
EXTRA_DIST = \
+ $(desktop_in_files) \
$(appdata_DATA)
-CLEANFILES = \
+CLEANFILES = \
+ $(desktop_DATA) \
gtkpod.gladep
Added: gtkpod/trunk/data/gtkpod.desktop.in
===================================================================
--- gtkpod/trunk/data/gtkpod.desktop.in (rev 0)
+++ gtkpod/trunk/data/gtkpod.desktop.in 2007-06-09 03:51:23 UTC (rev 1536)
@@ -0,0 +1,8 @@
+[Desktop Entry]
+_Name=GtkPod
+_GenericName=iPod Manager
+_Comment=Manage music and video on an Apple iPod
+Exec=gtkpod
+Icon=gtkpod.png
+Type=Application
+Categories=GTK;AudioVideo;
Added: gtkpod/trunk/data/icons/32x32/Makefile.am
===================================================================
--- gtkpod/trunk/data/icons/32x32/Makefile.am (rev 0)
+++ gtkpod/trunk/data/icons/32x32/Makefile.am 2007-06-09 03:51:23 UTC (rev
1536)
@@ -0,0 +1,4 @@
+appicondir = $(datadir)/icons/hicolor/32x32/apps
+appicon_DATA = gtkpod.png
+
+EXTRA_DIST = $(appicon_DATA)
Added: gtkpod/trunk/data/icons/48x48/Makefile.am
===================================================================
--- gtkpod/trunk/data/icons/48x48/Makefile.am (rev 0)
+++ gtkpod/trunk/data/icons/48x48/Makefile.am 2007-06-09 03:51:23 UTC (rev
1536)
@@ -0,0 +1,4 @@
+appicondir = $(datadir)/icons/hicolor/48x48/apps
+appicon_DATA = gtkpod.png
+
+EXTRA_DIST = $(appicon_DATA)
Added: gtkpod/trunk/data/icons/64x64/Makefile.am
===================================================================
--- gtkpod/trunk/data/icons/64x64/Makefile.am (rev 0)
+++ gtkpod/trunk/data/icons/64x64/Makefile.am 2007-06-09 03:51:23 UTC (rev
1536)
@@ -0,0 +1,4 @@
+appicondir = $(datadir)/icons/hicolor/64x64/apps
+appicon_DATA = gtkpod.png
+
+EXTRA_DIST = $(appicon_DATA)
Added: gtkpod/trunk/data/icons/Makefile.am
===================================================================
--- gtkpod/trunk/data/icons/Makefile.am (rev 0)
+++ gtkpod/trunk/data/icons/Makefile.am 2007-06-09 03:51:23 UTC (rev 1536)
@@ -0,0 +1,14 @@
+SUBDIRS = 32x32 48x48 64x64
+
+gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
+
+install-data-hook: update-icon-cache
+uninstall-hook: update-icon-cache
+update-icon-cache:
+ @-if test -z "$(DESTDIR)"; then \
+ echo "Updating Gtk icon cache."; \
+ $(gtk_update_icon_cache); \
+ else \
+ echo "*** Icon cache not updated. After (un)install, run
this:"; \
+ echo "*** $(gtk_update_icon_cache)"; \
+ fi
Modified: gtkpod/trunk/po/POTFILES.in
===================================================================
--- gtkpod/trunk/po/POTFILES.in 2007-06-09 00:58:05 UTC (rev 1535)
+++ gtkpod/trunk/po/POTFILES.in 2007-06-09 03:51:23 UTC (rev 1536)
@@ -1,7 +1,8 @@
# List of source files containing translatable strings (output of
-# ls src/*.[cl] data/*.glade | grep -vf po/POTFILES.skip
+# ls src/*.[cl] data/*.glade data/*.desktop.in | grep -vf po/POTFILES.skip
# in a clean checkout)
+data/gtkpod.desktop.in
data/gtkpod.glade
src/charset.c
src/clientserver.c
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
gtkpod-cvs2 mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gtkpod-cvs2
