diff -u rhythmbox-0.11.5/debian/changelog rhythmbox-0.11.5/debian/changelog
--- rhythmbox-0.11.5/debian/changelog
+++ rhythmbox-0.11.5/debian/changelog
@@ -1,3 +1,16 @@
+rhythmbox (0.11.5-0ubuntu8) hardy-proposed; urgency=low
+
+  * debian/patches/70_from_svn_fix_incorrect_shuffle_detection.patch:
+    - change from svn, correctly detect the new ipod shuffle devices
+  * debian/patches/71_from_svn_fix_ipod_aac_copies.patch:
+    - change from svn, don't convert aac when they are copied to an ipod 
+      (lp: #164265)
+  * debian/patches/72_from_svn_ipod_correct_set_year_tag.patch:
+    - change from svn, correctly set the year when copying a song to an ipod
+      (lp: #144273)
+	
+ -- Sebastien Bacher <seb128@canonical.com>  Thu, 12 Jun 2008 10:32:09 +0200
+
 rhythmbox (0.11.5-0ubuntu7) hardy-proposed; urgency=low
 
   * debian/patches/81_use_uri_to_import_directory.patch:
only in patch2:
unchanged:
--- rhythmbox-0.11.5.orig/debian/patches/70_from_svn_fix_incorrect_ipod_shuffle_detection.patch
+++ rhythmbox-0.11.5/debian/patches/70_from_svn_fix_incorrect_ipod_shuffle_detection.patch
@@ -0,0 +1,14 @@
+--- trunk/plugins/ipod/rb-ipod-db.c	2008/06/11 21:48:41	5740
++++ trunk/plugins/ipod/rb-ipod-db.c	2008/06/11 21:54:46	5741
+@@ -682,7 +682,9 @@
+ 
+ 	info = itdb_device_get_ipod_info(priv->itdb->device);
+ 	if (info->ipod_generation == ITDB_IPOD_GENERATION_UNKNOWN ||
+-	    info->ipod_model == ITDB_IPOD_MODEL_SHUFFLE) {
++	    info->ipod_generation == ITDB_IPOD_GENERATION_SHUFFLE_1 ||
++	    info->ipod_generation == ITDB_IPOD_GENERATION_SHUFFLE_2 ||
++	    info->ipod_generation == ITDB_IPOD_GENERATION_SHUFFLE_3) {
+ 		priv->needs_shuffle_db = TRUE;
+ 	} else {
+ 		priv->needs_shuffle_db = FALSE;
+
only in patch2:
unchanged:
--- rhythmbox-0.11.5.orig/debian/patches/71_from_svn_fix_ipod_aac_copies.patch
+++ rhythmbox-0.11.5/debian/patches/71_from_svn_fix_ipod_aac_copies.patch
@@ -0,0 +1,24 @@
+--- trunk/plugins/ipod/rb-ipod-source.c	2008/06/11 11:03:26	5738
++++ trunk/plugins/ipod/rb-ipod-source.c	2008/06/11 21:42:50	5739
+@@ -1669,8 +1669,8 @@
+ 	GList *ret = NULL;
+ 
+ 	/* FIXME: we should really query HAL for this */
+-	ret = g_list_prepend (ret, g_strdup ("audio/aac"));
+ 	ret = g_list_prepend (ret, g_strdup ("audio/mpeg"));
++	ret = g_list_prepend (ret, g_strdup ("audio/aac"));
+ 
+ 	return ret;
+ }
+--- trunk/sources/rb-removable-media-source.c	2008/06/11 11:03:26	5738
++++ trunk/sources/rb-removable-media-source.c	2008/06/11 21:42:50	5739
+@@ -322,6 +322,8 @@
+ 			/* if it has a bitrate, assume it's mp3-in-wav */
+ 			if (rhythmdb_entry_get_ulong (entry, RHYTHMDB_PROP_BITRATE) != 0)
+ 				entry_mime = "audio/mpeg";
++		} else if (strcmp (entry_mime, "audio/x-m4a") == 0) {
++			entry_mime = "audio/aac";
+ 		} else if (strcmp (entry_mime, "application/x-id3") == 0) {
+ 			entry_mime = "audio/mpeg";
+ 		} else if (strcmp (entry_mime, "audio/x-flac") == 0) {
+
only in patch2:
unchanged:
--- rhythmbox-0.11.5.orig/debian/patches/72_from_svn_ipod_correct_set_year_tag.patch
+++ rhythmbox-0.11.5/debian/patches/72_from_svn_ipod_correct_set_year_tag.patch
@@ -0,0 +1,28 @@
+--- trunk/plugins/ipod/rb-ipod-source.c	2008/06/11 21:54:46	5741
++++ trunk/plugins/ipod/rb-ipod-source.c	2008/06/11 22:01:20	5742
+@@ -465,6 +465,8 @@
+ create_ipod_song_from_entry (RhythmDBEntry *entry, const char *mimetype)
+ {
+ 	Itdb_Track *track;
++        gulong julian;
++        GDate *date;
+ 
+ 	track = itdb_track_new ();
+ 
+@@ -479,7 +481,14 @@
+ 	track->cd_nr = rhythmdb_entry_get_ulong (entry, RHYTHMDB_PROP_DISC_NUMBER);
+ 	track->track_nr = rhythmdb_entry_get_ulong (entry, RHYTHMDB_PROP_TRACK_NUMBER);
+ 	track->bitrate = rhythmdb_entry_get_ulong (entry, RHYTHMDB_PROP_BITRATE);
+-	track->year = rhythmdb_entry_get_ulong (entry, RHYTHMDB_PROP_DATE);
++        julian = rhythmdb_entry_get_ulong (entry, RHYTHMDB_PROP_DATE);
++        date = g_date_new_julian (julian);
++        if (date != NULL) {
++                track->year = g_date_get_year (date);
++                g_date_free (date);
++        } else {
++                track->year = 0;
++        }
+ 	track->time_added = itdb_time_get_mac_time ();
+ 	track->time_played = rhythmdb_entry_get_ulong (entry, RHYTHMDB_PROP_LAST_PLAYED);
+ 	track->time_played = itdb_time_host_to_mac (track->time_played);
+