Revision: 2002
          http://gtkpod.svn.sourceforge.net/gtkpod/?rev=2002&view=rev
Author:   tmzullinger
Date:     2008-05-31 15:27:23 -0700 (Sat, 31 May 2008)

Log Message:
-----------
Merge r1998:2001 from trunk to pull in "make distcheck" fixes

Modified Paths:
--------------
    gtkpod/branches/gstreamer_player_support/ChangeLog
    
gtkpod/branches/gstreamer_player_support/data/icons/hicolor/16x16/places/Makefile.am
    
gtkpod/branches/gstreamer_player_support/data/icons/hicolor/16x16/status/Makefile.am
    
gtkpod/branches/gstreamer_player_support/data/icons/hicolor/22x22/places/Makefile.am
    
gtkpod/branches/gstreamer_player_support/data/icons/hicolor/24x24/places/Makefile.am
    
gtkpod/branches/gstreamer_player_support/data/icons/hicolor/32x32/places/Makefile.am
    
gtkpod/branches/gstreamer_player_support/data/icons/hicolor/48x48/places/Makefile.am
    
gtkpod/branches/gstreamer_player_support/data/icons/hicolor/scalable/places/Makefile.am
    gtkpod/branches/gstreamer_player_support/data/man/Makefile.am
    gtkpod/branches/gstreamer_player_support/doc/Makefile.am
    gtkpod/branches/gstreamer_player_support/po/POTFILES.in

Modified: gtkpod/branches/gstreamer_player_support/ChangeLog
===================================================================
--- gtkpod/branches/gstreamer_player_support/ChangeLog  2008-05-31 21:49:43 UTC 
(rev 2001)
+++ gtkpod/branches/gstreamer_player_support/ChangeLog  2008-05-31 22:27:23 UTC 
(rev 2002)
@@ -1,5 +1,19 @@
-2008-05-24 Jorg Schuler <jcsjcs at users.sourceforge.net>
+2008-05-31  Todd Zullinger <tmzullinger at users.sourceforge.net>
 
+       * po/POTFILES.in: update file list to keep distcheck happy
+
+       * data/icons/hicolor/16x16/places/Makefile.am
+         data/icons/hicolor/16x16/status/Makefile.am
+         data/icons/hicolor/22x22/places/Makefile.am
+         data/icons/hicolor/24x24/places/Makefile.am
+         data/icons/hicolor/32x32/places/Makefile.am
+         data/icons/hicolor/48x48/places/Makefile.am
+         data/icons/hicolor/scalable/places/Makefile.am
+         data/man/Makefile.am
+         doc/Makefile.am: minor distcheck fixes
+
+2008-05-31 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
        * src/details.c (details_update_thumbnail): fix bug that prevented
          displaying thumbnails in the edit details window that were saved
          on the iPod.

Modified: 
gtkpod/branches/gstreamer_player_support/data/icons/hicolor/16x16/places/Makefile.am
===================================================================
--- 
gtkpod/branches/gstreamer_player_support/data/icons/hicolor/16x16/places/Makefile.am
        2008-05-31 21:49:43 UTC (rev 2001)
+++ 
gtkpod/branches/gstreamer_player_support/data/icons/hicolor/16x16/places/Makefile.am
        2008-05-31 22:27:23 UTC (rev 2002)
@@ -1,4 +1,4 @@
 placesdir = $(pkgdatadir)/icons/hicolor/16x16/places
 places_DATA = playlist.png playlist-photo.png
 
-EXTRA_DIST = places_DATA
+EXTRA_DIST = $(places_DATA)

Modified: 
gtkpod/branches/gstreamer_player_support/data/icons/hicolor/16x16/status/Makefile.am
===================================================================
--- 
gtkpod/branches/gstreamer_player_support/data/icons/hicolor/16x16/status/Makefile.am
        2008-05-31 21:49:43 UTC (rev 2001)
+++ 
gtkpod/branches/gstreamer_player_support/data/icons/hicolor/16x16/status/Makefile.am
        2008-05-31 22:27:23 UTC (rev 2002)
@@ -1,4 +1,4 @@
 statusdir = $(pkgdatadir)/icons/hicolor/16x16/status
 status_DATA = star-none.png star-set.png star-unset.png
 
-EXTRA_DIST = status_DATA
+EXTRA_DIST = $(status_DATA)

Modified: 
gtkpod/branches/gstreamer_player_support/data/icons/hicolor/22x22/places/Makefile.am
===================================================================
--- 
gtkpod/branches/gstreamer_player_support/data/icons/hicolor/22x22/places/Makefile.am
        2008-05-31 21:49:43 UTC (rev 2001)
+++ 
gtkpod/branches/gstreamer_player_support/data/icons/hicolor/22x22/places/Makefile.am
        2008-05-31 22:27:23 UTC (rev 2002)
@@ -1,4 +1,4 @@
 placesdir = $(pkgdatadir)/icons/hicolor/22x22/places
 places_DATA = playlist.png playlist-photo.png
 
-EXTRA_DIST = places_DATA
+EXTRA_DIST = $(places_DATA)

Modified: 
gtkpod/branches/gstreamer_player_support/data/icons/hicolor/24x24/places/Makefile.am
===================================================================
--- 
gtkpod/branches/gstreamer_player_support/data/icons/hicolor/24x24/places/Makefile.am
        2008-05-31 21:49:43 UTC (rev 2001)
+++ 
gtkpod/branches/gstreamer_player_support/data/icons/hicolor/24x24/places/Makefile.am
        2008-05-31 22:27:23 UTC (rev 2002)
@@ -1,4 +1,4 @@
 placesdir = $(pkgdatadir)/icons/hicolor/24x24/places
 places_DATA = playlist.png playlist-photo.png
 
-EXTRA_DIST = places_DATA
+EXTRA_DIST = $(places_DATA)

Modified: 
gtkpod/branches/gstreamer_player_support/data/icons/hicolor/32x32/places/Makefile.am
===================================================================
--- 
gtkpod/branches/gstreamer_player_support/data/icons/hicolor/32x32/places/Makefile.am
        2008-05-31 21:49:43 UTC (rev 2001)
+++ 
gtkpod/branches/gstreamer_player_support/data/icons/hicolor/32x32/places/Makefile.am
        2008-05-31 22:27:23 UTC (rev 2002)
@@ -1,4 +1,4 @@
 placesdir = $(pkgdatadir)/icons/hicolor/32x32/places
 places_DATA = playlist.png playlist-photo.png
 
-EXTRA_DIST = places_DATA
+EXTRA_DIST = $(places_DATA)

Modified: 
gtkpod/branches/gstreamer_player_support/data/icons/hicolor/48x48/places/Makefile.am
===================================================================
--- 
gtkpod/branches/gstreamer_player_support/data/icons/hicolor/48x48/places/Makefile.am
        2008-05-31 21:49:43 UTC (rev 2001)
+++ 
gtkpod/branches/gstreamer_player_support/data/icons/hicolor/48x48/places/Makefile.am
        2008-05-31 22:27:23 UTC (rev 2002)
@@ -1,4 +1,4 @@
 placesdir = $(pkgdatadir)/icons/hicolor/48x48/places
 places_DATA = playlist.png playlist-photo.png
 
-EXTRA_DIST = places_DATA
+EXTRA_DIST = $(places_DATA)

Modified: 
gtkpod/branches/gstreamer_player_support/data/icons/hicolor/scalable/places/Makefile.am
===================================================================
--- 
gtkpod/branches/gstreamer_player_support/data/icons/hicolor/scalable/places/Makefile.am
     2008-05-31 21:49:43 UTC (rev 2001)
+++ 
gtkpod/branches/gstreamer_player_support/data/icons/hicolor/scalable/places/Makefile.am
     2008-05-31 22:27:23 UTC (rev 2002)
@@ -1,4 +1,4 @@
 placesdir = $(pkgdatadir)/icons/hicolor/scalable/places
 places_DATA = playlist.svg playlist-photo.svg
 
-EXTRA_DIST = places_DATA
+EXTRA_DIST = $(places_DATA)

Modified: gtkpod/branches/gstreamer_player_support/data/man/Makefile.am
===================================================================
--- gtkpod/branches/gstreamer_player_support/data/man/Makefile.am       
2008-05-31 21:49:43 UTC (rev 2001)
+++ gtkpod/branches/gstreamer_player_support/data/man/Makefile.am       
2008-05-31 22:27:23 UTC (rev 2002)
@@ -1,3 +1,3 @@
 man_MANS = gtkpod.1
 
-EXTRA_DIST = man_MANS
+EXTRA_DIST = $(man_MANS)

Modified: gtkpod/branches/gstreamer_player_support/doc/Makefile.am
===================================================================
--- gtkpod/branches/gstreamer_player_support/doc/Makefile.am    2008-05-31 
21:49:43 UTC (rev 2001)
+++ gtkpod/branches/gstreamer_player_support/doc/Makefile.am    2008-05-31 
22:27:23 UTC (rev 2002)
@@ -4,9 +4,27 @@
 
 docdir = $(pkgdatadir)/doc
 doc_DATA = \
-       figures \
        gtkpod.xml \
-       *.html
+       adding-cover-art-from-a-browser.html \
+       adding-files-and-folders.html \
+       advanced-features.html \
+       copying-content-to-the-ipod.html \
+       cover-art.html \
+       exporting-files-from-the-ipod.html \
+       getting-started.html \
+       gtkpod.html \
+       gtkpod-info.html \
+       hooking-up-the-ipod.html \
+       ipod-and-content.html \
+       ipod-file-recovery.html \
+       layout-of-gtkpod.html \
+       managing-playlists.html \
+       playcounts-and-ratings.html \
+       playlists-podcasts-and-photos.html \
+       setting-ipod-properties.html \
+       the-sysinfo-file.html \
+       troubleshooting-faq.html \
+       view-and-edit-track-details.html
 
 EXTRA_DIST = $(doc_DATA)
 

Modified: gtkpod/branches/gstreamer_player_support/po/POTFILES.in
===================================================================
--- gtkpod/branches/gstreamer_player_support/po/POTFILES.in     2008-05-31 
21:49:43 UTC (rev 2001)
+++ gtkpod/branches/gstreamer_player_support/po/POTFILES.in     2008-05-31 
22:27:23 UTC (rev 2002)
@@ -27,7 +27,9 @@
 src/flacfile.c
 src/getopt1.c
 src/getopt.c
+src/help.c
 src/info.c
+src/infodlg.c
 src/ipod_init.c
 src/main.c
 src/misc.c
@@ -40,9 +42,10 @@
 src/mp4file.c
 src/oggfile.c
 src/prefs.c
-src/prefs_window.c
+src/prefsdlg.c
 src/repository.c
 src/sha1.c
+src/sort_window.c
 src/syncdir.c
 src/tools.c
 src/wavfile.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: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
gtkpod-cvs2 mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gtkpod-cvs2

Reply via email to