Merge lp:~jerico-dev/rhythmbox/rb-ipod-support-video-podcast into lp:~ubuntu-desktop/rhythmbox/ubuntu

Proposed by jerico
Status: Needs review
Proposed branch: lp:~jerico-dev/rhythmbox/rb-ipod-support-video-podcast
Merge into: lp:~ubuntu-desktop/rhythmbox/ubuntu
Diff against target: 17890 lines (+17686/-0) (has conflicts)
40 files modified
.bzr-builddeb/default.conf (+2/-0)
debian/NEWS (+7/-0)
debian/README.Debian (+53/-0)
debian/TODO (+14/-0)
debian/changelog (+2294/-0)
debian/compat (+1/-0)
debian/control (+195/-0)
debian/control.in (+190/-0)
debian/copyright (+61/-0)
debian/patches/01_lpi.patch (+44/-0)
debian/patches/03_magnatune_partner.patch (+14/-0)
debian/patches/04_podcast_query_info.patch (+267/-0)
debian/patches/05_ignore_ptp_cameras.patch (+83/-0)
debian/patches/06_mtp_memleak.patch (+30/-0)
debian/patches/07_use_escaped_podcast_uri.patch (+45/-0)
debian/patches/80_update_louie_imports.patch (+37/-0)
debian/patches/82_rhythmbox-indicators.patch (+634/-0)
debian/patches/90_autoreconf.patch (+12802/-0)
debian/patches/91_git_magnatune_buttons.patch (+45/-0)
debian/patches/92_git_mc5_status.patch (+42/-0)
debian/patches/93_git_no_empty_playlist_crasher.patch (+25/-0)
debian/patches/94_git_escaping_crasher.patch (+52/-0)
debian/patches/95_git_correct_dbversion.patch (+35/-0)
debian/patches/95_rb_ipod_support_video_podcast.patch (+140/-0)
debian/patches/96_git_magnatune_genre.patch (+22/-0)
debian/patches/97_git_no_double_deletion.patch (+44/-0)
debian/patches/98_git_dont_require_can_read.patch (+34/-0)
debian/patches/99_git_python_initialization.patch (+172/-0)
debian/rhythmbox-plugin-cdrecorder.install (+1/-0)
debian/rhythmbox-plugin-coherence.install (+1/-0)
debian/rhythmbox-plugins.install (+24/-0)
debian/rhythmbox-small.xpm (+177/-0)
debian/rhythmbox.gconf-defaults (+3/-0)
debian/rhythmbox.install (+7/-0)
debian/rhythmbox.links (+1/-0)
debian/rhythmbox.menu (+5/-0)
debian/rhythmbox.mime (+8/-0)
debian/rules (+22/-0)
debian/source_rhythmbox.py (+50/-0)
debian/watch (+3/-0)
Conflict adding file .bzr-builddeb.  Moved existing file to .bzr-builddeb.moved.
Conflict adding file debian.  Moved existing file to debian.moved.
To merge this branch: bzr merge lp:~jerico-dev/rhythmbox/rb-ipod-support-video-podcast
Reviewer Review Type Date Requested Status
Javier Jardón Pending
Review via email: mp+29182@code.launchpad.net

Description of the change

Introduces video podcast support for iPods, e.g. Nano 5G. The patch has also been posted upstream, see https://bugzilla.gnome.org/show_bug.cgi?id=412841#c3. It would be great, though, to have this in Ubuntu already until it's integrated upstream.

To post a comment you must log in.

Unmerged revisions

3. By Florian Grandel <fgrandel@laptop-fg>

* debian/patches/95_rb_ipod_support_video_podcast.patch:
  - added support for video podcasts

2. By Florian Grandel <fgrandel@laptop-fg>

- Added a RhythmDB entry property "has-video" that will be true when a file contains a video track
- The "has-video" property will be queried when adding podcasts to an iPod. The file's media type will be set to "video podcast" if true. This is required to support iPod video podcasts, e.g. on iPod Nano 5G.

1. By Robert Ancell

Branch rhythmbox for Lucid

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added directory '.bzr-builddeb'
2=== renamed directory '.bzr-builddeb' => '.bzr-builddeb.moved'
3=== added file '.bzr-builddeb/default.conf'
4--- .bzr-builddeb/default.conf 1970-01-01 00:00:00 +0000
5+++ .bzr-builddeb/default.conf 2010-07-05 01:49:22 +0000
6@@ -0,0 +1,2 @@
7+[BUILDDEB]
8+merge = True
9
10=== added directory 'debian'
11=== renamed directory 'debian' => 'debian.moved'
12=== added file 'debian/NEWS'
13--- debian/NEWS 1970-01-01 00:00:00 +0000
14+++ debian/NEWS 2010-07-05 01:49:22 +0000
15@@ -0,0 +1,7 @@
16+rhythmbox (0.12.4-1) unstable; urgency=low
17+
18+ Since rhythmbox 0.12.3, the tray icon is a plugin. If you had it enabled
19+ and still want it, you will need to reactivate it. It's located in
20+ Edit -> Plugins -> Status Icon.
21+
22+ -- Emilio Pozuelo Monfort <pochu@ubuntu.com> Sun, 02 Aug 2009 16:22:27 +0200
23
24=== added file 'debian/README.Debian'
25--- debian/README.Debian 1970-01-01 00:00:00 +0000
26+++ debian/README.Debian 2010-07-05 01:49:22 +0000
27@@ -0,0 +1,53 @@
28+---[ Mounting devices
29+
30+Rhythmbox does not see devices, be it audio CDs or iPods, unless they
31+are mounted by gvfs. If you are not running nautilus, you need to mount
32+them with gvfs-mount.
33+
34+
35+---[ Configuring the output sink
36+
37+You can choose your preferred output sink by using gnome-sound-properties (in
38+the gnome-control-center package), or by editing the GConf key:
39+ /system/gstreamer/0.10/default/musicaudiosink
40+
41+The default is to detect your output sink automagically.
42+
43+
44+---[ Music sharing
45+
46+The avahi-daemon dependency is not absolute, but is necessary for music
47+sharing. Please install avahi-daemon to share music.
48+
49+To be useful, avahi-daemon listens on the network by default. This introduces
50+a security risk, you might want to configure avahi-daemon or stop it to avoid
51+listening in exposed areas.
52+
53+
54+--[ mms:// web radios
55+
56+To read mms:// based web radios, you need gstreamer0.10-plugins-bad.
57+
58+
59+---[ Before reporting a bug
60+
61+If you happen to have problems with sound output or decoding, such as a file
62+that can not be played, or a crappy sound, please check whether you can
63+reproduce the problem with GStreamer. The following command reproduces the
64+behavior of Rhythmbox calling GStreamer:
65+ gst-launch playbin uri=file:///path/to/my/musicfile.ogg
66+
67+The upstream BTS is at <http://bugzilla.gnome.org/>, and there's no
68+synchronization mechanism between the Debian and the GNOME BTS, so you can
69+expect more information on a particular bug not related to Debian in the
70+upstream BTS. It is always ok to report a bug in the Debian BTS, this
71+will help other Debian users, but the upstream BTS might give you clues
72+on a particular bug you're experiencing, a quick workaround, or even tell you
73+it's fixed! ;)
74+
75+
76+Please submit a bug report on the Debian package rhythmbox if this text is
77+outdated.
78+
79+$Id: README.Debian 20314 2009-06-10 19:28:54Z joss $
80+
81
82=== added file 'debian/TODO'
83--- debian/TODO 1970-01-01 00:00:00 +0000
84+++ debian/TODO 2010-07-05 01:49:22 +0000
85@@ -0,0 +1,14 @@
86+$Id: TODO 11631 2007-06-19 13:24:25Z lool $
87+
88+This is a short compilation of nice things we could to improve rhythmbox in
89+Debian.
90+
91+- more mailcap entries, /usr/lib/mime/packages/rhythmbox only lists some known
92+ types, but the list is not exhaustive
93+
94+- reportbug plugin, most users can't diagnostic wether problems are coming from
95+ gstreamer or from rhythmbox itself, it would be nice to extend reportbug to
96+ do some basic tests or to print a message
97+
98+- vala support
99+
100
101=== added file 'debian/changelog'
102--- debian/changelog 1970-01-01 00:00:00 +0000
103+++ debian/changelog 2010-07-05 01:49:22 +0000
104@@ -0,0 +1,2294 @@
105+rhythmbox (0.12.8-0ubuntu7.ppa1) lucid; urgency=low
106+
107+ * debian/patches/95_rb_ipod_support_video_podcast.patch:
108+ - added support for video podcasts
109+
110+ -- Florian Grandel <jerico.dev@gmail.com> Sun, 04 Jul 2010 21:49:25 -0300
111+
112+rhythmbox (0.12.8-0ubuntu7) lucid-proposed; urgency=low
113+
114+ * debian/control:
115+ - Update Vcs-Bzr link
116+ * debian/patches/07_use_escaped_podcast_uri.patch:
117+ - Handle podcasts that have sound files with the same basename (LP: #445141)
118+
119+ -- Robert Ancell <robert.ancell@canonical.com> Tue, 22 Jun 2010 17:06:19 +1000
120+
121+rhythmbox (0.12.8-0ubuntu6) lucid-proposed; urgency=low
122+
123+ * debian/patches/98_git_dont_require_can_read.patch:
124+ - git change to not require the can-read attribute to be available since
125+ the smb mounts sometime don't have it and that breaks import (lp: #273294)
126+ * debian/patches/99_git_python_initialization.patch:
127+ - git change to fix python initialization issues, the change is not
128+ technically required in lucid but it will avoid having crashes if the
129+ changes to python from maverick are backport to lucid later
130+
131+ -- Sebastien Bacher <seb128@ubuntu.com> Tue, 01 Jun 2010 15:45:56 +0200
132+
133+rhythmbox (0.12.8-0ubuntu5) lucid-proposed; urgency=low
134+
135+ * debian/patches/97_git_no_double_deletion.patch
136+ - git change to fix crashes due to double deletion (lp: #569380)
137+
138+ -- Sebastien Bacher <seb128@ubuntu.com> Wed, 19 May 2010 15:43:20 +0200
139+
140+rhythmbox (0.12.8-0ubuntu4) lucid-proposed; urgency=low
141+
142+ * debian/patches/92_git_mc5_status.patch:
143+ - upstream change to correctly update the im status (lp: #548851)
144+ * debian/patches/93_git_no_empty_playlist_crasher.patch:
145+ - upstream change to not crash on empty playlist saving (lp: #567399)
146+ * debian/patches/94_git_escaping_crasher.patch:
147+ - upstream change to fix a crash on copies (lp: #565517)
148+ * debian/patches/95_git_correct_dbversion.patch:
149+ - upstream change to db version detection issues in some locates leading
150+ to trying to convert datas on every run (lp: #568887)
151+ * debian/patches/96_git_magnatune_genre.patch:
152+ - upstream change to set correct magnatune genre names (lp: #537958)
153+
154+ -- Sebastien Bacher <seb128@ubuntu.com> Wed, 28 Apr 2010 16:27:51 +0200
155+
156+rhythmbox (0.12.8-0ubuntu3) lucid; urgency=low
157+
158+ * debian/patches/91_git_magnatune_buttons.patch:
159+ - git change to fix magnatune widgets not being displayed correctly using
160+ the current gtk version due to gtkbuilder id changes (lp: #560085)
161+
162+ -- Sebastien Bacher <seb128@ubuntu.com> Fri, 16 Apr 2010 11:02:49 +0200
163+
164+rhythmbox (0.12.8-0ubuntu2) lucid; urgency=low
165+
166+ * Add 05_ignore_ptp_cameras.patch: MTP plugin: Ignore PTP cameras.
167+ (LP: #544994)
168+ * Add 06_mtp_memleak.patch: Fix a memory leak in the MTP plugin.
169+
170+ -- Martin Pitt <martin.pitt@ubuntu.com> Wed, 14 Apr 2010 17:10:06 +0200
171+
172+rhythmbox (0.12.8-0ubuntu1) lucid; urgency=low
173+
174+ * New upstream version
175+ * debian/patches/90_autoreconf.patch:
176+ - new version update
177+
178+ -- Sebastien Bacher <seb128@ubuntu.com> Mon, 29 Mar 2010 10:12:48 +0200
179+
180+rhythmbox (0.12.7git20100325-0ubuntu1) lucid; urgency=low
181+
182+ * Updated to a git snapshot, we backported half of the git commits to lucid
183+ now anyway and a new stable tarball should be rolled next week so better to
184+ update now and test for issues on this version
185+ * Cleaned the stack of git backports we applied to the previous version
186+ * debian/source_rhythmbox.py:
187+ - update by Stuart Langridge to detect the musicstore issues and send those
188+ directly to the right launchpad component
189+
190+ -- Sebastien Bacher <seb128@ubuntu.com> Thu, 25 Mar 2010 14:11:44 +0100
191+
192+rhythmbox (0.12.7-0ubuntu9) lucid; urgency=low
193+
194+ * debian/patches/21_git_ignore_mounts_without_device.patch:
195+ - git change to fix a crasher with the non-mtp devices detection
196+ (lp: #545077)
197+ * debian/patches/22_git_list_hidden_podcasts.patch,
198+ debian/patches/23_git_podcasts_cleaning.patch:
199+ - git changes to fix podcasts cleaning (lp: #545873)
200+
201+ -- Sebastien Bacher <seb128@ubuntu.com> Wed, 24 Mar 2010 23:38:19 +0100
202+
203+rhythmbox (0.12.7-0ubuntu8) lucid; urgency=low
204+
205+ * updated patches ordering
206+ * debian/patches/12_git_correctly_unref_entry.patch:
207+ - git change to correct unref entries and avoid leaking
208+ * debian/patches/13_git_gvfs_unmount_mtp_devices.patch:
209+ - git change to unmount gphoto gvfs mounts so the mtp code can use those
210+ (lp: #348287)
211+ * debian/patches/14_git_null_protect.patch:
212+ - git change to protect against null property values
213+ * debian/patches/15_git_correct_podcast_update.patch:
214+ - git change to correctly update the podcasts lists (lp: #377189)
215+ * debian/patches/16_git_magnatune_fixes.patch:
216+ - git fixes to the magnatune code
217+ * debian/patches/17_git_tags_buffer.patch,
218+ debian/patches/18_git_notify_art_change.patch:
219+ - git changes to fix embedded cover not been displayed sometime
220+ (lp: #533748)
221+ * debian/patches/19_git_no_mtp_on_afc_devices.patch:
222+ - git change to not have mtp take over ipod for afc devices
223+
224+ -- Sebastien Bacher <seb128@ubuntu.com> Tue, 23 Mar 2010 01:16:15 +0100
225+
226+rhythmbox (0.12.7-0ubuntu7) lucid; urgency=low
227+
228+ * No-change rebuild against a reverted CDBS.
229+
230+ -- Steve Kowalik <stevenk@ubuntu.com> Sat, 20 Mar 2010 18:28:07 +1100
231+
232+rhythmbox (0.12.7-0ubuntu6) lucid; urgency=low
233+
234+ * debian/rhythmbox.manpages, debian/rhythmbox.1, debian/rhythmbox-client.1:
235+ - don't install those in the debian directory since they are upstream too
236+ * debian/patches/91_git_mtp_schemas.patch:
237+ - git change to define the mtp options schemas so it's actived and working
238+ * debian/patches/92_git_stop_playback_on_delete.patch:
239+ - git change to fix a crasher on source change (lp: #148361)
240+ * debian/patches/93_git_ipod_crasher.patch:
241+ - git change to fix a crasher when some filenames are copied to ipods
242+ (lp: #476167)
243+ * debian/patches/94_git_no_entry_view_crasher.patch:
244+ - git change to fix a crasher happening sometime when going to
245+ the playing song (lp: #507608)
246+ * debian/patches/95_git_correctly_update_names.patch:
247+ - git change to update sort and display names in correct order (lp: #532538)
248+ * debian/patches/96_git_subsequent_commits.patch:
249+ - git change to fix another crasher (lp: #429030)
250+ * debian/patches/97_git_stop_podcast_download_no_error.patch:
251+ - git change, don't handle podcast download stop as an error
252+
253+ [ Ken VanDine ]
254+ * debian/patches/82_rhythmbox-indicators.patch
255+ - update from Jan Arne Petersen to remove some work arounds
256+ that were needed prior to libappindicator 0.0.16
257+
258+ -- Sebastien Bacher <seb128@ubuntu.com> Fri, 19 Mar 2010 00:29:49 +0100
259+
260+rhythmbox (0.12.7-0ubuntu5) lucid; urgency=low
261+
262+ * debian/control:
263+ - Drop superfluous xulrunner-dev build-depend
264+
265+ -- Chris Coulson <chris.coulson@canonical.com> Wed, 10 Mar 2010 10:16:06 +0000
266+
267+rhythmbox (0.12.7-0ubuntu4) lucid; urgency=low
268+
269+ * debian/patches/82_rhythmbox-indicators.patch:
270+ - update by Jan Arne Petersen to display informations on the
271+ currently playing song in the indicator
272+
273+ -- Sebastien Bacher <seb128@ubuntu.com> Thu, 04 Mar 2010 15:19:03 +0100
274+
275+rhythmbox (0.12.7-0ubuntu3) lucid; urgency=low
276+
277+ * Really ship the apport hook in the vcs and source too
278+
279+ -- Sebastien Bacher <seb128@ubuntu.com> Tue, 02 Mar 2010 16:58:32 +0100
280+
281+rhythmbox (0.12.7-0ubuntu2) lucid; urgency=low
282+
283+ * debian/source_rhythmbox.py:
284+ - apport hook for rhythmbox (lp: #525888)
285+ * debian/rhythmbox.install:
286+ - update to install apport hook
287+
288+ -- Nigel Babu <nigelbabu@gmail.com> Thu, 25 Feb 2010 09:49:44 +0530
289+
290+rhythmbox (0.12.7-0ubuntu1) lucid; urgency=low
291+
292+ * New upstream version:
293+ - New ReplayGain plugin, replacing the old broken ReplayGain code
294+ - Nautilus-sendto plugin
295+ - Support for Magnatune streaming and download accounts
296+ - Support for pidgin in the IM status plugin
297+ - Context pane plugin now uses the GTK+ font settings
298+ - Support for artist and album sort names
299+ - Now depends on GTK+ 2.16, GLib 2.18, and pygobject 2.16
300+
301+ - As GSEAL-ready as we can make it for now
302+ - Compatible with the new totem-plparser save API
303+ - Disentangled 'delete', 'remove', and 'remove from playlist' actions
304+ - Improvements to display of mixed-direction text
305+ - Simplified selection of audio CD tracks to extract
306+ - Playlist creation should work on more generic player devices now
307+ Bugs fixed:
308+ 133444 - Use album and artist sort names (lp: #27664)
309+ 316257 - forward / back mouse buttons should trigger next / previous songs
310+ 338221 - Rhythmbox ignores replaygain tags in DAAP streamed media
311+ 378355 - Magnatune plugin should not print CC# in debug output
312+ 384483 - Open cover in Image Viewer
313+ 424878 - The play button's tool tip "Stop playback" is misleading
314+ 485730 - Better labels for remove/move to trash
315+ 518540 - RTL Song title displayed on wrong side of other track info.
316+ 533727 - Support new Magnatune accounts (lp: #389993)
317+ 537483 - should be possible to import only selected audio cd songs
318+ 542055 - Sort order is not localized
319+ 547174 - Separate the filesystem scanning from the metadata content reading
320+ 559582 - Cleanups for -DG_DISABLE_DEPRECATED
321+ 564800 - GnomeGoals: Remove deprecated GTK+ symbols
322+ 584593 - sample-vala plugin does not build
323+ 584704 - External MP3 players should delete files rether than move to trash
324+ 593188 - Manpages for rhythmbox and rhythmbox-client
325+ 594132 - python binding lacks enum RBMetaDataField
326+ 595795 - Portugu?s Lyrics - Patch to grab lyrics from letras.terra.com.br
327+ 601524 - Slider jumps around at the end of songs
328+ 602015 - Default 'label1' naming of the first Multiple Song info window
329+ 602140 - thread-related segfault in context panel plugin
330+ 602615 - fails to build if ld's --no-add-needed is used
331+ 602616 - strings being URI-unescaped twice in song info window
332+ 602679 - context: encode album names received from last.fm in utf8
333+ 603258 - mpid: don't destroy HAL context twice
334+ 603263 - compilation errors because of wrong g_print format
335+ 603444 - ignore hidden files while enumerating directories
336+ 603876 - LyricWiki should be deleted from the "Song lyrics" plugin
337+ 603929 - Rhythmbox unnecessarily modifying sound files
338+ 604186 - Remove gnome-vfs use in plugins
339+ 604188 - [upnp] Use GIO to get the face icon's mime-type
340+ 604189 - [artdisplay] Simplify save_pixbuf code
341+ 604292 - Use g_atomic_int_* when possible to handle refcounts
342+ 604771 - Adding context to some strings
343+ 605023 - IM Status Plugin patch for Pidgin support
344+ 605038 - Seg Fault When Going to Play List; Visualisation; Browse
345+ 605031 - add "Send to..." button to right click on the song
346+ 605313 - Use totem_pl_parser_save
347+ 605583 - segfault if MTP device open fails
348+ 605584 - Race condition in MTP causes devices to fail to open
349+ 605725 - [context] doesn't use gtk font settings
350+ 606470 - Wrong title for MTP properties dialog
351+ 606472 - Bad alignment for labes in media player properties dialog
352+ 607263 - Playlist creation ignores playlist_format from .is_audio_player
353+ 607265 - M3U playlist is missing #EXTINF info
354+ 607538 - incorrect description for toolbar_style gconf key
355+ 607672 - Podcasts default to rating 3*
356+ 607897 - fix build with warnings=all
357+ 607935 - Crashes with SIGSEGV when trying to enable visualization
358+ (lp: #444023)
359+ 608397 - Rhythmbox does not create working playlists for Sansa Clip+
360+ 609306 - Changing between two sources without query models causes warnings
361+ 609767 - RTL tags in status icon bubble
362+ 609908 - compare track number when checking if tracks already exist on devices
363+ 609916 - CBC Radio 1 & 2 Live Feeds don't work
364+ 610440 - The user agent string must be used when connecting to DAAP shares
365+ 610643 - Fix linkage against librhythmdb.la
366+ 610655 - [patch] enum type mismatch
367+ 610657 - [patch] Linking fails due to multiple definition of _PyGObject_API,
368+ etc.
369+ * debian/patches/90_autoreconf.patch:
370+ - new version update
371+
372+ -- Sebastien Bacher <seb128@ubuntu.com> Mon, 01 Mar 2010 10:19:56 +0100
373+
374+rhythmbox (0.12.6git20100223-0ubuntu3) lucid; urgency=low
375+
376+ [ Jan Arne Petersen ]
377+ * 82_rhythmbox-indicators.patch: Remove icon from "Quit" entry in indicator
378+ menu. (LP: #528531)
379+
380+ -- Martin Pitt <martin.pitt@ubuntu.com> Mon, 01 Mar 2010 10:24:58 +0100
381+
382+rhythmbox (0.12.6git20100223-0ubuntu2) lucid; urgency=low
383+
384+ [ Jan Arne Petersen ]
385+ * 82_rhythmbox-indicators.patch: Fixes some rhythmbox application indicator
386+ bugs (lp: #526552)
387+
388+ -- Martin Pitt <martin.pitt@ubuntu.com> Thu, 25 Feb 2010 19:14:46 +0100
389+
390+rhythmbox (0.12.6git20100223-0ubuntu1) lucid; urgency=low
391+
392+ * New git snapshot:
393+ - don't crash when enabling visualisation (lp: #525891)
394+ - rebuild using new gnome-media which doesn't use libglade (lp: #508227)
395+ * debian/rhythmbox-plugins.install:
396+ - new version update
397+ * debian/rules:
398+ - use the correct installation target
399+
400+ -- Sebastien Bacher <seb128@ubuntu.com> Wed, 24 Feb 2010 01:14:11 +0100
401+
402+rhythmbox (0.12.6git20100218-0ubuntu1) lucid; urgency=low
403+
404+ * Updated to a git version to give some testing to the upstream code before
405+ the next tarball, the udate fixes those issues:
406+ - "The play button's tool tip "Stop playback" is misleading" (lp: #97442)
407+ - "double-click the cover art to open it" (lp: #178517)
408+ - "Rhythmbox crashes when opening song info box" (lp: #399052)
409+ - "Slider jumps around at the end of songs" (lp: #474139)
410+ - "rhythmbox freezes randomly" (lp: #487932)
411+ - "CBC Radio 1 & 2 Live Feeds need updating" (lp: #521474)
412+ * debian/control.in:
413+ - updated the pygobject and gtk requirements
414+ * debian/patches/81_not_using_localmodlibs.patch,
415+ debian/patches/91_git_change_use_new_totemplparser.patch:
416+ - dropped, the changes are in the new version
417+ * debian/patches/82_rhythmbox-indicators.patch:
418+ - update to the new version by Jan Arne Petersen
419+ * debian/rhythmbox-plugins.install:
420+ - updated to list replaygain and sendto
421+
422+ -- Sebastien Bacher <seb128@ubuntu.com> Thu, 18 Feb 2010 15:34:50 +0100
423+
424+rhythmbox (0.12.6-1ubuntu10) lucid; urgency=low
425+
426+ * debian/patches/82_rhythmbox-indicators.patch:
427+ - use correctly icon on start again now that the application indicators
428+ handle icons installed in other directories correctly (lp: #522955)
429+
430+ -- Sebastien Bacher <seb128@ubuntu.com> Wed, 17 Feb 2010 11:56:05 +0100
431+
432+rhythmbox (0.12.6-1ubuntu9) lucid; urgency=low
433+
434+ * debian/control.in:
435+ - only recommends python-webkit and python-mako since those are not
436+ strictly required
437+ - recommends the cdrecord option rather than suggests, that's something
438+ users probably expect to see working on the default installation
439+ * debian/rules:
440+ - updated with some of the debian changes
441+ * Backported Debian change
442+ * Split plugins in a separate rhythmbox-plugins package, plus another
443+ one for the coherence plugin and one for the cdrecorder plugin.
444+ Mostly based on a patch by Yves-Alexis Perez. Closes: #566711. (lp: #160592)
445+ * rhythmbox-plugins depends on python-webkit and python-mako.
446+ Closes: #558203. (lp: #498816)
447+
448+ -- Sebastien Bacher <seb128@ubuntu.com> Tue, 16 Feb 2010 17:22:09 +0100
449+
450+rhythmbox (0.12.6-1ubuntu8) lucid; urgency=low
451+
452+ * debian/rhythmbox.gconf-defaults:
453+ - set the library watching option on by default, thank Rodrigo Moya
454+
455+ -- Sebastien Bacher <seb128@ubuntu.com> Thu, 04 Feb 2010 19:51:37 -0800
456+
457+rhythmbox (0.12.6-1ubuntu7) lucid; urgency=low
458+
459+ * debian/patches/91_git_change_use_new_totemplparser.patch:
460+ - git change to fix build with the new totem-pl-parser
461+
462+ -- Sebastien Bacher <seb128@ubuntu.com> Thu, 04 Feb 2010 19:24:52 -0800
463+
464+rhythmbox (0.12.6-1ubuntu6) lucid; urgency=low
465+
466+ * debian/patches/82_rhythmbox-indicators.patch:
467+ - enabled notifications again (LP: #498588)
468+
469+ -- Ken VanDine <ken.vandine@canonical.com> Wed, 13 Jan 2010 11:37:12 -0500
470+
471+rhythmbox (0.12.6-1ubuntu5) lucid; urgency=low
472+
473+ * debian/patches/82_rhythmbox-indicators.patch:
474+ - Updated patch fixing icon paths
475+ * debian/control.in
476+ - bump build depends for libappindicator-dev to 0.0.7
477+
478+ -- Ken VanDine <ken.vandine@canonical.com> Fri, 08 Jan 2010 22:54:59 -0500
479+
480+rhythmbox (0.12.6-1ubuntu4) lucid; urgency=low
481+
482+ * debian/patches/82_rhythmbox-indicators.patch:
483+ - change the default icon used for one not installed in the rhythmbox
484+ directory to workaround an indicator issue (lp: #497095)
485+
486+ -- Sebastien Bacher <seb128@ubuntu.com> Thu, 07 Jan 2010 11:03:36 +0100
487+
488+rhythmbox (0.12.6-1ubuntu3) lucid; urgency=low
489+
490+ * debian/patches/82_rhythmbox-indicators.patch
491+ - Add menu item to Show window (LP: #497074)
492+
493+ -- Ken VanDine <ken.vandine@canonical.com> Tue, 15 Dec 2009 15:07:16 -0500
494+
495+rhythmbox (0.12.6-1ubuntu2) lucid; urgency=low
496+
497+ * debian/control.in
498+ - Build-Depends on libappindicator-dev
499+ * debian/patches/82_rhythmbox-indicators.patch
500+ - Add support for application indicators (LP: #495225)
501+
502+ -- Ken VanDine <ken.vandine@canonical.com> Thu, 10 Dec 2009 11:07:56 -0500
503+
504+rhythmbox (0.12.6-1ubuntu1) lucid; urgency=low
505+
506+ * Merge with Debian unstable, reamainging changes:
507+ * debian/control.in:
508+ - Build-Depends on liblaunchpad-integration-dev
509+ - Suggests rather than Recommends gstreamer0.10-plugins-ugly since
510+ it's in universe
511+ - Drop hal build/binary dependencies, add gudev build dependency
512+ - Add media-player-info dependency, where the music player
513+ information is kept now.
514+ - Suggest brasero
515+ - Change gstreamer0.10-plugins-ugly from recommends to suggests
516+ * debian/rules:
517+ - Disable hal
518+ * debian/rhythmbox.gconf-defaults:
519+ - Don't activate the power manager option it breaks suspend for example
520+ * debian/patches/01_lpi.patch:
521+ - Launchpad integration change
522+ * debian/patches/03_magnatune_partner.patch:
523+ - Set Magnatune plugin partner ID to "ubuntu", as per discussion with Magnatune.
524+ * debian/patches/04_podcast_query_info.patch:
525+ - Fix downloading podcasts through buggy servers (LP: #437454)
526+ * debian/patches/80_update_louie_imports.patch:
527+ - Update louie import
528+ * debian/patches/81_not_using_localmodlibs.patch:
529+ - don't use localmodlibs to fix build issue
530+ * debian/patches/90_autoconf.patch:
531+ - Configure update
532+
533+ -- Robert Ancell <robert.ancell@canonical.com> Mon, 30 Nov 2009 15:00:38 +1100
534+
535+rhythmbox (0.12.6-1) unstable; urgency=low
536+
537+ * New upstream release.
538+ - Builds with ld's --no-add-needed and binutils-gold. Closes: #556320.
539+ - debian/patches/01_inhibit_g-session.patch,
540+ debian/patches/02_track_finished.patch:
541+ + Removed, fixed upstream.
542+
543+ -- Emilio Pozuelo Monfort <pochu@debian.org> Sun, 22 Nov 2009 13:07:31 +0100
544+
545+rhythmbox (0.12.6-0ubuntu2) lucid; urgency=low
546+
547+ * debian/patches/81_not_using_localmodlibs.patch,
548+ debian/patches/90_autoconf.patch:
549+ - don't use localmodlibs to fix build issue
550+
551+ -- Sebastien Bacher <seb128@ubuntu.com> Mon, 23 Nov 2009 16:10:27 +0100
552+
553+rhythmbox (0.12.6-0ubuntu1) lucid; urgency=low
554+
555+ * New upstream version:
556+ - Context pane plugin
557+ - Power management plugin reworked to use new D-Bus API
558+ - MTP plugin reworked to do everything asynchronously
559+ - Volume slider levels match what PulseAudio displays
560+ - Playback pipeline filter interfaces actually work properly now
561+ - Much improved visualization performance when crossfading is enabled
562+ Bugs fixed:
563+ 499048 - Filter insertion and removal on non-xfade backend is not robust.
564+ 499051 - xfade backend doesn't play nice with LADSPA filters
565+ 499052 - Filter removal on xfade backend is not robust.
566+ 534981 - Add multi threading to MTP Support (lp: #235726)
567+ 564772 - MTP plugin crash when I plug-in my Creative Zen 32Gb
568+ 564800 - GnomeGoals: Remove deprecated GTK+ symbols
569+ 589845 - im-status: use mission control dbus interface (lp: #424499)
570+ 590474 - Podcast entry disappears from display during download (lp: #451176)
571+ 594901 - Rhythmbox fails to display cover image from id3 tag (lp: #426329)
572+ 595966 - leaked string in rb_stock_icons_init
573+ 596573 - [PATCH] Do not use gnome-power-manager for inhibits,
574+ instead use gnome-session
575+ 597706 - rhythmbox crashed with SIGSEGV in g_object_get() (lp: #445047)
576+ 597708 - rhythmbox crashed with SIGSEGV in rb_source_get_config_widget()
577+ (lp: #444526)
578+ 597708 - DAAP plugin doesn't link to libsoup
579+ 598135 - Should init error before call libhal_device_get_property_string
580+ 598302 - Use GDK spawn functions to handle multi-screen
581+ 598613 - Rhythmbox shows cover art of previous track in Notification Bubble
582+ if current track has no cover art (lp: #451086)
583+ 598955 - Use Cubic volume when StreaVolume interface is available
584+ 600058 - Feed is not parsed when title tag is empty (lp: #468323)
585+ 600513 - Generates invalid Brasero project
586+ 600549 - Crash when transferring a track over MTP with a slash in
587+ the track title
588+ 600624 - track information is not displayed correctly sometimes
589+ when playing internet radios (lp: #467308)
590+ 600995 - Elapsed time indicator is wrong when seeking (lp: #474145)
591+ 601352 - Crash while editing automatic playlist
592+ 601460 - Rhythmbox gets laggy when copying music to iPod
593+ 601528 - Play button doesn't work after finishing a playlist (lp: #474155)
594+ 602615 - rhythmbox fails to build if python bindings are built and ld's
595+ --no-add-needed is used
596+ New and updated translations
597+ * debian/patches/05_brasero_burn_xml.patch:
598+ - the change is in the new version
599+ * debian/patches/90_autoconf.patch:
600+ - new version update
601+ * debian/patches/91_git_change_fix_inhibit_use.patch
602+ - the change is in the new version
603+
604+ -- Sebastien Bacher <seb128@ubuntu.com> Mon, 23 Nov 2009 11:45:02 +0100
605+
606+rhythmbox (0.12.5-2) unstable; urgency=low
607+
608+ [ Josselin Mouette ]
609+ * 01_inhibit_g-session.patch: stolen upstream. Use gnome-session to
610+ inhibit suspension. Closes: #553504.
611+
612+ [ Emilio Pozuelo Monfort ]
613+ * debian/control.in:
614+ - Build depend on xulrunner-dev rather than iceape-dev.
615+ Closes: #555913.
616+
617+ [ Josselin Mouette ]
618+ * 02_track_finished.patch: stolen upstream. Clear the track status
619+ when read has finished. Closes: #555189.
620+
621+ -- Josselin Mouette <joss@debian.org> Thu, 19 Nov 2009 10:59:02 +0100
622+
623+rhythmbox (0.12.5-1) unstable; urgency=low
624+
625+ * New upstream release.
626+
627+ -- Emilio Pozuelo Monfort <pochu@debian.org> Fri, 18 Sep 2009 18:00:38 +0200
628+
629+rhythmbox (0.12.5-0ubuntu5) karmic-proposed; urgency=low
630+
631+ * debian/patches/05_brasero_burn_xml.patch:
632+ - Fix Brasero project <audio> tags when burning tracks (LP: #459103)
633+
634+ -- Robert Ancell <robert.ancell@canonical.com> Tue, 03 Nov 2009 11:14:51 +0100
635+
636+rhythmbox (0.12.5-0ubuntu4) karmic; urgency=low
637+
638+ * debian/patches/04_podcast_query_info.patch:
639+ - Fix downloading podcasts through buggy servers (LP: #437454)
640+
641+ -- Robert Ancell <robert.ancell@canonical.com> Thu, 15 Oct 2009 16:43:55 +1100
642+
643+rhythmbox (0.12.5-0ubuntu3) karmic; urgency=low
644+
645+ * Updated the coherence plugin from upstream authors svn trunk.
646+ (LP: #447620)
647+
648+ -- Charlie Smotherman <cjsmo@ubuntu.com> Fri, 09 Oct 2009 16:19:34 -0500
649+
650+rhythmbox (0.12.5-0ubuntu2) karmic; urgency=low
651+
652+ * debian/patches/91_git_change_fix_inhibit_use.patch:
653+ - git change to fix the current gnome-session inhibit
654+ (lp: #417491)
655+
656+ -- Sebastien Bacher <seb128@ubuntu.com> Thu, 08 Oct 2009 11:10:30 +0200
657+
658+rhythmbox (0.12.5-0ubuntu1) karmic; urgency=low
659+
660+ * New upstream version:
661+ - New cover art search code using discogs.com and MusicBrainz, replacing
662+ the Amazon cover art search that no longer works
663+ - Updated Coherence UPnP plugin
664+ - Clicking on the status icon summons the main window to the current
665+ workspace
666+ Bugs fixed:
667+ 410684 - MusicBrainz cover art search
668+ 590184 - Update .desktop file for new GenericName conventions
669+ 592404 - use correct icon name for the throbber
670+ 592763 - fix some button definitions so the button-images setting works
671+ 593494 - display location column in playlists if enabled
672+ 594008 - fix reading of symlinks with non-ASCII targets (lp :#426981)
673+ 594124 - fix incorrect variable name in gio chunk loader
674+ 594419 - disable non-functional lyricwiki search (lp: #425871)
675+ 594728 - deadlock setting replaygain-adjusted volume (lp: #427215)
676+ New and updated translations
677+ * debian/patches/02_media-player-info-rename.patch:
678+ - the change is in the new version
679+
680+ -- Sebastien Bacher <seb128@ubuntu.com> Fri, 18 Sep 2009 15:11:47 +0200
681+
682+rhythmbox (0.12.4-2ubuntu1) karmic; urgency=low
683+
684+ * Sync on Debian, remaining changes: (LP: #427641)
685+ * debian/control.in:
686+ - Build-Depends on liblaunchpad-integration-dev
687+ - Don't Build-Depends on iceape-dev
688+ - Suggests rather than Recommends gstreamer0.10-plugins-ugly since
689+ it's in universe
690+ - Drop hal build/binary dependencies, add gudev build dependency
691+ - Add media-player-id dependency, where the music player
692+ information is kept now.
693+ * debian/rules:
694+ - Disable hal
695+ * debian/rhythmbox.gconf-defaults:
696+ - Don't activate the power manager option it breaks suspend for example
697+ * debian/patches/01_lpi.patch:
698+ - Launchpad integration change
699+ * debian/patches/03_magnatune_partner.patch:
700+ - Set Magnatune plugin partner ID to "ubuntu", as per discussion with Magnatune.
701+ * debian/patches/90_autoconf.patch:
702+ - Configure update
703+
704+ -- Robert Ancell <robert.ancell@canonical.com> Fri, 11 Sep 2009 11:06:27 +1000
705+
706+rhythmbox (0.12.4-2) unstable; urgency=low
707+
708+ * Stop build-depending on libnautilus-burn-dev, we get the cd burning
709+ support through libbrasero-media-dev.
710+
711+ -- Emilio Pozuelo Monfort <pochu@debian.org> Thu, 03 Sep 2009 17:48:58 +0200
712+
713+rhythmbox (0.12.4-1ubuntu2) karmic; urgency=low
714+
715+ [ Loïc Minier ]
716+ * Suggest brasero.
717+
718+ [ Martin Pitt ]
719+ * Add 02_media-player-info-rename.patch: media-player-id was renamed to
720+ media-player-info, update path. (Gnome #594765)
721+ * debian/control.in: media-player-id → media-player-info.
722+
723+ -- Martin Pitt <martin.pitt@ubuntu.com> Thu, 10 Sep 2009 19:47:10 +0200
724+
725+rhythmbox (0.12.4-1ubuntu1) karmic; urgency=low
726+
727+ [ Robert Ancell ]
728+ * Sync on Debian, remaining changes: (LP: #419711)
729+ * debian/control.in:
730+ - Build-Depends on liblaunchpad-integration-dev
731+ - Don't Build-Depends on iceape-dev
732+ - Suggests rather than Recommends gstreamer0.10-plugins-ugly since
733+ it's in universe
734+ * debian/rhythmbox.gconf-defaults:
735+ - Don't activate the power manager option it breaks suspend for example
736+ * debian/patches/01_lpi.patch:
737+ - Launchpad integration change
738+ * debian/patches/03_magnatune_partner.patch:
739+ - Set Magnatune plugin partner ID to "ubuntu", as per discussion with Magnatune.
740+ * debian/patches/90_autoconf.patch:
741+ - Configure update
742+ * debian/control.in:
743+ - Add BZR link
744+ * debian/patches/01_lpi.patch:
745+ * debian/patches/03_magnatune_partner.patch:
746+ * debian/patches/90_autoconf.patch:
747+ - Updated
748+
749+ [ Martin Pitt ]
750+ * debian/control: Drop hal build/binary dependencies, add gudev build
751+ dependency. Disable hal in debian/rules.
752+ * debian/control: Add media-player-id dependency, where the music player
753+ information is kept now.
754+
755+ -- Martin Pitt <martin.pitt@ubuntu.com> Thu, 27 Aug 2009 12:25:37 +0200
756+
757+rhythmbox (0.12.4-1) unstable; urgency=low
758+
759+ * debian/NEWS: mention that the tray icon is now a plugin. Closes:
760+ #537137, #539612.
761+ * New upstream release.
762+ * Standards-Version is 3.8.3, no changes needed.
763+ * debian/rules:
764+ - Don't pass --with-gecko to configure, it's not used anymore.
765+ - Don't ship librhythmbox-core.so, it's a private library
766+ to be used by rhythmbox and its plugins.
767+ - Exclude /usr/lib/mozilla from the shlibs generation too.
768+
769+ -- Emilio Pozuelo Monfort <pochu@debian.org> Wed, 26 Aug 2009 18:00:42 +0200
770+
771+rhythmbox (0.12.3-1ubuntu2) karmic; urgency=low
772+
773+ * debian/control.in:
774+ - set vcs url
775+ * debian/patches/91_git_change_default_notifications_values.patch:
776+ - git change, display notification icon and bubble by default
777+ (lp: #387938)
778+
779+ -- Sebastien Bacher <seb128@ubuntu.com> Mon, 10 Aug 2009 14:06:45 +0200
780+
781+rhythmbox (0.12.3-1ubuntu1) karmic; urgency=low
782+
783+ * Sync on Debian
784+ * debian/control.in:
785+ - Build-Depends on liblaunchpad-integration-dev
786+ - don't Build-Depends on iceape-dev
787+ - Suggests rather than Recommends gstreamer0.10-plugins-ugly since
788+ it's in universe
789+ * debian/rhythmbox.gconf-defaults:
790+ - don't activate the power manager option it breaks suspend for example
791+ * debian/patches/01_lpi.patch:
792+ - launchpad integration change
793+ * debian/patches/03_magnatune_partner.patch: Set Magnatune plugin
794+ partner ID to "ubuntu", as per discussion with Magnatune.
795+ * debian/patches/90_autoconf.patch:
796+ - configure update
797+ * debian/rules:
798+ - don't use iceape in ubuntu
799+
800+ -- Sebastien Bacher <seb128@ubuntu.com> Thu, 09 Jul 2009 11:51:40 +0200
801+
802+rhythmbox (0.12.3-1) unstable; urgency=low
803+
804+ [ Josselin Mouette ]
805+ * Recommend gvfs-backends. Closes: #529654.
806+
807+ [ Emilio Pozuelo Monfort ]
808+ * New upstream release.
809+ - Migrated to playbin2, can now play chained oggs. Closes: #448215.
810+ * Update build-dependencies.
811+
812+ [ Josselin Mouette ]
813+ * Update README.Debian to indicate that devices need to be mounted for
814+ rhythmbox to see them.
815+ * Only suggest gnome-codec-install, it is way too obnoxious.
816+
817+ [ Sam Morris ]
818+ * New upstream release.
819+ - Increased build-depends on gstreamer, libnotify and libsoup.
820+ - Build-depend on libsoup-gnome2.4-dev.
821+ * Enabled brasero now it's in unstable.
822+
823+ -- Josselin Mouette <joss@debian.org> Wed, 08 Jul 2009 22:49:25 +0200
824+
825+rhythmbox (0.12.1-1) unstable; urgency=low
826+
827+ [ Emilio Pozuelo Monfort ]
828+ * Recommend gnome-codec-install rather than gnome-app-install.
829+ Closes: #523053.
830+ * New upstream release.
831+ - Doesn't exit after the last song. Closes: #525208.
832+ - Doesn't crash when downloading jamendo playlists. Closes: #525766.
833+ - Update build dependencies.
834+ * Remove gstreamer0.10-gnomevfs and libgnomevfs2-extra from Depends
835+ and Recommends, rhythmbox uses gio now. Thanks Sebastien Bacher.
836+ * Require the minimun gstreamer0.10-plugins-base and -good packages
837+ that ship the gio and soup plugins.
838+ * debian/rhythmbox-client.1: Document %st format. LP: #372009.
839+
840+ [ Josselin Mouette ]
841+ * Only suggest control-center.
842+ * Drop recommends on scrollkeeper.
843+ * Build-depend on libglib2.0-doc and libgtk2.0-doc to ensure proper
844+ xrefs.
845+ * Bump requirement on gstreamer according to upstream.
846+ * Require the development package for gst-python.
847+
848+ -- Josselin Mouette <joss@debian.org> Tue, 26 May 2009 18:16:18 +0200
849+
850+rhythmbox (0.12.0-2) unstable; urgency=low
851+
852+ * Upload to unstable.
853+
854+ -- Josselin Mouette <joss@debian.org> Tue, 07 Apr 2009 14:49:45 +0200
855+
856+rhythmbox (0.12.0-1) experimental; urgency=low
857+
858+ [ Loic Minier ]
859+ * Fix super old libgnome2-dev bdep to use -1~ instead of -1; it's likely
860+ that the Debian revision isn't needed, but I can't tell from history.
861+
862+ [ Josselin Mouette ]
863+ * 02_pause_crash.patch: new patch, stolen from upstream. Fixes crashes
864+ when pausing MP3 playback. Closes: #501944.
865+ * Drop Recommends on gnome-volume-manager.
866+
867+ [ Loic Minier ]
868+ * Use ge-nl and lt-nl in postinst for robustness.
869+
870+ [ Josselin Mouette ]
871+ * Drop Recommends on sound-juicer. Closes: #510022.
872+ * Move python-gst0.10 to Depends. Closes: #517451.
873+
874+ [ Rafael Laboissiere ]
875+ * debian/patches/20_compile_with_libmtp8.patch: New patch for fixing
876+ the new number of arguments in function LIBMTP_Send_Track_From_File
877+ (closes: #516564)
878+
879+ [ Emilio Pozuelo Monfort ]
880+ * New upstream release.
881+ - Fix memory leaks and reduce memory consumption. Closes: #432586.
882+ - Use the XDG music dir for podcast downloads, or $HOME if it
883+ doesn't exist, rather than failing. Closes: #485831.
884+ - Don't crash on Alt+Space. Closes: #501944.
885+ - Don't crash when connecting uninitialized iPods. Closes: #478507.
886+ - Update build-dependencies.
887+ - debian/patches/01_gecko_iceape.patch:
888+ + Removed, not needed anymore.
889+ - debian/patches/00_rhythmbox_radio_songinfo.patch,
890+ debian/patches/02_pause_crash.patch,
891+ debian/patches/10_en_GB.po.patch,
892+ debian/patches/20_compile_with_libmtp8.patch:
893+ + Removed, fixed upstream.
894+ * debian/watch: don't uupdate.
895+ * debian/rhythmbox.postinst: removed, the version needed the hack is
896+ not even in oldstable now.
897+ * Let rhythmbox-dbg depend on ${misc:Depends}
898+ * Section of rhythmbox-dbg is debug.
899+ * Standards-Version is 3.8.0, no changes needed.
900+ * debian/pycompat: removed, not needed.
901+ * debian/rhythmbox.1: escape hyphens
902+
903+ [ Josselin Mouette ]
904+ * Update some lagging build-dependencies.
905+ * Re-enable HAL on hurd and kfreebsd.
906+
907+ -- Emilio Pozuelo Monfort <pochu@ubuntu.com> Thu, 19 Mar 2009 18:38:16 +0100
908+
909+rhythmbox (0.11.6-1) unstable; urgency=low
910+
911+ [ Josselin Mouette ]
912+ * 10_en_GB.po.patch: fix minor issue in British translation.
913+ Closes: #487942.
914+
915+ [ Sam Morris ]
916+ * New upstream release.
917+ * Drop 90_from_svn_fix_audioscrobbler_issue.patch,
918+ 91_from_svn_fix_eject_crasher.patch,
919+ 92_from_svn_fix_amazon_coverts_download.patch,
920+ 93_from_svn_fix_cdda_gvfs_handling.patch,
921+ 93_from_svn_fix_xfade_locking_issue.patch,
922+ 94_from_svn_fix_podcast_parsing_issue.patch: incorporated upstream.
923+
924+ -- Josselin Mouette <joss@debian.org> Fri, 18 Jul 2008 22:49:56 +0200
925+
926+rhythmbox (0.11.5-5) unstable; urgency=low
927+
928+ * debian/control.in:
929+ + Don't build depend on vala as it only builds a useless sample plugin
930+ anyway and fails to build with latest vala (Closes: #481395).
931+
932+ -- Sebastian Dröge <slomo@debian.org> Thu, 22 May 2008 10:48:55 +0200
933+
934+rhythmbox (0.11.5-4) unstable; urgency=low
935+
936+ * 01_gecko_iceape.patch: allow iceape as a valid gecko variant.
937+ * Pass --with-gecko=iceape to make it used.
938+ * Build-depend on iceape-dev 1.1.9-5. Closes: #480823.
939+ * Remove unnecessary argument passed to dh_pysupport.
940+ * Put the Debian menu entry in Applications/Sound.
941+ * rhythmbox-small.xpm: downscaled to 32x32 per menu policy (bwahaha).
942+ * Standards version is 3.7.3.
943+ * Build-depend on libvala-dev for vala plugin support.
944+
945+ -- Josselin Mouette <joss@debian.org> Mon, 12 May 2008 21:57:19 +0200
946+
947+rhythmbox (0.11.5-3) unstable; urgency=low
948+
949+ * debian/patches/00_rhythmbox_radio_songinfo.patch
950+ - Added. Fixes radio streams not showing metadata after being paused and
951+ started again.
952+ * Sync a set of fixes from SVN from the Ubuntu packaging:
953+ - debian/patches/90_from_svn_fix_audioscrobbler_issue.patch
954+ + Added. Fixes sending songs data with uri escape sequences still in them
955+ to audioscrobbler
956+ - debian/patches/91_from_svn_fix_eject_crasher.patch
957+ + Added. Fixes crash on eject
958+ - debian/patches/92_from_svn_fix_amazon_coverts_download.patch
959+ + Added. Fix the amazon cover downloader
960+ - debian/patches/93_from_svn_fix_cdda_gvfs_handling.patch
961+ + Added. Handle new-style gvfs cdda URIs
962+ - debian/patches/93_from_svn_fix_xfade_locking_issue.patch
963+ + Added. Fixes some locking issues with the xfade backend
964+ - debian/patches/94_from_svn_fix_podcast_parsing_issue.patch
965+ + Added. Fix parsing problems with some podcasts (Closes: #473412)
966+
967+ -- Sjoerd Simons <sjoerd@debian.org> Sat, 03 May 2008 12:23:44 +0200
968+
969+rhythmbox (0.11.5-2) unstable; urgency=low
970+
971+ [ Norbert Tretkowski ]
972+ * Recommend python-gst0.10, most plugins are useless without it.
973+ (closes: #472849)
974+
975+ [ Loic Minier ]
976+ * Suggest python-coherence instead of python-louie and update description;
977+ Franklin Piat; closes: #474733.
978+
979+ -- Norbert Tretkowski <nobse@debian.org> Fri, 04 Apr 2008 10:49:18 +0200
980+
981+rhythmbox (0.11.5-1) unstable; urgency=low
982+
983+ [ Norbert Tretkowski ]
984+ * New upstream development release, upload to unstable.
985+ * Add python-gst0.10 to Build-Dependencies.
986+ * Update libtotem-plparser-dev Build-Dependency.
987+
988+ [ Loic Minier ]
989+ * Suggest python-louie for UPnP support; thanks Amaya Rodrigo Sastre;
990+ closes: #452087.
991+ * Rename debian/rhythmbox.xpm to rhythmbox-small.xpm; update the menu file
992+ to use this icon; should permit the .desktop file to prefer the SVG.
993+ * Update the XPM file with the new SVG artwork.
994+
995+ [ Sam Morris ]
996+ * Update libnotify-dev Build-Dependency.
997+ * Build-depend on libxul-dev for the Mozilla browser iTunes Music Store
998+ plugin.
999+ * Recommend gnome-app-install for automatic codec installation.
1000+ * Build-depend on libsoup2.4-dev.
1001+
1002+ -- Norbert Tretkowski <nobse@debian.org> Fri, 21 Mar 2008 09:59:09 +0100
1003+
1004+rhythmbox (0.11.2-1) experimental; urgency=low
1005+
1006+ [ Norbert Tretkowski ]
1007+ * New upstream development release.
1008+ - Fix crash in preferences dialog; GNOME #455232; closes: #443169.
1009+ * Versioned dependency on python-gnome2; closes: #436719.
1010+
1011+ [ Sven Arvidsson ]
1012+ * Update man page for rythmbox-client.
1013+
1014+ [ Loic Minier ]
1015+ * Only recommend gstreamer0.10-plugins-ugly; closes: #436736.
1016+
1017+ -- Norbert Tretkowski <nobse@debian.org> Sat, 13 Oct 2007 14:17:51 +0200
1018+
1019+rhythmbox (0.11.1-1) experimental; urgency=low
1020+
1021+ [ Loic Minier ]
1022+ * Document the need for gstreamer0.10-plugins-bad to play mms:// web radios
1023+ and suggest the package; thanks Alexis Bezverkhyy; closes: #429991.
1024+ * New upstream development release.
1025+ - Add a libmtp-dev build-dep for MTP support.
1026+ - Drop patches 80_from_bugzilla_fix_crash_on_eject,
1027+ 81_from_bugzilla_fix_unknown_tags,
1028+ and 81_from_bugzilla_process_pending_events, merged upstream.
1029+
1030+ -- Loic Minier <lool@dooz.org> Tue, 26 Jun 2007 16:28:06 +0200
1031+
1032+rhythmbox (0.11.0-1) experimental; urgency=low
1033+
1034+ * New upstream development series; use at your own risk.
1035+ - Target at experimental; include check-dist.
1036+ - Bump up build-deps to libgtk2.0-dev >= 2.8.0, libgnomevfs2-dev >= 2.8.0,
1037+ libgstreamer0.10-dev >= 0.10.11, libgstreamer-plugins-base0.10-dev
1038+ >= 0.10.4, libglib2.0-dev >= 2.13.0.
1039+ - Add vala support to TODO.
1040+ - Search now ignores diacritics; closes: #425806.
1041+ * Build-depend on python-gtk2-dev >= 2.10 and python-gtk2 >= 2.10;
1042+ closes: #427056.
1043+ * New patch, 80_from_bugzilla_fix_crash_on_eject, fixes crash on iPod eject;
1044+ Ubuntu #117724; found in the Ubuntu package.
1045+ * New patch, 81_from_bugzilla_fix_unknown_tags, fixes songs having "Unknown"
1046+ tags when both ID3v1 and ID3v2 tags exist with possible trailing
1047+ whitespace; GNOME #442792; found in the Ubuntu package.
1048+ * New patch, 81_from_bugzilla_process_pending_events, process pending events
1049+ so that tags aren't randomly ignored, complements
1050+ 81_from_bugzilla_fix_unknown_tags; found in the Ubuntu package.
1051+
1052+ -- Loic Minier <lool@dooz.org> Tue, 19 Jun 2007 15:04:22 +0200
1053+
1054+rhythmbox (0.10.1-1) unstable; urgency=low
1055+
1056+ * Recommend libgnomevfs2-extra to fetch album art; thanks Tom Parker;
1057+ closes: #423830, #424753.
1058+ * New upstream stable release.
1059+ * Wrap build-deps and deps.
1060+ * Watch all stable versions in watch file.
1061+ * Misc cleanups.
1062+
1063+ -- Loic Minier <lool@dooz.org> Tue, 29 May 2007 14:08:14 +0200
1064+
1065+rhythmbox (0.10.0-3) unstable; urgency=low
1066+
1067+ [ Sven Arvidsson ]
1068+ * Add a -dbg package (Closes: #419891).
1069+ - Bump up build-dep of cdbs to >= 0.4.37.
1070+ - Let rhythmbox-dbg recommend the available GStreamer -dbg packages
1071+
1072+ -- Loic Minier <lool@dooz.org> Sat, 12 May 2007 10:02:47 +0200
1073+
1074+rhythmbox (0.10.0-2) unstable; urgency=low
1075+
1076+ * Upload to unstable; closes: #423478.
1077+
1078+ -- Loic Minier <lool@dooz.org> Sat, 12 May 2007 09:53:42 +0200
1079+
1080+rhythmbox (0.10.0-1) experimental; urgency=low
1081+
1082+ * Fix 0.9.8-4 changelog entry.
1083+ * New upstream release.
1084+ - Drop patch 01_xoverlay-fix, merged upstream.
1085+
1086+ -- Loic Minier <lool@dooz.org> Wed, 04 Apr 2007 11:22:13 +0200
1087+
1088+rhythmbox (0.9.8-4) experimental; urgency=low
1089+
1090+ * Let rhythmbox recommend gnome-control-center >= 2.15.90 for
1091+ gnome-sound-properties; conflict with gnome-control-center << 2.15.90 as
1092+ the bundled gnome-sound-properties is not aware of GStreamer profiles;
1093+ update README.Debian accordingly.
1094+
1095+ -- Loic Minier <lool@dooz.org> Fri, 23 Mar 2007 11:31:26 +0100
1096+
1097+rhythmbox (0.9.8-3) experimental; urgency=high
1098+
1099+ * Depend on gstreamer0.10-x, fixes segfault in the visualization plugin;
1100+ closes: #414273.
1101+
1102+ -- Loic Minier <lool@dooz.org> Sun, 11 Mar 2007 18:51:49 +0100
1103+
1104+rhythmbox (0.9.8-2) experimental; urgency=low
1105+
1106+ * New patch, 01_xoverlay-fix, to stop visualizer
1107+ problems when no x overlay is found; from upstream r4915;
1108+ thanks Jonathan Matthew (Closes: #414273)
1109+
1110+ -- Sven Arvidsson <sa@whiz.se> Sat, 10 Mar 2007 21:35:15 +0100
1111+
1112+rhythmbox (0.9.8-1) experimental; urgency=low
1113+
1114+ * New upstream release; "Type slowly".
1115+ - Drop patch 10_gnome-power-manager-active-key, merged upstream.
1116+ - Drop patch 94_from-svn-fix-soup-headers, merged upstream.
1117+ - Delete *.la and *.a files for the new shared lib.
1118+ - Ship shlibs, but exclude plugins from shlibs generation.
1119+ * Don't overwrite DEB_INSTALL_MANPAGES_rhythmbox.
1120+ * Move man pages to rhythmbox.manpages.
1121+ * Drop obsolete clean rule.
1122+ * Bump up python-support build-dep to >= 0.5.3 and drop dh_python call.
1123+
1124+ -- Loic Minier <lool@dooz.org> Thu, 22 Feb 2007 14:39:46 +0100
1125+
1126+rhythmbox (0.9.7-2) experimental; urgency=low
1127+
1128+ [ Sven Arvidsson ]
1129+ * Merge 0.9.6-6.
1130+
1131+ [ Loic Minier ]
1132+ * Add a get-orig-source target to retrieve the upstream tarball.
1133+ * Merge final bits from 0.9.6-6.
1134+
1135+ -- Loic Minier <lool@dooz.org> Sat, 27 Jan 2007 09:36:29 +0100
1136+
1137+rhythmbox (0.9.7-1) experimental; urgency=low
1138+
1139+ * New upstream release, "I love Perth".
1140+ - Bump up libgpod-dev build-dep to >= 0.4.
1141+ - Drop patch 10_podcasts-with-html-mime-type, merged upstream.
1142+ - Drop patch 90_from_cvs_fix_crash_when_disconnecting_ipod, merged
1143+ upstream.
1144+ - Drop patch 91_from_cvs_fix_crasher_when_closing_while_playing_cd,
1145+ merged upstream.
1146+ - Drop patch 92_from_cvs_set_codeset_to_utf8, merged upstream.
1147+ - Drop patch 93_from_cvs_fix_crash_on_song_edition, merged upstream.
1148+ - New patch, 10_gnome-power-manager-active-key, fixes a copy-paste typo in
1149+ the GConf schema for the gnome-power-manager enable/disable key;
1150+ GNOME #387527.
1151+
1152+ -- Loic Minier <lool@dooz.org> Tue, 19 Dec 2006 15:36:05 +0100
1153+
1154+rhythmbox (0.9.6-6) unstable; urgency=low
1155+
1156+ [ Sven Arvidsson ]
1157+ * Update man page, add man page for rhythmbox-client
1158+ (Closes: #386372, #401638)
1159+ * Removed broken scripts, rb-print-playing.py and rb-set-rating.py.
1160+ Partly superseded by rhythmbox-client.
1161+ * Recommend notification-daemon (Closes: #381233)
1162+
1163+ [ Loic Minier ]
1164+ * Add a get-orig-source target to retrieve the upstream tarball.
1165+ * New patch, 94_from-svn-fix-soup-headers, to fix call to
1166+ soup_headers_parse_response with libsoup 2.2.99; backported from upstream
1167+ r4760; thanks Jonathan Matthew; closes: #406688.
1168+
1169+ -- Loic Minier <lool@dooz.org> Sat, 27 Jan 2007 09:34:11 +0100
1170+
1171+rhythmbox (0.9.6-5) unstable; urgency=high
1172+
1173+ * Recommend hal; closes: #380503.
1174+
1175+ -- Loic Minier <lool@dooz.org> Sun, 17 Dec 2006 11:29:12 +0100
1176+
1177+rhythmbox (0.9.6-4) unstable; urgency=low
1178+
1179+ * Drop libhal-dev build-dep on kfreebsd and hurd; thanks Petr Salinger;
1180+ closes: #401601.
1181+
1182+ -- Loic Minier <lool@dooz.org> Mon, 4 Dec 2006 21:25:27 +0100
1183+
1184+rhythmbox (0.9.6-3) unstable; urgency=low
1185+
1186+ * Depend on gnome-icon-theme; closes: #382529, #391769.
1187+
1188+ -- Loic Minier <lool@dooz.org> Wed, 25 Oct 2006 12:15:38 +0200
1189+
1190+rhythmbox (0.9.6-2) unstable; urgency=low
1191+
1192+ * Stop shipping *.a and *.la files of plugins.
1193+ * Recommend g-v-m for iPod support; document this in README.Debian.
1194+ * New patch, 90_from_cvs_fix_crash_when_disconnecting_ipod, fixes a crash
1195+ when disconnecting an iPod; from upstream; found in the Ubuntu package;
1196+ Ubuntu #63985.
1197+ * New patch, 91_from_cvs_fix_crasher_when_closing_while_playing_cd, fixes a
1198+ crash when closing Rhythmbox during CD playback; from CVS; found in the
1199+ Ubuntu package.
1200+ * New patch, 92_from_cvs_set_codeset_to_utf8, to force the charset of
1201+ GStreamer messages to UTF-8, fixes a crash; from CVS; found in the Ubuntu
1202+ package; GNOME #359083.
1203+ * New patch, 93_from_cvs_fix_crash_on_song_edition, fixes a crasher when
1204+ editing a song; from CVS; found in the Ubuntu package; GNOME #359083.
1205+ * New patch, 10_podcasts-with-html-mime-type, to accept parsing Postcasts
1206+ served as html as MIME type; thanks Matt Kraai; closes: 394961.
1207+
1208+ -- Loic Minier <lool@dooz.org> Tue, 24 Oct 2006 21:55:40 +0200
1209+
1210+rhythmbox (0.9.6-1) unstable; urgency=low
1211+
1212+ * New upstream release.
1213+ - Build-depend on libgnome-keyring-dev for gnome-keyring support of DAAP
1214+ shares.
1215+ - Drop --enable-tag-writing from configure args, it is now the default.
1216+ - Bump libnautilus-burn-dev build-dep to >= 2.14 to ensure most functions
1217+ are available.
1218+ - Bump python-gtk2-dev build-dep to >= 2.8.0.
1219+ - Depend on python-gnome2 for gnomevfs support in plugins.
1220+ - Drop patch 03_dbus0.9, merged upstream.
1221+ - Smarter about creating podcast file names; closes: #350802.
1222+ - HTTP proxy-related fixes/improvements; closes: #370751.
1223+ - Doesn't try to download an episode if it couldn't be parsed;
1224+ closes: #371868.
1225+ * Build-depend on cdbs >= 0.4.35 instead of calling dh_installmime manually.
1226+ * Leave the Rhythmbox Development Reference Manual in the gtk-doc canonical
1227+ location, and symlink to it instead.
1228+ * Bump Debhelper compatibility level to 5.
1229+ * Convert to new Python Policy.
1230+ - Build-depend on python-support (>= 0.4).
1231+ - Bump up Debhelper build-dep to 5.0.37.2.
1232+ - Set Python compatibility level to 2.
1233+ - Add XS-Python-Version with ">= 2.3".
1234+ - Add XB-Python-Version to rhythmbox.
1235+ - Call dh_pysupport and dh_python; pass /usr/lib/rhythmbox/plugins to
1236+ dh_pysupport.
1237+ - Depend on ${python:Depends}.
1238+ - Depend on python-gtk2.
1239+
1240+ -- Loic Minier <lool@dooz.org> Sun, 1 Oct 2006 18:37:08 +0200
1241+
1242+rhythmbox (0.9.5-3) unstable; urgency=low
1243+
1244+ * New patch, 03_dbus0.9.patch, to use dbus_connection_close() instead of
1245+ dbus_connection_disconnect() which will be removed in dbus >= 0.90; thanks
1246+ Sebastian Dröge. (Closes: #385381)
1247+
1248+ -- Loic Minier <lool@dooz.org> Thu, 31 Aug 2006 11:29:09 +0200
1249+
1250+rhythmbox (0.9.5-2) unstable; urgency=low
1251+
1252+ * Fix spelling of Podcasts, thanks mlind (feenix) and Sébastien Bacher.
1253+ (Ubuntu: #54336)
1254+
1255+ -- Loic Minier <lool@dooz.org> Fri, 28 Jul 2006 14:39:48 +0200
1256+
1257+rhythmbox (0.9.5-1) unstable; urgency=low
1258+
1259+ * New upstream release.
1260+
1261+ -- Loic Minier <lool@dooz.org> Thu, 22 Jun 2006 20:24:45 +0200
1262+
1263+rhythmbox (0.9.4.90-1) experimental; urgency=low
1264+
1265+ * New upstream pre-release of 0.9.5.
1266+ - Update James Livingston's email address.
1267+ [debian/copyright]
1268+ - Bump up libgtk2.0-dev build-dep to >= 2.6.0.
1269+ [debian/control, debian/control.in]
1270+ - Add a libgnome-media-dev (>= 2.8) build-dep for track transfer support.
1271+ [debian/control, debian/control.in]
1272+ - Drop libbonobo2-dev and liborbit2-dev build-deps.
1273+ [debian/control, debian/control.in]
1274+ - Don't configure with --enable-daap as this is now the default.
1275+ [debian/rules]
1276+ - Drop libnotify version checks patch, merged upstream.
1277+ [debian/patches/10_eggtrayicon-libnotify-version-checks.patch]
1278+ - Use local copies of the rb-print-playing.py and rb-set-rating.py samples
1279+ as they didn't end in the tarball.
1280+ [debian/rb-print-playing.py, debian/rb-set-rating.py,
1281+ debian/rhythmbox.install]
1282+
1283+ -- Loic Minier <lool@dooz.org> Thu, 8 Jun 2006 08:36:56 +0200
1284+
1285+rhythmbox (0.9.4.1-6) unstable; urgency=low
1286+
1287+ * Ship Rhythmbox Development Reference Manual below /usr/share/doc/rhythmbox
1288+ instead of /usr/share/gtk-doc/html/rhythmbox. (Closes: #363143)
1289+ [debian/rules]
1290+
1291+ -- Loic Minier <lool@dooz.org> Mon, 22 May 2006 15:30:25 +0200
1292+
1293+rhythmbox (0.9.4.1-5) unstable; urgency=low
1294+
1295+ * Fix postinst to repair the scrollkeeper db only when scrollkeeper is
1296+ installed, hence do repair for upgrades from <= 0.9.4.1-5.
1297+ (Closes: #368279)
1298+ [debian/rhythmbox.postinst]
1299+
1300+ -- Loic Minier <lool@dooz.org> Sun, 21 May 2006 10:29:28 +0200
1301+
1302+rhythmbox (0.9.4.1-4) unstable; urgency=low
1303+
1304+ * Recommend sound-juicer for audio CD ripping, thanks Jack.
1305+ (Closes: #367980)
1306+ [debian/control, debian/control.in]
1307+ * Rebuild against unstable's libsexy. (Closes: #368069)
1308+
1309+ -- Loic Minier <lool@dooz.org> Fri, 19 May 2006 20:34:04 +0200
1310+
1311+rhythmbox (0.9.4.1-3) unstable; urgency=low
1312+
1313+ * Update description to mention Audio CD playback, Generic portable audio
1314+ player support, and Podcasts, thanks Sven Arvidsson. (Closes: #367035)
1315+ [debian/control, debian/control.in]
1316+ * Removed obsolete pipelines. (Closes: #367192)
1317+ [debian/README.Debian]
1318+ * Rebuild scrollkeeper database completely if upgrading from versions
1319+ >= 0.9.4.1-1 and < 0.9.4.1-3.
1320+ [debian/rhythmbox.postinst]
1321+ * New patch to take a CVS version of widgets/eggtrayicon.c and additional
1322+ libnotify version checks fixes. (Closes: #367713)
1323+ [debian/patches/10_eggtrayicon-libnotify-version-checks.patch]
1324+
1325+ -- Loic Minier <lool@dooz.org> Thu, 18 May 2006 14:29:26 +0200
1326+
1327+rhythmbox (0.9.4.1-2) unstable; urgency=medium
1328+
1329+ * Disable scrollkeeper-update run in "make install" with configure's
1330+ --disable-scrollkeeper.
1331+ [debian/rules]
1332+
1333+ -- Loic Minier <lool@dooz.org> Sun, 7 May 2006 11:59:08 +0200
1334+
1335+rhythmbox (0.9.4.1-1) unstable; urgency=low
1336+
1337+ * New upstream release.
1338+ * Bump up Standards-Version to 3.7.2.
1339+ [debian/control, debian/control.in]
1340+
1341+ -- Loic Minier <lool@dooz.org> Sat, 6 May 2006 17:03:17 +0200
1342+
1343+rhythmbox (0.9.4-1) unstable; urgency=low
1344+
1345+ * New upstream release.
1346+ - Fixes handling of songs with "&" in tags. (Closes: #353226)
1347+ - Remembers window visibility between sessions. (Closes: #223257)
1348+ - New --no-update command-line flag to skip any check for changes on files
1349+ of the library. (Closes: #200586, #332584)
1350+ - Sorts automatic playlists. (Closes: #220481)
1351+ - Music sharing is now documented in the manual. (Closes: #355234)
1352+ - Goes to next song when you delete the current one. (Closes: #205976)
1353+ - Update address of Jonathan Matthew.
1354+ [debian/copyright]
1355+ - Pass --enable-lirc to configure.
1356+ [debian/rules]
1357+ - Document the need to bump up the nautilus-burn build-dep in later
1358+ uploads.
1359+ [debian/TODO]
1360+ - Build-depend on libsexy-dev (>= 0.1.5).
1361+ [debian/control, debian/control.in]
1362+ - Build-depend on python, python-gtk2-dev, python-dev.
1363+ [debian/control, debian/control.in]
1364+ - Build-depend on gnome-doc-utils (>= 0.3.2).
1365+ [debian/control, debian/control.in]
1366+ * Ship sample Python scripts to access Rhythmbox via dbus to retrieve things
1367+ like the name of the currently playing song. (Closes: #230302)
1368+ [debian/rhythmbox.install]
1369+ * Rework the description to mention sharing.
1370+ [debian/control, debian/control.in]
1371+ * Document the Avahi dependency in README.Debian.
1372+ [debian/README.Debian]
1373+
1374+ -- Loic Minier <lool@dooz.org> Sun, 16 Apr 2006 18:33:44 +0200
1375+
1376+rhythmbox (0.9.3.1-1) unstable; urgency=low
1377+
1378+ * New upstream release.
1379+
1380+ -- Loic Minier <lool@dooz.org> Sun, 5 Feb 2006 14:48:09 +0100
1381+
1382+rhythmbox (0.9.3-1) unstable; urgency=low
1383+
1384+ * New upstream release.
1385+ - Fix crashes with Ogg Vorbis and FLAC. (Closes: #348021)
1386+ - Shell invocations don't bring up the window. (Closes: #349686)
1387+ - Now offers links to last.fm instead of allmusic.com.
1388+ (Closes: #225088, #270245)
1389+ - Now saves the database every 5 minutes if dirty.
1390+ (Closes: #271215, #335785)
1391+ - Now restores the state of the window completely when de-iconifying.
1392+ (Closes: #301846)
1393+ - Add libnotify-dev >= 0.2.2 build-dep.
1394+ [debian/control, debian/control.in]
1395+ - Bump libgnomevfs2-dev build-dep to >= 2.7.4
1396+ [debian/control, debian/control.in]
1397+ - Bump libtotem-plparser-dev build-dep to >= 1.1.5.
1398+ [debian/control, debian/control.in]
1399+ - Add libglade2-dev build-dep.
1400+ [debian/control, debian/control.in]
1401+ - Drop useless --enable-ipod from DEB_CONFIGURE_EXTRA_FLAGS and comment
1402+ on the other flags.
1403+ - Switch to a GStreamer 0.10 sound-system.
1404+ . Should avoid gap between songs. (Closes: #293437)
1405+ . Should be faster to index new directories. (Closes: #320678)
1406+ . Drop GStreamer 0.8 build-deps.
1407+ [debian/control, debian/control.in]
1408+ . Add libgstreamer0.10-dev, libgstreamer-plugins-base0.10-dev
1409+ build-deps.
1410+ [debian/control, debian/control.in]
1411+ . Add gstreamer0.10-gnomevfs, gstreamer0.10-plugins-base,
1412+ gstreamer0.10-plugins-good, gstreamer0.10-plugins-ugly,
1413+ libgstreamer0.10-0, and gstreamer0.10-alsa | gstreamer0.10-audiosink
1414+ deps to rhythmbox.
1415+ [debian/control, debian/control.in]
1416+ . Drop gstreamer0.8 deps for rhythmbox.
1417+ [debian/control, debian/control.in]
1418+ - Bump libavahi-client-dev and libavahi-glib-dev to >= 0.6.
1419+ [debian/control, debian/control.in]
1420+ - Add zlib1g-dev build-dep.
1421+ [debian/control, debian/control.in]
1422+ - Bump libmusicbrainz-dev build-dep to >= 2.1.0.
1423+ [debian/control, debian/control.in]
1424+ - Add libx11-dev build-dep but keep the libxt-dev build-dep for now.
1425+ [debian/control, debian/control.in]
1426+ - Add libglib2.0-dev build-dep for glib-genmarshal.
1427+ [debian/control, debian/control.in]
1428+ - Add gtk-doc-tools >= 1.4 build-dep.
1429+ [debian/control, debian/control.in]
1430+ - Drop obsolete DBus 0.60 patch (merged upstream).
1431+ [debian/patches/07_dbus060.patch]
1432+ * Downgrade the avahi-daemon dependency to a Recommends since Rhythmbox
1433+ now starts without any error dialog when avahi-daemon isn't running.
1434+ (Closes: #349478, #349533)
1435+ [debian/control, debian/control.in]
1436+ * Include full GPL block and full AUTHORS list.
1437+ [debian/copyright]
1438+ * Use HTTP in watch file.
1439+ [debian/watch]
1440+ * Misc doc updates.
1441+ [debian/rules, debian/README.Debian, debian/TODO]
1442+ * Drop obsolete NEWS file.
1443+ [debian/NEWS]
1444+
1445+ -- Loic Minier <lool@dooz.org> Thu, 2 Feb 2006 22:22:18 +0100
1446+
1447+rhythmbox (0.9.2-3) unstable; urgency=low
1448+
1449+ * Depend on dbus, command-line invocations should work again, thanks Alexis
1450+ Papadopoulos and Sjoerd Simons. (Closes: #348168)
1451+ [debian/control, debian/control.in]
1452+ * Depend on avahi-daemon for DAAP music sharing.
1453+ [debian/control, debian/control.in]
1454+
1455+ -- Loic Minier <lool@dooz.org> Mon, 16 Jan 2006 18:10:22 +0100
1456+
1457+rhythmbox (0.9.2-2) unstable; urgency=low
1458+
1459+ * Upload to unstable.
1460+ * Add libgpod-dev to build-depends to reenable iPod support
1461+ (closes: #346006). [debian/control.in]
1462+ * Update description. [debian/control.in]
1463+ * Make ALSA the default GStreamer audiosink. [debian/control.in]
1464+
1465+ -- Jordi Mallach <jordi@debian.org> Tue, 10 Jan 2006 21:11:18 +0100
1466+
1467+rhythmbox (0.9.2-1) experimental; urgency=low
1468+
1469+ * New upstream version:
1470+ - Add podcast support
1471+ - Podcast fixes and improvements
1472+ - Add support for audioscrobbler/last.fm submission
1473+ - Add audio CD support
1474+ - Use libgpod, add support for ipod playlists
1475+ - Make more strings translatable
1476+ - Stop when reaching end of playlist in linear mode
1477+ - Fix lots of window-state weirdness
1478+ - Remember window position
1479+ - Fix memory leaks
1480+ - Make hidden/shown window policy better
1481+ - DBus interface improvements
1482+ - Use natural sorting order
1483+ - Fix "show window" in tray icon menu to toggle correctly
1484+ - Don't share hidden tracks with DAAP
1485+ - Make connecting to DAAP shares asynchronous
1486+ - Make DAAP work on 64 bit systems
1487+ - Make tag-writing safer
1488+ - Fix memory leaks
1489+ - Make default stations actually show up
1490+ - Make dragging playlists copy not move files
1491+ - Fix re-ordering problems
1492+ - Save the database regularly
1493+ - Show disc number in info window
1494+ - UI and HIG fixes
1495+ - Allow search box to match multiple properties
1496+ - Report iradio errors better
1497+ - Make date formats correct in all locales
1498+ - Fix drag-and-drop of URLs
1499+ - Mork better with autofs mounts
1500+ - Don't wedge gnome-vfs-daemon
1501+ - Use chunked loading/sending of daap files
1502+ - Allow Anjuta to import the source tree
1503+ - Add support for year/date metadata
1504+ - Display errors in the radio properties
1505+ - Add file-overwrite dialogs for GTK 2.8
1506+ - Add "Edit Playlist" item to main menu
1507+ - Make new radio station use the properties dialog
1508+ - Display the count in the "All" line of browsers
1509+ - Fix query-model refcount and polling problems
1510+ - Fix emission of entry-changed signals on startip
1511+ - Support gzip encoded DAAP
1512+ - Allow pause by middle-clicking on the tray icon
1513+ - Start some RhythmDB API docs
1514+ - Don't display error if Avahi daemon isn't running
1515+ - Emit single "icon missing" warning
1516+ - Store the bitrate for radio streams
1517+ - Bring back per-source search box text
1518+ - GObject-ify rb-daap-connection.c
1519+ - Make disabling and re-enabling daap work
1520+ - Give playlists and entry-type
1521+ - Use g_list_prepend to make things not O(n^2)
1522+ - Don't hang with broken DAAP servers
1523+ - Update quick-reference to have right keys
1524+ - Fix libsoup tests for DAAP
1525+ - Don't have date-added column for cds and ipods
1526+ - Support Avahi 0.6
1527+ - Disable saving, renaming, and deletion of DAAP playlists
1528+ - Assorted other bug fixes
1529+ - Disable the close button's minimise-to-tray action
1530+ - Fix the window parameter storage when using the notify (Ubuntu: #1657).
1531+ - Fix the scaling of the side pane (Ubuntu: #15048).
1532+ - Fix the sorting by genre (Ubuntu: #19815).
1533+ * debian/control.in:
1534+ - Build-Depends on libmusicbrainz4-dev
1535+ - doesn't Build-Depends on dbus-1-utils
1536+ - build with dbus 0.60
1537+ * debian/patches/07_dbus060.patch:
1538+ - patch for dbus 0.60
1539+ * debian/rules:
1540+ - build with tag writing (it does id3/flac changes at the moment)
1541+
1542+ [ Loic Minier ]
1543+ * Update watch file.
1544+ * Don't depend on avahi-daemon. (Closes: #343051)
1545+
1546+ -- Sebastien Bacher <seb128@debian.org> Mon, 19 Dec 2005 00:48:21 +0100
1547+
1548+rhythmbox (0.9.1-1) experimental; urgency=low
1549+
1550+ [ Loic Minier ]
1551+ * Fix and update GStreamer pipelines suggested to debug Rhythmbox.
1552+ (Closes: #329213) [debian/README.Debian]
1553+ * Update audiosink configuration information. [debian/README.Debian]
1554+
1555+ [ Sebastien Bacher ]
1556+ * New upstream version:
1557+ - Add DAAP (iTunes' music sharing) support.
1558+ - Notification bubble from tray icon.
1559+ - Minimise to tray rather than exiting when close is used.
1560+ - Allow sources to form a tree, for child playlists.
1561+ - Add removable media framework and port ipod code.
1562+ - Support HAL >= 0.5 as well as > 0.2.
1563+ - Much improved automatic playlists, including more criteria options and
1564+ sorting.
1565+ - Use a proper GTK status bar.
1566+ - Better drag-n-drop support: drag from browsers to source list,
1567+ from browsers or track list to other apps and re-order playlists.
1568+ - Update DBus support to version 0.35, general DBUS improvements and drop
1569+ command-line arguments for DBus.
1570+ - Add "limit by time" option to playlists.
1571+ - Display hours if a song is longer than 60 minutes.
1572+ - Use new volume widget, same as in Totem.
1573+ - Focus entry view when enter is pressed in search box.
1574+ - Show source list when playlist os created.
1575+ - Disable rather then hide seek bar.
1576+ - Improved error handling in RBPlayer.
1577+ - Remove dashboard support.
1578+ - Many HIG and UI improvements.
1579+ - Use last.fm instead of allofmusic.com for links.
1580+ - Remove autorating of tracks.
1581+ - Fix header synchronisation.
1582+ - Fix some window state issues.
1583+ - Add "Date Added" column.
1584+ - Better playlist loading.
1585+ - Make playing source bold, rather than using an icon.
1586+ - Allow library-derived sources to override behaviour.
1587+ - Correctly update status bar and don't use useless info.
1588+ - Add support for building API docs with gnome-doc-utils.
1589+ - Update the default radio stations.
1590+ - Remove a heap of old code, and use stock art instead of custom art.
1591+ - Many rhythmdb improvements.
1592+ - Fix more memory leaks.
1593+ - Many bug fixes and minor improvements.
1594+ - Updated Translations.
1595+ * debian/control.in:
1596+ - build with the new dbus/hal versions (Closes: #333362).
1597+ * debian/control.in, debian/rules:
1598+ - build with the daap option.
1599+
1600+ -- Sebastien Bacher <seb128@debian.org> Mon, 17 Oct 2005 19:35:51 +0200
1601+
1602+rhythmbox (0.9.0-2) experimental; urgency=medium
1603+
1604+ * Bump totem build-dep to catch the shlib-deps. (Closes: #327460)
1605+
1606+ -- Loic Minier <lool@dooz.org> Sun, 11 Sep 2005 12:14:39 +0200
1607+
1608+rhythmbox (0.9.0-1) experimental; urgency=low
1609+
1610+ * New upstream release.
1611+ - Bump libgtk2.0-dev, libgnomevfs2-dev, dbus-glib-1-dev,
1612+ libgstreamer0.8-dev, libgstreamer-plugins0.8-dev,
1613+ libgstreamer-gconf0.8-dev build-deps.
1614+ [debian/control, debian/control.in]
1615+ - Add libnautilus-burn-dev, libhal-dev, libtotem-plparser-dev, pkg-config,
1616+ liblircclient-dev, libbonobo2-dev, liborbit2-dev build-deps.
1617+ [debian/control, debian/control.in]
1618+ - Drop obsolete patches. [debian/patches/02_patch-134_ipod-crash.patch,
1619+ debian/patches/03_patch-135_utf-8-filenames.patch,
1620+ debian/patches/04_patch-136_musepack-wma-support.patch,
1621+ debian/patches/05_patch-137-song-rating.patch,
1622+ debian/patches/20_bugzilla-attach-38781_ipod-gnomevfsvolumemonitor-hal-support.patch,
1623+ debian/patches/21_re-autotools.patch,
1624+ debian/patches/30_bugzilla-attach-39194_fix-null-mountpoint.patch,
1625+ debian/patches/40_debian_geometry_hints.patch,
1626+ debian/patches/50_debian_xmlsaveformatfile_check.patch]
1627+ - Doesn't loop forever when parsing radio streams. (Closes: #278761)
1628+ - Column sorting works. (Closes: #294605, #315511)
1629+ - New ^Y keybinding to clear the search text. (Closes: #211720)
1630+ - Doesn't drop files from the DB if a network share isn't mounted.
1631+ (Closes: #287072)
1632+ - Xine backend has been dropped upstream. (Closes: #225883, #255817)
1633+ - Shows date in song properties. (Closes: #274407)
1634+ * Switch DEB_CONFIGURE_EXTRA_FLAGS to a "+=" and add a comment on building
1635+ with tag writing support. [debian/rules]
1636+ * Bump Standards-Version to 3.6.2. [debian/copyright]
1637+ * Drop xine TODO item. [debian/TODO]
1638+ * Add CDBS' utils. [debian/rules]
1639+
1640+ -- Loic Minier <lool@dooz.org> Tue, 6 Sep 2005 10:35:16 +0200
1641+
1642+rhythmbox (0.8.8-13) unstable; urgency=high
1643+
1644+ * urgency high for Sarge targetted RC bugfix
1645+ * check the return code of xmlSaveFormatFile when saving playlists, fixes
1646+ data loss when disk is full (closes: #309119). Thanks to Robert McQueen.
1647+ [debian/patches/50_debian_xmlsaveformatfile_check.patch]
1648+ * fix a bug introduced with the 40_debian_geometry_hints patch where one
1649+ couldn't resize the small version of the GUI (closes: #257838)
1650+ [debian/patches/40_debian_geometry_hints.patch]
1651+
1652+ -- Loic Minier <lool@dooz.org> Sun, 15 May 2005 20:42:12 +0200
1653+
1654+rhythmbox (0.8.8-12) unstable; urgency=low
1655+
1656+ * debian/patches/40_debian_geometry_hints.patch: new patch to fix the
1657+ probably wrong 0 max_height geometry hint, interpreted strangely by
1658+ different windows managers
1659+
1660+ -- Loic Minier <lool@dooz.org> Sun, 8 May 2005 10:02:40 +0200
1661+
1662+rhythmbox (0.8.8-11) unstable; urgency=low
1663+
1664+ * debian/patches/\
1665+ 20_bugzilla-attach-38781_ipod-gnomevfsvolumemonitor-hal-support.patch:
1666+ new patch from upstream to detect the mount point of iPod devices. This
1667+ means there's no more hardcoded iPod mount point, and we "comply" with FHS
1668+ (closes: #298915)
1669+ * Add a dbus-glib-1-dev build-dep for HAL support.
1670+ * debian/patches/21_re-autotools.patch: re-configure and re-autoheader with
1671+ newer configure.ac
1672+ * debian/patches/30_bugzilla-attach-39194_fix-null-mountpoint.patch: new
1673+ patch from upstream to fix a crash when mountpoint is NULL (probably
1674+ caused by blank CD in drive)
1675+
1676+ -- Loic Minier <lool@dooz.org> Thu, 24 Mar 2005 14:11:36 +0100
1677+
1678+rhythmbox (0.8.8-6) unstable; urgency=high
1679+
1680+ * urgency high because of RC bug fix
1681+ * build-depend on libgnomeui-dev (>= 2.8.1-3) to get rif of the libhowl
1682+ dependency (closes: #298870) (that's enough to get a good libgnomevfs2
1683+ dep)
1684+
1685+ -- Loic Minier <lool@dooz.org> Sat, 12 Mar 2005 15:43:19 +0100
1686+
1687+rhythmbox (0.8.8-5) unstable; urgency=low
1688+
1689+ * debian/patches/00_relibtoolize.patch: dropped (useless)
1690+
1691+ -- Loic Minier <lool@dooz.org> Sun, 30 Jan 2005 14:10:10 +0100
1692+
1693+rhythmbox (0.8.8-4) unstable; urgency=low
1694+
1695+ * debian/patches:
1696+ - removed 01_keep-playing-state.patch (closes: #292509)
1697+ (reopens: #218262)
1698+ - added 00_relibtoolize.patch (libtoolize --force && aclocal-1.7 &&
1699+ autoconf && rm -rf autom4te.cache)
1700+
1701+ -- Loic Minier <lool@dooz.org> Sat, 29 Jan 2005 19:51:34 +0100
1702+
1703+rhythmbox (0.8.8-3) unstable; urgency=low
1704+
1705+ * control:
1706+ . we do need libgstreamer-plugins0.8-dev
1707+ . we only need libxml-parser-perl, and not intltool
1708+
1709+ -- Loic Minier <lool@dooz.org> Wed, 26 Jan 2005 18:54:10 +0100
1710+
1711+rhythmbox (0.8.8-2) unstable; urgency=low
1712+
1713+ * build with iPod support! (closes: #277678)
1714+ * patches:
1715+ . 01_keep-playing-state.patch: patch from upstream BTS to stay in
1716+ paused mode when pressing next or previous (closes: #218262)
1717+ . 02_patch-134_ipod-crash.patch: prevent crash when iPod is connected
1718+ . 03_patch-135_utf-8-filenames.patch: better handling of utf-8 and
1719+ non-utf-8 filenames
1720+ . 04_patch-136_musepack-wma-support.patch: musepack and wma support
1721+ . 05_patch-137-song-rating.patch: song rating fix
1722+ * updated notes in README.Debian
1723+ * corrected copyright file
1724+ * added TODO.Debian with a short list of small things that could done
1725+ * new rhythmbox.xpm (Gimp's output is really nicer)
1726+ * control:
1727+ . removed libpanel-applet2-dev libgstreamer-plugins0.8-dev, libflac-dev,
1728+ libvorbis-dev, and libmusicbrainz2-dev Build-Depends (not used)
1729+ . removed esound Recommends
1730+ . removed vorbis-tools Depends
1731+ . moved scrollkeeper and yelp to Recommends
1732+ . added debhelper's misc:deps
1733+ . updated CDBS vresionned build-deps to ensure we have dh_desktop
1734+ . changed libxml-parser-perl Depends in favor of intltool (>= 0.28-2)
1735+ * rhythmbox.postinst: removed
1736+
1737+ -- Loic Minier <lool@dooz.org> Tue, 25 Jan 2005 10:04:52 +0100
1738+
1739+rhythmbox (0.8.8-1) unstable; urgency=low
1740+
1741+ * New upstream release:
1742+ - flip playing icon in RTL locale.
1743+ - don't include x-directory/normal in MimeType.
1744+ - save playlists after first start even if nothing's loaded.
1745+ - don't include nautilus menu item by default. (Closes: #260317)
1746+ * rhythmbox.menu: remove trailing space (Closes: #262427)
1747+ * rules:
1748+ - add DEB_DH_MAKESHLIBS_ARGS_rhythmbox to workaround #204975
1749+ - remove debugging CFLAGS
1750+ * added rhythmbox.xpm (convert'ed from upstream's rhythmbox.png) and
1751+ rhythmbox.install to provide an ugly icon in the menu
1752+ * set myself as Maintainer
1753+ * Updated notes in README.Debian (Closes: #265167)
1754+
1755+ -- Loic Minier <lool@dooz.org> Tue, 12 Oct 2004 23:56:37 +0200
1756+
1757+rhythmbox (0.8.7-1) unstable; urgency=low
1758+
1759+ * New upstream release.
1760+
1761+ -- Sebastien Bacher <seb128@debian.org> Thu, 30 Sep 2004 01:44:27 +0200
1762+
1763+rhythmbox (0.8.6-1) unstable; urgency=low
1764+
1765+ * New upstream release.
1766+ * rhythmbox.postinst:
1767+ - register the desktop file in the database for the new mime system.
1768+
1769+ -- Sebastien Bacher <seb128@debian.org> Sat, 18 Sep 2004 23:09:19 +0200
1770+
1771+rhythmbox (0.8.5-3) unstable; urgency=low
1772+
1773+ * debian/rhythmbox.postinst, debian/rhythmbox.postrm:
1774+ - removed, dh_gconf and dh_scrollkeeper handle that.
1775+
1776+ -- Sebastien Bacher <seb128@debian.org> Fri, 6 Aug 2004 20:41:15 +0000
1777+
1778+rhythmbox (0.8.5-2) unstable; urgency=low
1779+
1780+ * debian/NEWS: fix typos (closes: #263203).
1781+ * rebuild against libgnutls11 (closes: #263676).
1782+ * debian/control.in: build-depend on libgnomeui 2.6.1.1-4 to enforce the
1783+ libgnutls11 dependency.
1784+
1785+ -- Josselin Mouette <joss@debian.org> Thu, 5 Aug 2004 16:47:49 +0200
1786+
1787+rhythmbox (0.8.5-1) unstable; urgency=low
1788+
1789+ * New upstream release.
1790+ * debian/rhythmbox.mime:
1791+ - register with the MIME system (Closes: #255905).
1792+ * debian/patches/lirc.patch:
1793+ - removed the patch for the lirc support since apparently it doesn't work.
1794+
1795+ -- Sebastien Bacher <seb128@debian.org> Thu, 24 Jun 2004 12:47:00 +0200
1796+
1797+rhythmbox (0.8.4-6) unstable; urgency=low
1798+
1799+ * debian/control.in:
1800+ - depends on gstreamer0.8-flac (Closes: #250584).
1801+ * debian/rhythmbox.menu:
1802+ - added an icon (Closes: #252844).
1803+ * debian/patches/lirc.patch:
1804+ - patch from Jon Oberheide <jon@focalhost.com> to reactivate the lirc
1805+ support (Closes: #246422).
1806+
1807+ -- Sebastien Bacher <seb128@debian.org> Fri, 11 Jun 2004 18:37:33 +0200
1808+
1809+rhythmbox (0.8.4-5) unstable; urgency=low
1810+
1811+ * Rebuilt with gtk+2.4 to use the new fileselector (Closes: #252827).
1812+
1813+ -- Sebastien Bacher <seb128@debian.org> Sun, 6 Jun 2004 02:47:40 +0200
1814+
1815+rhythmbox (0.8.4-4) unstable; urgency=low
1816+
1817+ * debian/control.in:
1818+ + really fix audiosink problem.
1819+
1820+ -- Sebastien Bacher <seb128@debian.org> Sun, 23 May 2004 21:36:32 +0200
1821+
1822+rhythmbox (0.8.4-3) unstable; urgency=low
1823+
1824+ * debian/control.in:
1825+ + use gstreamer0.8-audiosink for Depends (Closes: #250433).
1826+ * included NEWS file from Martin-Eric Racine <q-funk@pp.fishpool.fi>.
1827+
1828+ -- Sebastien Bacher <seb128@debian.org> Sun, 23 May 2004 03:07:11 +0200
1829+
1830+rhythmbox (0.8.4-2) unstable; urgency=low
1831+
1832+ * Upload to unstable since the new branch works fine.
1833+
1834+ -- Sebastien Bacher <seb128@debian.org> Sat, 22 May 2004 01:51:46 +0200
1835+
1836+rhythmbox (0.8.4-1) experimental; urgency=low
1837+
1838+ * New upstream release.
1839+
1840+ -- Sebastien Bacher <seb128@debian.org> Wed, 19 May 2004 00:00:12 +0200
1841+
1842+rhythmbox (0.8.3-2) experimental; urgency=low
1843+
1844+ * Upload in experimental since gstreamer 0.8 is in the archive now.
1845+ + officially close bugs marked as fixed in previous changelog entries
1846+ (Closes: #243408, #245839, #244144, #229361, #235110, #220213, #229710)
1847+ (Closes: #228474, #225183, #237048, #244340, #247167).
1848+ * debian/control.in:
1849+ + added Build-Depends on libxt-dev and libxml-parser-perl.
1850+
1851+ -- Sebastien Bacher <seb128@debian.org> Mon, 17 May 2004 18:53:07 +0200
1852+
1853+rhythmbox (0.8.3-1) experimental; urgency=low
1854+
1855+ * New upstream release.
1856+
1857+ -- Sebastien Bacher <seb128@debian.org> Tue, 4 May 2004 22:24:23 +0200
1858+
1859+rhythmbox (0.8.2-1) experimental; urgency=low
1860+
1861+ * New upstream release.
1862+ + don't crash when the GConf schema isn't properly installed
1863+ (Closes: #243408).
1864+ * debian/control.in:
1865+ + removed Build-depends on libid3tag0-dev (Closes: #245839).
1866+
1867+ -- Sebastien Bacher <seb128@debian.org> Sat, 1 May 2004 12:51:43 +0200
1868+
1869+rhythmbox (0.8.1-1) experimental; urgency=low
1870+
1871+ * New upstream release
1872+ + find iradio-initial.pls correctly (Closes: #244144).
1873+
1874+ -- Sebastien Bacher <seb128@debian.org> Tue, 20 Apr 2004 22:54:33 +0200
1875+
1876+rhythmbox (0.8.0-1) experimental; urgency=low
1877+
1878+ * New upstream release.
1879+ + save database and playlists while running (Closes: #229361, #235110).
1880+ + magnatune radio is in default list (Closes: #220213).
1881+ + update shuffle checkbox on changes (Closes: #229710).
1882+ * Added manpage from Max Vozeler <max@hinterhof.net> (Closes: 228474).
1883+ * debian/control.in:
1884+ + updated Build-Depends on libid3tag0-dev to >= 0.15.0b
1885+ (Closes: #225183, #237048).
1886+
1887+ -- Sebastien Bacher <seb128@debian.org> Fri, 16 Apr 2004 22:25:19 +0200
1888+
1889+rhythmbox (0.7.2-1) experimental; urgency=low
1890+
1891+ * New upstream release.
1892+
1893+ -- Sebastien Bacher <seb128@debian.org> Mon, 12 Apr 2004 19:33:13 +0200
1894+
1895+rhythmbox (0.6.10-1) unstable; urgency=low
1896+
1897+ * New upstream release (Closes: #241166).
1898+
1899+ -- Sebastien Bacher <seb128@debian.org> Wed, 31 Mar 2004 19:38:10 +0200
1900+
1901+rhythmbox (0.6.8-1) unstable; urgency=low
1902+
1903+ * New upstream release:
1904+ + Save library even after first time Rhythmbox runs
1905+ (Closes: #235818, #235823).
1906+
1907+ -- Sebastien Bacher <seb128@debian.org> Sat, 6 Mar 2004 12:40:54 +0100
1908+
1909+rhythmbox (0.6.7-1) unstable; urgency=low
1910+
1911+ * New upstream release.
1912+ * debian/rules:
1913+ + Removed the workaround, the schemas installation is fixed in this version.
1914+
1915+ -- Sebastien Bacher <seb128@debian.org> Sat, 28 Feb 2004 11:56:07 +0100
1916+
1917+rhythmbox (0.6.6-1) unstable; urgency=low
1918+
1919+ * New upstream release:
1920+ + Keep current selection on right-click (Closes: #211575).
1921+ * debian/control.in:
1922+ + Suggests yelp (Closes: #227263).
1923+ + Updated Buil-Depends on debhelper to 4.1.87 for dh_gconf
1924+ (Closes: #230861).
1925+ * debian/README.Debian:
1926+ + Added a note on list conversions of files between 0.5 and 0.6 versions
1927+ (Closes: #227501).
1928+ * debian/patches/rb-m3u-playlists.patch:
1929+ + Removed since the fix is included in the new version.
1930+ * debian/rules:
1931+ + Workaround for the wrong schemas installation dir.
1932+
1933+ -- Sebastien Bacher <seb128@debian.org> Fri, 27 Feb 2004 22:35:39 +0100
1934+
1935+rhythmbox (0.6.5-2) unstable; urgency=low
1936+
1937+ * debian/patches/rb-m3u-playlists.patch:
1938+ + New patch to fix m3u playlists loading (Closes: #229481).
1939+
1940+ -- Sebastien Bacher <seb128@debian.org> Sun, 1 Feb 2004 00:47:56 +0100
1941+
1942+rhythmbox (0.6.5-1) unstable; urgency=low
1943+
1944+ * New upstream release:
1945+ + Work with session management (Closes: #223257).
1946+ + Fix length calculation for some VBR MP3s (Closes: #224456).
1947+ + Fix volume popup near bottom of screen (Closes: #213257).
1948+ * debian/README.Debian:
1949+ + Updated to add a note on gstreamer-properties usage to change audio sink
1950+ (Closes: #229023).
1951+
1952+ -- Sebastien Bacher <seb128@debian.org> Thu, 22 Jan 2004 19:36:22 +0100
1953+
1954+rhythmbox (0.6.4-1) unstable; urgency=low
1955+
1956+ * New upstream release.
1957+
1958+ -- Colin Walters <walters@debian.org> Mon, 12 Jan 2004 08:16:39 +0000
1959+
1960+rhythmbox (0.6.3-1) unstable; urgency=low
1961+
1962+ * New upstream release.
1963+ + Use better algorithms for Shuffle (Closes: #206407).
1964+ + Fix length parsing from variable-bitrate MP3s (Closes: #224456).
1965+ * debian/patches/00docs-fix.patch:
1966+ + Removed since the changes are include in the new version.
1967+ * debian/patches/01docs-fix-autogen.patch:
1968+ + Removed since the changes are include in the new version.
1969+
1970+ -- Sebastien Bacher <seb128@debian.org> Mon, 22 Dec 2003 20:40:58 +0100
1971+
1972+rhythmbox (0.6.1-2) unstable; urgency=low
1973+
1974+ * 00docs-fix.patch: patch from Jordi Mallach to make the XML correct
1975+ (closes: #223538, #223802).
1976+ * 01docs-fix-autogen.patch: patch Makefile.in as well.
1977+ * rules:
1978+ + use simple-patchsys.mk to apply the patches.
1979+ + clean help/C/authors.xml to force its rebuild.
1980+
1981+ -- Josselin Mouette <joss@debian.org> Fri, 12 Dec 2003 20:50:18 +0100
1982+
1983+rhythmbox (0.6.1-1) unstable; urgency=low
1984+
1985+ * New upstream release.
1986+
1987+ -- Sebastien Bacher <seb128@debian.org> Thu, 4 Dec 2003 21:53:28 +0100
1988+
1989+rhythmbox (0.6.0-1) unstable; urgency=low
1990+
1991+ * New upstream release.
1992+ + Fix the launching from nautilus (Closes: #218715).
1993+ + Keep a playback history (Closes: #218264).
1994+ + Don't crash on a song removal (Closes: #207073).
1995+ * debian/control:
1996+ + Set GNOME Team as maintainer (thanks Colin).
1997+ + Updated Standards-Version to 3.6.1.0.
1998+ * debian/patches:
1999+ + keycodes.patch: removed.
2000+ * debian/rules:
2001+ + Updated for the GNOME Team maintenance.
2002+
2003+ -- Sebastien Bacher <seb128@debian.org> Tue, 11 Nov 2003 22:02:23 +0100
2004+
2005+rhythmbox (0.5.4-1) unstable; urgency=low
2006+
2007+ * New upstream release
2008+
2009+ -- Colin Walters <walters@debian.org> Mon, 27 Oct 2003 17:19:42 -0500
2010+
2011+rhythmbox (0.5.3-1) unstable; urgency=low
2012+
2013+ * New upstream release.
2014+
2015+ -- Colin Walters <walters@debian.org> Thu, 4 Sep 2003 23:43:28 -0400
2016+
2017+rhythmbox (0.5.2-1) unstable; urgency=low
2018+
2019+ * New upstream release.
2020+
2021+ -- Colin Walters <walters@debian.org> Tue, 26 Aug 2003 23:50:22 -0400
2022+
2023+rhythmbox (0.5.1-1) unstable; urgency=low
2024+
2025+ * New upstream release.
2026+ - Fixes multimedia keycodes grabbing (Closes: #206010)
2027+
2028+ -- Colin Walters <walters@debian.org> Mon, 18 Aug 2003 18:34:37 -0400
2029+
2030+rhythmbox (0.5.0-1) unstable; urgency=low
2031+
2032+ * New upstream release.
2033+ - Kills off old copied getline stuff, which had size_t issues
2034+ (Closes: #205849)
2035+
2036+ -- Colin Walters <walters@debian.org> Sat, 16 Aug 2003 23:13:40 -0400
2037+
2038+rhythmbox (0.4.99.5-1) unstable; urgency=low
2039+
2040+ * New upstream prerelease (Closes: #204115)
2041+
2042+ Sorry Debian Unstable users, you're my guinea pigs. This is
2043+ a prerelease. It does however fix a near-infinite number of bugs,
2044+ some of which you can see below. So overall, I doubt anyone
2045+ would want to stay with the old package. If you don't like this,
2046+ please don't file bugs. Instead, you will have to fork a copy
2047+ of net-rhythmbox yourself.
2048+
2049+ Now, since this is a prerelease - I am interested in bug reports.
2050+ You may file bugs in the Debian Bug Tracking System, but I would
2051+ much prefer that you file them in the upstream Bugzilla:
2052+ http://bugzilla.gnome.org/
2053+
2054+ However, it does break compatibility with the old library cache
2055+ format; you will have to re-add all of your files to the library. The
2056+ upstream author is kind of a lazy bastard, and doesn't really have
2057+ time to write transition scripts (which would be quite difficult
2058+ anyways). Sorry about that.
2059+
2060+ - Rhythmbox follows links, this is intentional (Closes: #169488)
2061+ - Alphabetical sorting is fixed (Closes: #172089)
2062+ - Playlist saving is more reliable (Closes: #182815)
2063+ - Tray icon recreates itself (Closes: #192557)
2064+ - Setting properties on iradio stations works (Closes: #193686)
2065+ - Control-J is consistent with menu item (Closes: #173634)
2066+ - Groks .m3u files (Closes: #182596)
2067+ - GStreamer threading is more reliable (Closes: #178283)
2068+ - Shuffling code is refactored, should not hang (Closes: #192556)
2069+ - Playing files with : in name works (Closes: #188511)
2070+ - Repeat in single-song playlists works (Closes: #188477)
2071+
2072+ -- Colin Walters <walters@debian.org> Fri, 15 Aug 2003 21:31:23 -0400
2073+
2074+rhythmbox (0.4.8-5) unstable; urgency=low
2075+
2076+ * debian/control:
2077+ - Remove Build-Depends on libgstreamer-core-libs-dev.
2078+ - Remove Depends on gstreamer-core.
2079+ - Build-Depend on the latest libgstreamer0.6-dev.
2080+ - Build-Depend on the latest cdbs.
2081+
2082+ -- Colin Walters <walters@debian.org> Sat, 7 Jun 2003 01:47:20 -0400
2083+
2084+rhythmbox (0.4.8-4) unstable; urgency=low
2085+
2086+ * debian/control:
2087+ - Bump Standards-Version: 3.5.10, no changes required.
2088+ - Build-Depend on cdbs.
2089+ - Remove Build-Depends on xlibs-pic, now that libxosd2-dev has
2090+ picked it up.
2091+ - Change Section to gnome.
2092+ * debian/rules:
2093+ - Convert to cdbs.
2094+ * debian/rocks:
2095+ - Removed.
2096+
2097+ -- Colin Walters <walters@debian.org> Sun, 25 May 2003 05:08:35 -0400
2098+
2099+rhythmbox (0.4.8-3) unstable; urgency=low
2100+
2101+ * The "Pfizer Launches 'Zoloft For Everything' Ad Campaign" release.
2102+ * debian/control:
2103+ - Add Build-Depends on xlibs-pic; this should make the powerpc buildd
2104+ happy.
2105+
2106+ -- Colin Walters <walters@debian.org> Wed, 14 May 2003 16:34:01 -0400
2107+
2108+rhythmbox (0.4.8-2) unstable; urgency=low
2109+
2110+ * The "Dozens Dead In Chicago-Area Meatwave" release.
2111+ * debian/control:
2112+ - Add Build-Depends on xlibs-pic (Closes: #192561).
2113+ * debian/patches/getline-ssizet.patch:
2114+ - New patch, should fix build failures on ia64 and alpha.
2115+
2116+ -- Colin Walters <walters@debian.org> Sat, 10 May 2003 00:10:36 -0400
2117+
2118+rhythmbox (0.4.8-1) unstable; urgency=low
2119+
2120+ * The "Bush To Lovely Chilean Ambassador: 'I Must Paint You'" release.
2121+ * New upstream release.
2122+ - Really restore shuffle state (Closes: #188951)
2123+ * debian/control:
2124+ - Bump Build-Depends on musicbrainz to 2.0.0.
2125+ - Bump Build-Depends on gstreamer to 0.6.1.
2126+ - Standards-Version: 3.5.9, no changes required.
2127+ - Update description.
2128+ * debian/rules:
2129+ - Update to latest version of Colin's Build System.
2130+
2131+ -- Colin Walters <walters@debian.org> Wed, 7 May 2003 15:07:35 -0400
2132+
2133+rhythmbox (0.4.6-1) unstable; urgency=low
2134+
2135+ * The "Marilyn Manson Now Going Door-To-Door Trying To Shock People"
2136+ release.
2137+ * If this release fixes one of the bugs you reported, please close it!
2138+ * New upstream release.
2139+ * debian/rocks:
2140+ - Include NEWS, README in /usr/share/doc/rhythmbox (Closes: #179430)
2141+ * debian/rules:
2142+ - Update to latest version of Colin's Build System.
2143+
2144+ -- Colin Walters <walters@debian.org> Fri, 11 Apr 2003 23:43:52 -0400
2145+
2146+rhythmbox (0.4.5-6) unstable; urgency=low
2147+
2148+ * debian/control:
2149+ - Build-Depend on the latest libvorbis-dev.
2150+ * debian/rocks:
2151+ - Disable -Werror.
2152+
2153+ -- Colin Walters <walters@debian.org> Thu, 13 Mar 2003 18:09:53 -0500
2154+
2155+rhythmbox (0.4.5-5) unstable; urgency=low
2156+
2157+ * debian/control:
2158+ - Add Depends on gstreamer-core (Closes: #182114).
2159+
2160+ -- Colin Walters <walters@debian.org> Sat, 22 Feb 2003 18:38:41 -0500
2161+
2162+rhythmbox (0.4.5-4) unstable; urgency=low
2163+
2164+ * debian/control:
2165+ - Add Build-Depends on gstreamer-gconf.
2166+
2167+ -- Colin Walters <walters@debian.org> Sat, 15 Feb 2003 11:18:16 -0500
2168+
2169+rhythmbox (0.4.5-3) unstable; urgency=low
2170+
2171+ * debian/control:
2172+ - Add missing comma in Build-Depends.
2173+
2174+ -- Colin Walters <walters@debian.org> Sat, 15 Feb 2003 02:10:42 -0500
2175+
2176+rhythmbox (0.4.5-2) unstable; urgency=low
2177+
2178+ * debian/control:
2179+ - Add Build-Depends on libflac-dev.
2180+
2181+ -- Colin Walters <walters@debian.org> Fri, 14 Feb 2003 23:58:59 -0500
2182+
2183+rhythmbox (0.4.5-1) unstable; urgency=low
2184+
2185+ * New upstream (literally). This package is now built from the
2186+ netRhythmbox branch. This is a one-time temporary release, until
2187+ the next version of Rhythmbox.
2188+ * debian/control:
2189+ - Merge in dependencies from monkey-media. Include
2190+ gstreamer-core-libs (Closes: #179905).
2191+
2192+ -- Colin Walters <walters@debian.org> Thu, 6 Feb 2003 23:44:44 -0500
2193+
2194+rhythmbox (0.4.1-8) unstable; urgency=low
2195+
2196+ * NMU (with maintainer's permission)
2197+ * recompile against gstreamer-0.6 and monkey-media
2198+
2199+ -- David Schleef <ds@schleef.org> Mon, 10 Feb 2003 22:11:28 -0800
2200+
2201+rhythmbox (0.4.1-7) unstable; urgency=low
2202+
2203+ * debian/control:
2204+ - Build-Depend on the latest monkey-media (Closes: #177971).
2205+ * debian/rules:
2206+ - Update to latest version of Colin's Build System.
2207+
2208+ -- Colin Walters <walters@debian.org> Wed, 22 Jan 2003 15:05:36 -0500
2209+
2210+rhythmbox (0.4.1-6) unstable; urgency=low
2211+
2212+ * debian/README.Debian:
2213+ - Note on how to change output sink.
2214+ * debian/patches/no-double-filename-escape.patch:
2215+ - New patch, created thanks to debugging from
2216+ Aleksey Kliger <aleksey+@cs.cmu.edu> (Closes: #169486).
2217+ * debian/rules:
2218+ - Update to latest version of Colin's Build System.
2219+
2220+ -- Colin Walters <walters@debian.org> Fri, 10 Jan 2003 18:46:23 -0500
2221+
2222+rhythmbox (0.4.1-5) unstable; urgency=low
2223+
2224+ * debian/control:
2225+ - Build-Depend on the latest monkey-media.
2226+ - Minor description tweaks again.
2227+
2228+ -- Colin Walters <walters@debian.org> Mon, 23 Dec 2002 03:20:03 -0500
2229+
2230+rhythmbox (0.4.1-4) unstable; urgency=low
2231+
2232+ * debian/control:
2233+ - Build-Depend on scrollkeeper. Doh.
2234+
2235+ -- Colin Walters <walters@debian.org> Sun, 15 Dec 2002 22:07:25 -0500
2236+
2237+rhythmbox (0.4.1-3) unstable; urgency=low
2238+
2239+ * debian/rocks:
2240+ - Also remove omf_timestamp file in clean rule, in an attempt to fix
2241+ build failures on i386.
2242+
2243+ -- Colin Walters <walters@debian.org> Sun, 15 Dec 2002 14:02:55 -0500
2244+
2245+rhythmbox (0.4.1-2) unstable; urgency=low
2246+
2247+ * debian/control:
2248+ - Make description suck less.
2249+ - Build-Depend on the latest monkey-media.
2250+
2251+ -- Colin Walters <walters@debian.org> Thu, 12 Dec 2002 16:54:54 -0500
2252+
2253+rhythmbox (0.4.1-1) unstable; urgency=low
2254+
2255+ * New upstream release.
2256+ * debian/control:
2257+ - Build-Depend on the latest monkey-media.
2258+ * debian/patches/fix-color-value-overflow-in-link.patch:
2259+ - Incorporated upstream; deleted.
2260+ * debian/patches/no-crash-on-null-LANG.patch:
2261+ - Incorporated upstream; deleted.
2262+ * debian/patches/no-crash-on-null-column-preferences.patch:
2263+ - Incorporated upstream; deleted.
2264+
2265+ -- Colin Walters <walters@debian.org> Wed, 11 Dec 2002 14:10:45 -0500
2266+
2267+rhythmbox (0.4.0-4) unstable; urgency=low
2268+
2269+ * debian/rocks:
2270+ - Fix up XML references.
2271+ - Remove extra cruft in deb-extra-clean rule.
2272+ * debian/rules:
2273+ - Update to latest version of Colin's Build System.
2274+ * debian/postinst, debian/postrm:
2275+ - Old, obsolete files; deleted.
2276+ * debian/menu:
2277+ - Renamed to rhythmbox.menu, so dh_installmenu actually does something
2278+ with it.
2279+
2280+ -- Colin Walters <walters@debian.org> Wed, 11 Dec 2002 01:32:40 -0500
2281+
2282+rhythmbox (0.4.0-3) unstable; urgency=low
2283+
2284+ * debian/rules:
2285+ - Update to latest version of Colin's Build System.
2286+ * debian/patches/fix-color-value-overflow-in-link.patch:
2287+ - Use a width of 4 instead of 2.
2288+ * debian/patches/no-crash-on-null-LANG.patch:
2289+ - New patch.
2290+ * debian/control:
2291+ - Build-Depend on the latest monkey-media.
2292+
2293+ -- Colin Walters <walters@debian.org> Tue, 3 Dec 2002 10:49:05 -0500
2294+
2295+rhythmbox (0.4.0-2) unstable; urgency=low
2296+
2297+ * debian/rules:
2298+ - Update to latest version of Colin's Build System.
2299+ * debian/rocks:
2300+ - Use GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 instead of
2301+ GCONF_DISABLE_SCHEMA_MAKEFILE_INSTALL=1.
2302+ * debian/patches/fix-color-value-overflow-in-link.patch,
2303+ debian/patches/no-crash-on-null-column-preferences.patch:
2304+ - New patches from Sjoerd Simons <sjoerd@luon.net>
2305+ (Closes: #169199, #169204).
2306+
2307+ -- Colin Walters <walters@debian.org> Fri, 15 Nov 2002 11:49:08 -0500
2308+
2309+rhythmbox (0.4.0-1) unstable; urgency=low
2310+
2311+ * New upstream release.
2312+ * debian/control:
2313+ - Build-Depend on latest version of monkey-media.
2314+ - Don't Build-Depend on dbs or automake1.6.
2315+ * debian/rules:
2316+ - Use Colin's Build System.
2317+
2318+ -- Colin Walters <walters@debian.org> Thu, 14 Nov 2002 11:42:57 -0500
2319+
2320+rhythmbox (0.3.0+release-7) unstable; urgency=low
2321+
2322+ * The "I love making the i386 users wait for the autobuilders" release.
2323+ * debian/control:
2324+ - Build-Depend on latest version of monkey-media (Closes: #168402).
2325+ - Bump Standards-Version to 3.5.7.
2326+ * debian/rules:
2327+ - Support DEB_BUILD_OPTIONS=noopt instead of debug.
2328+
2329+ -- Colin Walters <walters@debian.org> Tue, 12 Nov 2002 21:22:58 -0500
2330+
2331+rhythmbox (0.3.0+release-6) unstable; urgency=low
2332+
2333+ * debian/control:
2334+ - Build-Depend on latest version of monkey-media (Closes: #168402).
2335+ - Note that Internet radio isn't implemented yet.
2336+ * debian/patches/gconf-schema-fix.patch:
2337+ - New.
2338+ * README.Debian:
2339+ - Remove outdated information (Closes: #167709).
2340+
2341+ -- Colin Walters <walters@debian.org> Sat, 9 Nov 2002 11:33:02 -0500
2342+
2343+rhythmbox (0.3.0+release-5) unstable; urgency=low
2344+
2345+ * The "Maybe this and monkey-media should be in the same tarball..." release.
2346+ * debian/control:
2347+ - Build-Depend on latest version of monkey-media.
2348+
2349+ -- Colin Walters <walters@debian.org> Thu, 10 Oct 2002 12:36:12 -0400
2350+
2351+rhythmbox (0.3.0+release-4) unstable; urgency=low
2352+
2353+ * The "This version of rhythmbox is a bit old, but it actually works" release.
2354+ * First upload to sid! (Closes: #154919)
2355+ * debian/control:
2356+ - Build-Depend on latest version of monkey-media.
2357+
2358+ -- Colin Walters <walters@debian.org> Thu, 10 Oct 2002 12:36:12 -0400
2359+
2360+rhythmbox (0.3.0+release-3) unstable; urgency=low
2361+
2362+ * Recompile against gstreamer packages in experimental, not my own local
2363+ hacked-up .debs of CVS.
2364+
2365+ -- Colin Walters <walters@debian.org> Wed, 2 Oct 2002 20:58:59 -0400
2366+
2367+rhythmbox (0.3.0+release-2) unstable; urgency=low
2368+
2369+ * debian/control:
2370+ - Build-Depend on the latest versions of libpanel-applet2-dev and
2371+ libgnomevfs2-dev. Remove Build-Dependency on obsolete libgnutls-dev
2372+ package.
2373+ - Update description to reflect the fact that the features list is at
2374+ the moment a blatant set of lies.
2375+
2376+ -- Colin Walters <walters@debian.org> Sun, 29 Sep 2002 15:23:59 -0400
2377+
2378+rhythmbox (0.3.0+release-1) unstable; urgency=low
2379+
2380+ * New upstream version.
2381+ * debian/control:
2382+ - [rhythmbox]: Depend on scrollkeeper.
2383+
2384+ -- Colin Walters <walters@debian.org> Fri, 16 Aug 2002 22:54:00 -0400
2385+
2386+rhythmbox (0.3.0+cvs20020730-2) unstable; urgency=low
2387+
2388+ * debian/control:
2389+ - [src:rhythmbox] Tighten up Build-Depends.
2390+
2391+ -- Colin Walters <walters@debian.org> Wed, 31 Jul 2002 14:13:20 -0400
2392+
2393+rhythmbox (0.3.0+cvs20020730-1) unstable; urgency=low
2394+
2395+ * Initial Release (Closes: #151346, #154919).
2396+
2397+ -- Colin Walters <walters@debian.org> Wed, 31 Jul 2002 01:01:06 -0400
2398+
2399
2400=== added file 'debian/compat'
2401--- debian/compat 1970-01-01 00:00:00 +0000
2402+++ debian/compat 2010-07-05 01:49:22 +0000
2403@@ -0,0 +1,1 @@
2404+5
2405
2406=== added file 'debian/control'
2407--- debian/control 1970-01-01 00:00:00 +0000
2408+++ debian/control 2010-07-05 01:49:22 +0000
2409@@ -0,0 +1,195 @@
2410+# This file is autogenerated. DO NOT EDIT!
2411+#
2412+# Modifications should be made to debian/control.in instead.
2413+# This file is regenerated automatically in the clean target.
2414+
2415+Source: rhythmbox
2416+Section: gnome
2417+Priority: optional
2418+Maintainer: Ubuntu Desktop Team <ubuntu-desktop@lists.ubuntu.com>
2419+XSBC-Original-Maintainer: Loic Minier <lool@dooz.org>
2420+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
2421+Build-Depends: cdbs (>= 0.4.37),
2422+ debhelper (>= 5.0.37.2),
2423+ gnome-pkg-tools,
2424+ intltool (>= 0.35.0),
2425+ libappindicator-dev (>= 0.0.7),
2426+ libdbus-glib-1-dev (>= 0.35),
2427+ libgstreamer0.10-dev (>= 0.10.20),
2428+ libgstreamer-plugins-base0.10-dev (>= 0.10.20),
2429+ libgtk2.0-dev (>= 2.16.0),
2430+ libglib2.0-dev (>= 2.18.0),
2431+ libgnome-media-dev (>= 2.8),
2432+ libnotify-dev (>= 0.4.1),
2433+ libgpod-dev (>= 0.6),
2434+ libmusicbrainz4-dev (>= 2.1.0),
2435+ libbrasero-media-dev (>= 0.9.1),
2436+ libtotem-plparser-dev (>= 2.26.0),
2437+ libavahi-client-dev (>= 0.6),
2438+ libavahi-glib-dev (>= 0.6),
2439+ libsoup2.4-dev (>= 2.26.0),
2440+ libsoup-gnome2.4-dev (>= 2.26.0),
2441+ libgudev-1.0-dev,
2442+ libmtp-dev (>= 0.3.0),
2443+ libgnome-keyring-dev,
2444+ zlib1g-dev,
2445+ libxt-dev,
2446+ x11proto-core-dev,
2447+ libgconf2-dev,
2448+ liblircclient-dev,
2449+ gtk-doc-tools (>= 1.4),
2450+ gnome-doc-utils,
2451+ scrollkeeper,
2452+ python-dev (>= 2.3),
2453+ python-support (>= 0.5.3),
2454+ python-gtk2-dev (>= 2.8.0),
2455+ python-gst0.10-dev (>= 0.10.1),
2456+ python-gobject-dev (>= 2.15.4),
2457+ liblaunchpad-integration-dev (>= 0.1.17),
2458+ docbook-xsl (>= 1.54.1),
2459+ docbook-utils (>= 0.6.11),
2460+ pkg-config,
2461+ libglib2.0-doc,
2462+ libgtk2.0-doc
2463+Standards-Version: 3.8.3
2464+XS-Python-Version: >= 2.3
2465+Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/rhythmbox/lucid
2466+
2467+Package: rhythmbox
2468+Architecture: any
2469+Depends: ${misc:Depends},
2470+ ${shlibs:Depends},
2471+ ${python:Depends},
2472+ dbus,
2473+ gstreamer0.10-plugins-base (>= 0.10.20),
2474+ gstreamer0.10-plugins-good (>= 0.10.7),
2475+ libgstreamer0.10-0,
2476+ gstreamer0.10-alsa | gstreamer0.10-audiosink,
2477+ python-gnome2 (>= 2.18),
2478+ python-gtk2 (>= 2.10),
2479+ gnome-icon-theme,
2480+ gstreamer0.10-x,
2481+ python-gst0.10,
2482+ media-player-info
2483+Conflicts: gnome-control-center (<< 2.15.90)
2484+Recommends: yelp,
2485+ avahi-daemon,
2486+ notification-daemon,
2487+ gvfs-backends,
2488+ rhythmbox-plugins,
2489+ rhythmbox-plugin-cdrecorder
2490+Suggests: gstreamer0.10-plugins-bad,
2491+ python-coherence,
2492+ gnome-codec-install,
2493+ gnome-control-center,
2494+ gstreamer0.10-plugins-ugly,
2495+ brasero,
2496+ rhythmbox-plugin-coherence
2497+XB-Python-Version: ${python:Versions}
2498+Description: music player and organizer for GNOME
2499+ Rhythmbox is a very easy to use music playing and management program
2500+ which supports a wide range of audio formats (including mp3 and ogg).
2501+ Originally inspired by Apple's iTunes, the current version also supports
2502+ Internet Radio, iPod integration and generic portable audio player
2503+ support, Audio CD burning, Audio CD playback, music sharing, and
2504+ Podcasts.
2505+
2506+Package: rhythmbox-dbg
2507+Architecture: any
2508+Priority: extra
2509+Section: debug
2510+Depends: ${misc:Depends},
2511+ rhythmbox (= ${binary:Version})
2512+Recommends: libgstreamer0.10-0-dbg,
2513+ gstreamer0.10-plugins-base-dbg,
2514+ gstreamer0.10-plugins-good-dbg
2515+Suggests: gstreamer0.10-plugins-ugly-dbg
2516+Description: debugging symbols for rhythmbox
2517+ Rhythmbox is a very easy to use music playing and management program
2518+ which supports a wide range of audio formats (including mp3 and ogg).
2519+ Originally inspired by Apple's iTunes, the current version also supports
2520+ Internet Radio, iPod integration and generic portable audio player
2521+ support, Audio CD burning, Audio CD playback, music sharing, and
2522+ Podcasts.
2523+ .
2524+ This package contains the debugging symbols for rhythmbox.
2525+
2526+Package: rhythmbox-plugins
2527+Architecture: any
2528+Depends: ${misc:Depends},
2529+ ${shlibs:Depends},
2530+ ${python:Depends},
2531+ rhythmbox (= ${binary:Version}),
2532+Recommends: python-webkit,
2533+ python-mako
2534+Conflicts: rhythmbox (<< 0.12.6-1ubuntu9)
2535+Replaces: rhythmbox (<< 0.12.6-1ubuntu9)
2536+XB-Python-Version: ${python:Versions}
2537+Description: plugins for rhythmbox music player
2538+ Rhythmbox is a very easy to use music playing and management program
2539+ which supports a wide range of audio formats (including mp3 and ogg).
2540+ Originally inspired by Apple's iTunes, the current version also supports
2541+ Internet Radio, iPod integration and generic portable audio player
2542+ support, Audio CD burning, Audio CD playback, music sharing, and
2543+ Podcasts.
2544+ .
2545+ This package contains the following plugins:
2546+ - Cover art
2547+ - Audio CD Player
2548+ - Last.fm
2549+ - Context Panel
2550+ - DAAP Music Sharing
2551+ - FM Radio
2552+ - Portable Players
2553+ - IM Status
2554+ - Portable Players - iPod
2555+ - Internet Radio
2556+ - Jamendo
2557+ - Song Lyrics
2558+ - Magnatune Store
2559+ - Media Player Keys
2560+ - Portable Players - MTP
2561+ - Power Manager
2562+ - Python Console
2563+ - LIRC
2564+ - Status Icon
2565+ - Visualization
2566+ - Browser plugin to integrate Rhythmbox with itunes
2567+
2568+Package: rhythmbox-plugin-cdrecorder
2569+Architecture: any
2570+Depends: ${misc:Depends},
2571+ ${shlibs:Depends},
2572+ rhythmbox (= ${binary:Version})
2573+Conflicts: rhythmbox (<< 0.12.6-1ubuntu9)
2574+Replaces: rhythmbox (<< 0.12.6-1ubuntu9)
2575+Description: burning plugin for rhythmbox music player
2576+ Rhythmbox is a very easy to use music playing and management program
2577+ which supports a wide range of audio formats (including mp3 and ogg).
2578+ Originally inspired by Apple's iTunes, the current version also supports
2579+ Internet Radio, iPod integration and generic portable audio player
2580+ support, Audio CD burning, Audio CD playback, music sharing, and
2581+ Podcasts.
2582+ .
2583+ This package contains the brasero based CD/DVD burning plugin.
2584+
2585+Package: rhythmbox-plugin-coherence
2586+Architecture: all
2587+Depends: ${misc:Depends},
2588+ ${python:Depends},
2589+ python-coherence,
2590+ rhythmbox (>= ${gnome:Version}),
2591+ rhythmbox (<< ${gnome:NextVersion})
2592+Conflicts: rhythmbox (<< 0.12.6-1ubuntu9)
2593+Replaces: rhythmbox (<< 0.12.6-1ubuntu9)
2594+XB-Python-Version: ${python:Versions}
2595+Description: UPnp plugin for rhythmbox music player
2596+ Rhythmbox is a very easy to use music playing and management program
2597+ which supports a wide range of audio formats (including mp3 and ogg).
2598+ Originally inspired by Apple's iTunes, the current version also supports
2599+ Internet Radio, iPod integration and generic portable audio player
2600+ support, Audio CD burning, Audio CD playback, music sharing, and
2601+ Podcasts.
2602+ .
2603+ This package contains the coherence DLNA/UPnp plugin.
2604+
2605
2606=== added file 'debian/control.in'
2607--- debian/control.in 1970-01-01 00:00:00 +0000
2608+++ debian/control.in 2010-07-05 01:49:22 +0000
2609@@ -0,0 +1,190 @@
2610+Source: rhythmbox
2611+Section: gnome
2612+Priority: optional
2613+Maintainer: Ubuntu Desktop Team <ubuntu-desktop@lists.ubuntu.com>
2614+XSBC-Original-Maintainer: Loic Minier <lool@dooz.org>
2615+Uploaders: @GNOME_TEAM@
2616+Build-Depends: cdbs (>= 0.4.37),
2617+ debhelper (>= 5.0.37.2),
2618+ gnome-pkg-tools,
2619+ intltool (>= 0.35.0),
2620+ libappindicator-dev (>= 0.0.7),
2621+ libdbus-glib-1-dev (>= 0.35),
2622+ libgstreamer0.10-dev (>= 0.10.20),
2623+ libgstreamer-plugins-base0.10-dev (>= 0.10.20),
2624+ libgtk2.0-dev (>= 2.16.0),
2625+ libglib2.0-dev (>= 2.18.0),
2626+ libgnome-media-dev (>= 2.8),
2627+ libnotify-dev (>= 0.4.1),
2628+ libgpod-dev (>= 0.6),
2629+ libmusicbrainz4-dev (>= 2.1.0),
2630+ libbrasero-media-dev (>= 0.9.1),
2631+ libtotem-plparser-dev (>= 2.26.0),
2632+ libavahi-client-dev (>= 0.6),
2633+ libavahi-glib-dev (>= 0.6),
2634+ libsoup2.4-dev (>= 2.26.0),
2635+ libsoup-gnome2.4-dev (>= 2.26.0),
2636+ libgudev-1.0-dev,
2637+ libmtp-dev (>= 0.3.0),
2638+ libgnome-keyring-dev,
2639+ zlib1g-dev,
2640+ libxt-dev,
2641+ x11proto-core-dev,
2642+ libgconf2-dev,
2643+ liblircclient-dev,
2644+ gtk-doc-tools (>= 1.4),
2645+ gnome-doc-utils,
2646+ scrollkeeper,
2647+ python-dev (>= 2.3),
2648+ python-support (>= 0.5.3),
2649+ python-gtk2-dev (>= 2.8.0),
2650+ python-gst0.10-dev (>= 0.10.1),
2651+ python-gobject-dev (>= 2.15.4),
2652+ liblaunchpad-integration-dev (>= 0.1.17),
2653+ docbook-xsl (>= 1.54.1),
2654+ docbook-utils (>= 0.6.11),
2655+ pkg-config,
2656+ libglib2.0-doc,
2657+ libgtk2.0-doc
2658+Standards-Version: 3.8.3
2659+XS-Python-Version: >= 2.3
2660+Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/rhythmbox/lucid
2661+
2662+Package: rhythmbox
2663+Architecture: any
2664+Depends: ${misc:Depends},
2665+ ${shlibs:Depends},
2666+ ${python:Depends},
2667+ dbus,
2668+ gstreamer0.10-plugins-base (>= 0.10.20),
2669+ gstreamer0.10-plugins-good (>= 0.10.7),
2670+ libgstreamer0.10-0,
2671+ gstreamer0.10-alsa | gstreamer0.10-audiosink,
2672+ python-gnome2 (>= 2.18),
2673+ python-gtk2 (>= 2.10),
2674+ gnome-icon-theme,
2675+ gstreamer0.10-x,
2676+ python-gst0.10,
2677+ media-player-info
2678+Conflicts: gnome-control-center (<< 2.15.90)
2679+Recommends: yelp,
2680+ avahi-daemon,
2681+ notification-daemon,
2682+ gvfs-backends,
2683+ rhythmbox-plugins,
2684+ rhythmbox-plugin-cdrecorder
2685+Suggests: gstreamer0.10-plugins-bad,
2686+ python-coherence,
2687+ gnome-codec-install,
2688+ gnome-control-center,
2689+ gstreamer0.10-plugins-ugly,
2690+ brasero,
2691+ rhythmbox-plugin-coherence
2692+XB-Python-Version: ${python:Versions}
2693+Description: music player and organizer for GNOME
2694+ Rhythmbox is a very easy to use music playing and management program
2695+ which supports a wide range of audio formats (including mp3 and ogg).
2696+ Originally inspired by Apple's iTunes, the current version also supports
2697+ Internet Radio, iPod integration and generic portable audio player
2698+ support, Audio CD burning, Audio CD playback, music sharing, and
2699+ Podcasts.
2700+
2701+Package: rhythmbox-dbg
2702+Architecture: any
2703+Priority: extra
2704+Section: debug
2705+Depends: ${misc:Depends},
2706+ rhythmbox (= ${binary:Version})
2707+Recommends: libgstreamer0.10-0-dbg,
2708+ gstreamer0.10-plugins-base-dbg,
2709+ gstreamer0.10-plugins-good-dbg
2710+Suggests: gstreamer0.10-plugins-ugly-dbg
2711+Description: debugging symbols for rhythmbox
2712+ Rhythmbox is a very easy to use music playing and management program
2713+ which supports a wide range of audio formats (including mp3 and ogg).
2714+ Originally inspired by Apple's iTunes, the current version also supports
2715+ Internet Radio, iPod integration and generic portable audio player
2716+ support, Audio CD burning, Audio CD playback, music sharing, and
2717+ Podcasts.
2718+ .
2719+ This package contains the debugging symbols for rhythmbox.
2720+
2721+Package: rhythmbox-plugins
2722+Architecture: any
2723+Depends: ${misc:Depends},
2724+ ${shlibs:Depends},
2725+ ${python:Depends},
2726+ rhythmbox (= ${binary:Version}),
2727+Recommends: python-webkit,
2728+ python-mako
2729+Conflicts: rhythmbox (<< 0.12.6-1ubuntu9)
2730+Replaces: rhythmbox (<< 0.12.6-1ubuntu9)
2731+XB-Python-Version: ${python:Versions}
2732+Description: plugins for rhythmbox music player
2733+ Rhythmbox is a very easy to use music playing and management program
2734+ which supports a wide range of audio formats (including mp3 and ogg).
2735+ Originally inspired by Apple's iTunes, the current version also supports
2736+ Internet Radio, iPod integration and generic portable audio player
2737+ support, Audio CD burning, Audio CD playback, music sharing, and
2738+ Podcasts.
2739+ .
2740+ This package contains the following plugins:
2741+ - Cover art
2742+ - Audio CD Player
2743+ - Last.fm
2744+ - Context Panel
2745+ - DAAP Music Sharing
2746+ - FM Radio
2747+ - Portable Players
2748+ - IM Status
2749+ - Portable Players - iPod
2750+ - Internet Radio
2751+ - Jamendo
2752+ - Song Lyrics
2753+ - Magnatune Store
2754+ - Media Player Keys
2755+ - Portable Players - MTP
2756+ - Power Manager
2757+ - Python Console
2758+ - LIRC
2759+ - Status Icon
2760+ - Visualization
2761+ - Browser plugin to integrate Rhythmbox with itunes
2762+
2763+Package: rhythmbox-plugin-cdrecorder
2764+Architecture: any
2765+Depends: ${misc:Depends},
2766+ ${shlibs:Depends},
2767+ rhythmbox (= ${binary:Version})
2768+Conflicts: rhythmbox (<< 0.12.6-1ubuntu9)
2769+Replaces: rhythmbox (<< 0.12.6-1ubuntu9)
2770+Description: burning plugin for rhythmbox music player
2771+ Rhythmbox is a very easy to use music playing and management program
2772+ which supports a wide range of audio formats (including mp3 and ogg).
2773+ Originally inspired by Apple's iTunes, the current version also supports
2774+ Internet Radio, iPod integration and generic portable audio player
2775+ support, Audio CD burning, Audio CD playback, music sharing, and
2776+ Podcasts.
2777+ .
2778+ This package contains the brasero based CD/DVD burning plugin.
2779+
2780+Package: rhythmbox-plugin-coherence
2781+Architecture: all
2782+Depends: ${misc:Depends},
2783+ ${python:Depends},
2784+ python-coherence,
2785+ rhythmbox (>= ${gnome:Version}),
2786+ rhythmbox (<< ${gnome:NextVersion})
2787+Conflicts: rhythmbox (<< 0.12.6-1ubuntu9)
2788+Replaces: rhythmbox (<< 0.12.6-1ubuntu9)
2789+XB-Python-Version: ${python:Versions}
2790+Description: UPnp plugin for rhythmbox music player
2791+ Rhythmbox is a very easy to use music playing and management program
2792+ which supports a wide range of audio formats (including mp3 and ogg).
2793+ Originally inspired by Apple's iTunes, the current version also supports
2794+ Internet Radio, iPod integration and generic portable audio player
2795+ support, Audio CD burning, Audio CD playback, music sharing, and
2796+ Podcasts.
2797+ .
2798+ This package contains the coherence DLNA/UPnp plugin.
2799+
2800
2801=== added file 'debian/copyright'
2802--- debian/copyright 1970-01-01 00:00:00 +0000
2803+++ debian/copyright 2010-07-05 01:49:22 +0000
2804@@ -0,0 +1,61 @@
2805+Initial Debianization:
2806+This package was debianized by Colin Walters <walters@debian.org> on
2807+Wed, 31 Jul 2002 01:01:06 -0400.
2808+
2809+Source:
2810+It was downloaded from <http://ftp.gnome.org/pub/GNOME/sources/rhythmbox/>
2811+
2812+Upstream Authors and Copyright Holders:
2813+ Jorn Baayen <jorn@nl.linux.org>
2814+ Paolo Borelli <pborelli@katamail.com>
2815+ Kenneth Christiansen <kenneth@gnu.org>
2816+ David Dollar <david@grepninja.com>
2817+ Christophe Fergeau <teuf@gnome.org>
2818+ Mark Finlay <sisob@eircom.net>
2819+ Marco Pesenti Gritti <marco@it.gnome.org>
2820+ Joshua Haberman <joshua@haberman.com>
2821+ Mark Humphreys <marquee@users.sourceforge.net>
2822+ James Kahn <james@liet.net>
2823+ Laurens Krol <laurens.krol@planet.nl>
2824+ James Livingston <doclivingston@gmail.com>
2825+ Xan Lopez <xan@dimensis.com>
2826+ Ryan Lortie <desrt@desrt.ca>
2827+ Olivier Martin <oleevye@wanadoo.fr>
2828+ Jonathan Matthew <jonathan@kaolin.wh9.net>
2829+ William Jon McCann <mccann@jhu.edu>
2830+ Seth Nickell <snickell@stanford.edu>
2831+ Bastien Nocera <hadess@hadess.net>
2832+ Benjamin Otte <in7y118@public.uni-hamburg.de>
2833+ Jan Arne Petersen <jpetersen@gnome-de.org>
2834+ Kristian Rietveld <kris@gtk.org>
2835+ Yann Rouillard <y.rouillard@laposte.net>
2836+ Christian Schaller <uraeus@linuxrising.org>
2837+ Charles Schmidt <cschmidt2@emich.edu>
2838+ Dennis Smit <synap@yourbase.nl>
2839+ Bob Smith <bob@thestuff.net>
2840+ Michael Terry <mterry@fastmail.fm>
2841+ Colin Walters <walters@verbum.org>
2842+ James Willcox <jwillcox@gnome.org>
2843+ Jeffrey Yasskin <jyasskin@mail.utexas.edu>
2844+The complete list of upstream authors is in the file
2845+/usr/share/doc/rhythmbox/AUTHORS.
2846+
2847+License:
2848+
2849+ This package is free software; you can redistribute it and/or modify
2850+ it under the terms of the GNU General Public License as published by
2851+ the Free Software Foundation; either version 2 of the License, or
2852+ (at your option) any later version.
2853+
2854+ This package is distributed in the hope that it will be useful,
2855+ but WITHOUT ANY WARRANTY; without even the implied warranty of
2856+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
2857+ GNU General Public License for more details.
2858+
2859+ You should have received a copy of the GNU General Public License
2860+ along with this package; if not, write to the Free Software
2861+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
2862+
2863+On Debian systems, the complete text of the GNU General
2864+Public License can be found in `/usr/share/common-licenses/GPL'.
2865+
2866
2867=== added directory 'debian/patches'
2868=== added file 'debian/patches/01_lpi.patch'
2869--- debian/patches/01_lpi.patch 1970-01-01 00:00:00 +0000
2870+++ debian/patches/01_lpi.patch 2010-07-05 01:49:22 +0000
2871@@ -0,0 +1,44 @@
2872+diff -Nur -x '*.orig' -x '*~' rhythmbox-0.12.4/configure.ac rhythmbox-0.12.4.new/configure.ac
2873+--- rhythmbox-0.12.4/configure.ac 2009-08-23 20:38:42.000000000 +1000
2874++++ rhythmbox-0.12.4.new/configure.ac 2009-08-27 15:43:11.000000000 +1000
2875+@@ -88,6 +88,7 @@
2876+ gtk+-2.0 >= $GTK_REQS \
2877+ glib-2.0 >= $GLIB_REQS \
2878+ gio-2.0 >= $GLIB_REQS \
2879++ launchpad-integration \
2880+ gio-unix-2.0 >= $GLIB_REQS \
2881+ gnome-media-profiles >= $GNOME_MEDIA_PROFILES_REQS \
2882+ libsoup-2.4 >= $LIBSOUP_REQS \
2883+diff -Nur -x '*.orig' -x '*~' rhythmbox-0.12.4/data/ui/rhythmbox-ui.xml rhythmbox-0.12.4.new/data/ui/rhythmbox-ui.xml
2884+--- rhythmbox-0.12.4/data/ui/rhythmbox-ui.xml 2009-08-23 20:38:42.000000000 +1000
2885++++ rhythmbox-0.12.4.new/data/ui/rhythmbox-ui.xml 2009-08-27 15:42:36.000000000 +1000
2886+@@ -90,6 +90,7 @@
2887+
2888+ <menu name="HelpMenu" action="Help">
2889+ <menuitem name="HelpContentsMenu" action="HelpContents"/>
2890++ <placeholder name="LaunchpadItems"/>
2891+ <menuitem name="HelpAboutMenu" action="HelpAbout"/>
2892+ </menu>
2893+
2894+diff -Nur -x '*.orig' -x '*~' rhythmbox-0.12.4/shell/rb-shell.c rhythmbox-0.12.4.new/shell/rb-shell.c
2895+--- rhythmbox-0.12.4/shell/rb-shell.c 2009-08-23 20:38:43.000000000 +1000
2896++++ rhythmbox-0.12.4.new/shell/rb-shell.c 2009-08-27 15:42:36.000000000 +1000
2897+@@ -35,6 +35,7 @@
2898+ #include <ctype.h>
2899+ #include <stdio.h>
2900+ #include <sys/stat.h>
2901++#include <launchpad-integration.h>
2902+
2903+ #include <glib/gi18n.h>
2904+ #include <gdk/gdk.h>
2905+@@ -1257,6 +1258,10 @@
2906+ gtk_ui_manager_ensure_update (shell->priv->ui_manager);
2907+ gtk_window_add_accel_group (GTK_WINDOW (shell->priv->window),
2908+ gtk_ui_manager_get_accel_group (shell->priv->ui_manager));
2909++
2910++ launchpad_integration_add_ui (shell->priv->ui_manager,
2911++ "/MenuBar/HelpMenu/LaunchpadItems");
2912++
2913+ menubar = gtk_ui_manager_get_widget (shell->priv->ui_manager, "/MenuBar");
2914+
2915+ gtk_box_pack_start (GTK_BOX (shell->priv->main_vbox), menubar, FALSE, FALSE, 0);
2916
2917=== added file 'debian/patches/03_magnatune_partner.patch'
2918--- debian/patches/03_magnatune_partner.patch 1970-01-01 00:00:00 +0000
2919+++ debian/patches/03_magnatune_partner.patch 2010-07-05 01:49:22 +0000
2920@@ -0,0 +1,14 @@
2921+# Description: Set "ubuntu" as partner ID in the magnatune plugin
2922+# Ubuntu-specific: Yes
2923+diff -Nur -x '*.orig' -x '*~' rhythmbox-0.12.4/plugins/magnatune/magnatune/MagnatuneSource.py rhythmbox-0.12.4.new/plugins/magnatune/magnatune/MagnatuneSource.py
2924+--- rhythmbox-0.12.4/plugins/magnatune/magnatune/MagnatuneSource.py 2009-08-23 20:38:43.000000000 +1000
2925++++ rhythmbox-0.12.4.new/plugins/magnatune/magnatune/MagnatuneSource.py 2009-08-27 15:43:31.000000000 +1000
2926+@@ -47,7 +47,7 @@
2927+ # pass
2928+
2929+
2930+-magnatune_partner_id = "rhythmbox"
2931++magnatune_partner_id = "ubuntu"
2932+
2933+ # URIs
2934+ magnatune_song_info_uri = "http://magnatune.com/info/song_info_xml.zip"
2935
2936=== added file 'debian/patches/04_podcast_query_info.patch'
2937--- debian/patches/04_podcast_query_info.patch 1970-01-01 00:00:00 +0000
2938+++ debian/patches/04_podcast_query_info.patch 2010-07-05 01:49:22 +0000
2939@@ -0,0 +1,267 @@
2940+#
2941+# Description: Use g_file_input_stream_query_info() to avoid HTTP HEAD request (which fails on buggy servers)
2942+# Ubuntu: https://bugs.edge.launchpad.net/ubuntu/+source/rhythmbox/+bug/437454
2943+# Upstream: https://bugzilla.gnome.org/show_bug.cgi?id=596615
2944+#
2945+diff -Nur -x '*.orig' -x '*~' rhythmbox-0.12.5/podcast/rb-podcast-manager.c rhythmbox-0.12.5.new/podcast/rb-podcast-manager.c
2946+--- rhythmbox-0.12.5/podcast/rb-podcast-manager.c 2009-09-17 07:04:49.000000000 +1000
2947++++ rhythmbox-0.12.5.new/podcast/rb-podcast-manager.c 2009-10-15 16:36:03.000000000 +1100
2948+@@ -153,9 +153,14 @@
2949+ guint prop_id,
2950+ GValue *value,
2951+ GParamSpec *pspec);
2952++static void read_file_cb (GFile *source,
2953++ GAsyncResult *result,
2954++ RBPodcastManagerInfo *data);
2955+ static void download_file_info_cb (GFile *source,
2956+ GAsyncResult *result,
2957+ RBPodcastManagerInfo *data);
2958++static void download_podcast (GFileInfo *src_info,
2959++ RBPodcastManagerInfo *data);
2960+ static void rb_podcast_manager_abort_download (RBPodcastManagerInfo *data);
2961+ static gboolean rb_podcast_manager_sync_head_cb (gpointer data);
2962+ static gboolean rb_podcast_manager_head_query_cb (GtkTreeModel *query_model,
2963+@@ -618,7 +623,7 @@
2964+ }
2965+
2966+ static void
2967+-download_error (RBPodcastManagerInfo *data, GError *error)
2968++download_error (RBPodcastManagerInfo *data, GError *error, gboolean in_thread)
2969+ {
2970+ GValue val = {0,};
2971+ rb_debug ("error downloading %s: %s",
2972+@@ -636,7 +641,12 @@
2973+ g_value_unset (&val);
2974+
2975+ rhythmdb_commit (data->pd->priv->db);
2976+- g_idle_add ((GSourceFunc)end_job, data);
2977++
2978++ if (in_thread) {
2979++ g_idle_add ((GSourceFunc)end_job, data);
2980++ } else {
2981++ rb_podcast_manager_abort_download (data);
2982++ }
2983+ }
2984+
2985+ static gboolean
2986+@@ -645,7 +655,6 @@
2987+ const char *location;
2988+ RBPodcastManagerInfo *data;
2989+ char *query_string;
2990+- const char *attrs;
2991+ GList *d;
2992+
2993+ g_assert (rb_is_main_thread ());
2994+@@ -689,69 +698,103 @@
2995+
2996+ data->source = g_file_new_for_uri (location);
2997+
2998+- attrs = G_FILE_ATTRIBUTE_STANDARD_SIZE ","
2999+- G_FILE_ATTRIBUTE_STANDARD_COPY_NAME ","
3000+- G_FILE_ATTRIBUTE_STANDARD_EDIT_NAME;
3001+- g_file_query_info_async (data->source,
3002+- attrs,
3003+- G_FILE_QUERY_INFO_NONE,
3004+- 0,
3005+- data->cancel,
3006+- (GAsyncReadyCallback) download_file_info_cb,
3007+- data);
3008++ g_file_read_async (data->source,
3009++ 0,
3010++ data->cancel,
3011++ (GAsyncReadyCallback) read_file_cb,
3012++ data);
3013+
3014+ GDK_THREADS_LEAVE ();
3015+ return FALSE;
3016+ }
3017+
3018+ static void
3019+-download_file_info_cb (GFile *source,
3020+- GAsyncResult *result,
3021+- RBPodcastManagerInfo *data)
3022++read_file_cb (GFile *source,
3023++ GAsyncResult *result,
3024++ RBPodcastManagerInfo *data)
3025+ {
3026+ GError *error = NULL;
3027+ GFileInfo *src_info;
3028+- char *local_file_name = NULL;
3029+- char *feed_folder;
3030+- char *esc_local_file_name;
3031+- char *local_file_uri;
3032+- char *sane_local_file_uri;
3033+- char *conf_dir_uri;
3034+
3035+ g_assert (rb_is_main_thread ());
3036+
3037+- rb_debug ("got file info results for %s",
3038++ rb_debug ("started read for %s",
3039+ get_remote_location (data->entry));
3040+
3041+- src_info = g_file_query_info_finish (source, result, &error);
3042+-
3043+- /* ignore G_IO_ERROR_FAILED here, as it probably just means that the server is lame.
3044+- * actual problems (not found, permission denied, etc.) have specific errors codes,
3045+- * so they'll still be reported.
3046++ data->in_stream = g_file_read_finish (data->source,
3047++ result,
3048++ &error);
3049++ if (error != NULL) {
3050++ download_error (data, error, FALSE);
3051++ g_error_free (error);
3052++ return;
3053++ }
3054++
3055++ src_info = g_file_input_stream_query_info (data->in_stream,
3056++ G_FILE_ATTRIBUTE_STANDARD_SIZE ","
3057++ G_FILE_ATTRIBUTE_STANDARD_COPY_NAME ","
3058++ G_FILE_ATTRIBUTE_STANDARD_EDIT_NAME,
3059++ NULL,
3060++ &error);
3061++
3062++ /* If no stream information then probably using an old version of gvfs, fall back
3063++ * to getting the stream information from the GFile.
3064++ * This branch can be removed when this version of gvfs is released, see:
3065++ * https://bugzilla.gnome.org/show_bug.cgi?id=598505
3066+ */
3067+- if (error != NULL && g_error_matches (error, G_IO_ERROR, G_IO_ERROR_FAILED) == FALSE) {
3068+- GValue val = {0,};
3069++ if (error != NULL) {
3070++ rb_debug ("file info query from input failed, trying query on file: %s", error->message);
3071++ g_error_free (error);
3072+
3073+- rb_debug ("file info query failed: %s", error->message);
3074++ g_file_query_info_async (data->source,
3075++ G_FILE_ATTRIBUTE_STANDARD_SIZE ","
3076++ G_FILE_ATTRIBUTE_STANDARD_COPY_NAME ","
3077++ G_FILE_ATTRIBUTE_STANDARD_EDIT_NAME,
3078++ G_FILE_QUERY_INFO_NONE,
3079++ 0,
3080++ data->cancel,
3081++ (GAsyncReadyCallback) download_file_info_cb,
3082++ data);
3083++ return;
3084++ }
3085+
3086+- g_value_init (&val, G_TYPE_ULONG);
3087+- g_value_set_ulong (&val, RHYTHMDB_PODCAST_STATUS_ERROR);
3088+- rhythmdb_entry_set (data->pd->priv->db, data->entry, RHYTHMDB_PROP_STATUS, &val);
3089+- g_value_unset (&val);
3090++ rb_debug ("got file info results for %s",
3091++ get_remote_location (data->entry));
3092+
3093+- g_value_init (&val, G_TYPE_STRING);
3094+- g_value_set_string (&val, error->message);
3095+- rhythmdb_entry_set (data->pd->priv->db, data->entry, RHYTHMDB_PROP_PLAYBACK_ERROR, &val);
3096+- g_value_unset (&val);
3097++ download_podcast (src_info, data);
3098++}
3099+
3100+- rhythmdb_commit (data->pd->priv->db);
3101++static void
3102++download_file_info_cb (GFile *source,
3103++ GAsyncResult *result,
3104++ RBPodcastManagerInfo *data)
3105++{
3106++ GError *error = NULL;
3107++ GFileInfo *src_info;
3108++
3109++ src_info = g_file_query_info_finish (source, result, &error);
3110+
3111++ if (error != NULL) {
3112++ download_error (data, error, FALSE);
3113+ g_error_free (error);
3114+- rb_podcast_manager_abort_download (data);
3115+- return;
3116+ } else {
3117+- g_clear_error (&error);
3118++ rb_debug ("got file info results for %s",
3119++ get_remote_location (data->entry));
3120++
3121++ download_podcast (src_info, data);
3122+ }
3123++}
3124++
3125++static void
3126++download_podcast (GFileInfo *src_info, RBPodcastManagerInfo *data)
3127++{
3128++ GError *error = NULL;
3129++ char *local_file_name = NULL;
3130++ char *feed_folder;
3131++ char *esc_local_file_name;
3132++ char *local_file_uri;
3133++ char *sane_local_file_uri;
3134++ char *conf_dir_uri;
3135+
3136+ if (src_info != NULL) {
3137+ data->download_size = g_file_info_get_attribute_uint64 (src_info, G_FILE_ATTRIBUTE_STANDARD_SIZE);
3138+@@ -769,7 +812,7 @@
3139+
3140+ if (local_file_name == NULL) {
3141+ /* fall back to the basename from the original URI */
3142+- local_file_name = g_file_get_basename (source);
3143++ local_file_name = g_file_get_basename (data->source);
3144+ rb_debug ("didn't get a filename from the file info request; using basename %s", local_file_name);
3145+ }
3146+
3147+@@ -819,7 +862,6 @@
3148+ return;
3149+ }
3150+
3151+-
3152+ data->destination = g_file_new_for_uri (sane_local_file_uri);
3153+ if (g_file_query_exists (data->destination, NULL)) {
3154+ GFileInfo *dest_info;
3155+@@ -892,7 +934,7 @@
3156+ TRUE,
3157+ &error);
3158+ if (error != NULL) {
3159+- download_error (data, error);
3160++ download_error (data, error, TRUE);
3161+ g_error_free (error);
3162+ }
3163+ }
3164+@@ -1407,14 +1449,6 @@
3165+ gssize n_read;
3166+ gssize n_written;
3167+ guint64 downloaded;
3168+-
3169+- /* open remote file */
3170+- data->in_stream = g_file_read (data->source, data->cancel, &error);
3171+- if (error != NULL) {
3172+- download_error (data, error);
3173+- g_error_free (error);
3174+- return NULL;
3175+- }
3176+
3177+ /* if we have an offset to download from, try the seek
3178+ * before anything else. if we can't seek, we'll have to
3179+@@ -1443,7 +1477,7 @@
3180+ }
3181+ }
3182+ if (error != NULL) {
3183+- download_error (data, error);
3184++ download_error (data, error, TRUE);
3185+ g_error_free (error);
3186+ return NULL;
3187+ }
3188+@@ -1491,7 +1525,7 @@
3189+ data->cancel,
3190+ &error);
3191+ if (error != NULL) {
3192+- download_error (data, error);
3193++ download_error (data, error, TRUE);
3194+ g_error_free (error);
3195+ return NULL;
3196+ }
3197+@@ -1535,7 +1569,8 @@
3198+ g_object_unref (data->out_stream);
3199+
3200+ if (error != NULL) {
3201+- download_error (data, error);
3202++ download_error (data, error, TRUE);
3203++ g_error_free (error);
3204+ } else {
3205+ download_progress (data, downloaded, data->download_size, TRUE);
3206+ }
3207
3208=== added file 'debian/patches/05_ignore_ptp_cameras.patch'
3209--- debian/patches/05_ignore_ptp_cameras.patch 1970-01-01 00:00:00 +0000
3210+++ debian/patches/05_ignore_ptp_cameras.patch 2010-07-05 01:49:22 +0000
3211@@ -0,0 +1,83 @@
3212+From 4a1122d3dcf78da9b33846e0d017b408118871dd Mon Sep 17 00:00:00 2001
3213+From: Martin Pitt <martin.pitt@ubuntu.com>
3214+Date: Wed, 14 Apr 2010 16:32:52 +0200
3215+Subject: [PATCH 1/2] MTP: Ignore PTP cameras
3216+
3217+libmtp also detects PTP cameras. It does not actually know them (in the udev
3218+rules), but since we do not check for this, PTP cameras regularly appear in
3219+Rhythmbox, which is confusing and useless.
3220+
3221+Check the supported file types of the device for audio types, and ignore the
3222+device if there aren't any suitable ones. Please note that a lot of cameras
3223+support read-only WAV, which is fairly uninteresting for our purposes and would
3224+lead to detecting them as music players, so ignore WAV.
3225+
3226+Bug: https://bugzilla.gnome.org/show_bug.cgi?id=615743
3227+Bug-Ubuntu: https://launchpad.net/bugs/544994
3228+---
3229+ plugins/mtpdevice/rb-mtp-plugin.c | 42 +++++++++++++++++++++++++++++++++++++
3230+ 1 files changed, 42 insertions(+), 0 deletions(-)
3231+
3232+diff --git a/plugins/mtpdevice/rb-mtp-plugin.c b/plugins/mtpdevice/rb-mtp-plugin.c
3233+index e5ca327..170aefb 100644
3234+--- a/plugins/mtpdevice/rb-mtp-plugin.c
3235++++ b/plugins/mtpdevice/rb-mtp-plugin.c
3236+@@ -327,6 +327,43 @@ source_deleted_cb (RBMtpSource *source, RBMtpPlugin *plugin)
3237+ plugin->mtp_sources = g_list_remove (plugin->mtp_sources, source);
3238+ }
3239+
3240++/* libmtp also detects PTP cameras, thus check if the device is actually
3241++ * capable of audio */
3242++static gboolean
3243++is_audio_player (LIBMTP_raw_device_t *raw_device)
3244++{
3245++ LIBMTP_mtpdevice_t *device;
3246++ uint16_t *file_types;
3247++ uint16_t file_types_count, i;
3248++ gboolean ret = FALSE;
3249++
3250++ device = LIBMTP_Open_Raw_Device (raw_device);
3251++ if (device == NULL) {
3252++ rb_debug ("Cannot open device, ignoring");
3253++ return FALSE;
3254++ }
3255++ if (LIBMTP_Get_Supported_Filetypes (device, &file_types, &file_types_count) != 0) {
3256++ rb_debug ("Error reading file types from %s", LIBMTP_Get_Friendlyname (device));
3257++ LIBMTP_Dump_Errorstack (device);
3258++ return FALSE;
3259++ }
3260++ LIBMTP_Release_Device (device);
3261++
3262++ for (i = 0; i < file_types_count; ++i) {
3263++ /* a lot of cameras support read-only WAV, which is fairly
3264++ * uninteresting for our purposes and leads to detecting them
3265++ * as music players, so ignore it */
3266++ if (file_types[i] != LIBMTP_FILETYPE_WAV && LIBMTP_FILETYPE_IS_AUDIO (file_types[i])) {
3267++ ret = TRUE;
3268++ break;
3269++ }
3270++ }
3271++
3272++ free (file_types);
3273++
3274++ return ret;
3275++}
3276++
3277+ static RBSource *
3278+ create_source_device_cb (RBRemovableMediaManager *rmm, GObject *device_obj, RBMtpPlugin *plugin)
3279+ {
3280+@@ -379,6 +416,11 @@ create_source_device_cb (RBRemovableMediaManager *rmm, GObject *device_obj, RBMt
3281+ continue;
3282+ }
3283+
3284++ if (!is_audio_player (&raw_devices[i])) {
3285++ rb_debug ("device is not an audio player, ignoring");
3286++ continue;
3287++ }
3288++
3289+ rb_debug ("device matched, creating a source");
3290+ source = rb_mtp_source_new (plugin->shell, RB_PLUGIN (plugin), device, &raw_devices[i]);
3291+
3292+--
3293+1.7.0.4
3294+
3295
3296=== added file 'debian/patches/06_mtp_memleak.patch'
3297--- debian/patches/06_mtp_memleak.patch 1970-01-01 00:00:00 +0000
3298+++ debian/patches/06_mtp_memleak.patch 2010-07-05 01:49:22 +0000
3299@@ -0,0 +1,30 @@
3300+From 504142f42bb3f54e3e5be5ff8967fd1aef3f994f Mon Sep 17 00:00:00 2001
3301+From: Martin Pitt <martin.pitt@ubuntu.com>
3302+Date: Wed, 14 Apr 2010 16:46:18 +0200
3303+Subject: [PATCH 2/2] MTP: Fix memory leak
3304+
3305+Free the list returned by LIBMTP_Detect_Raw_Devices() after we are done with
3306+it.
3307+---
3308+ plugins/mtpdevice/rb-mtp-plugin.c | 2 ++
3309+ 1 files changed, 2 insertions(+), 0 deletions(-)
3310+
3311+diff --git a/plugins/mtpdevice/rb-mtp-plugin.c b/plugins/mtpdevice/rb-mtp-plugin.c
3312+index 170aefb..d1563e0 100644
3313+--- a/plugins/mtpdevice/rb-mtp-plugin.c
3314++++ b/plugins/mtpdevice/rb-mtp-plugin.c
3315+@@ -428,9 +428,11 @@ create_source_device_cb (RBRemovableMediaManager *rmm, GObject *device_obj, RBMt
3316+ g_signal_connect_object (G_OBJECT (source),
3317+ "deleted", G_CALLBACK (source_deleted_cb),
3318+ plugin, 0);
3319++ free (raw_devices);
3320+ return source;
3321+ }
3322+ }
3323++ free (raw_devices);
3324+
3325+ rb_debug ("device didn't match anything");
3326+ return NULL;
3327+--
3328+1.7.0.4
3329+
3330
3331=== added file 'debian/patches/07_use_escaped_podcast_uri.patch'
3332--- debian/patches/07_use_escaped_podcast_uri.patch 1970-01-01 00:00:00 +0000
3333+++ debian/patches/07_use_escaped_podcast_uri.patch 2010-07-05 01:49:22 +0000
3334@@ -0,0 +1,45 @@
3335+From dcba3a512eb1f870992d9d7817470e44c0b04615 Mon Sep 17 00:00:00 2001
3336+From: Robert Ancell <robert.ancell@gmail.com>
3337+Date: Tue, 22 Jun 2010 16:31:22 +1000
3338+Subject: [PATCH] Use escaped URI instead of basename for downloaded podcasts, a podcast may have multiple files with the same basename
3339+Bug: https://bugzilla.gnome.org/show_bug.cgi?id=600504
3340+Bug-Ubuntu: https://bugs.edge.launchpad.net/ubuntu/+source/rhythmbox/+bug/445141
3341+
3342+---
3343+ podcast/rb-podcast-manager.c | 13 ++++++++++---
3344+ 1 files changed, 10 insertions(+), 3 deletions(-)
3345+
3346+diff --git a/podcast/rb-podcast-manager.c b/podcast/rb-podcast-manager.c
3347+index c220bf2..c23c320 100644
3348+--- a/podcast/rb-podcast-manager.c
3349++++ b/podcast/rb-podcast-manager.c
3350+@@ -29,6 +29,7 @@
3351+ #include "config.h"
3352+
3353+ #include <string.h>
3354++#include <ctype.h>
3355+ #define __USE_XOPEN
3356+ #include <time.h>
3357+
3358+@@ -790,9 +791,15 @@ download_podcast (GFileInfo *src_info, RBPodcastManagerInfo *data)
3359+ }
3360+
3361+ if (local_file_name == NULL) {
3362+- /* fall back to the basename from the original URI */
3363+- local_file_name = g_file_get_basename (data->source);
3364+- rb_debug ("didn't get a filename from the file info request; using basename %s", local_file_name);
3365++ char *c;
3366++
3367++ /* fall back to the escaped URI */
3368++ local_file_name = g_file_get_uri (data->source);
3369++ for (c = local_file_name; *c; c++) {
3370++ if (!isalnum (*c) && *c != '.')
3371++ *c = '-';
3372++ }
3373++ rb_debug ("didn't get a filename from the file info request; using escaped uri %s", local_file_name);
3374+ }
3375+
3376+ /* if the filename ends with the query string from the original URI,
3377+--
3378+1.7.0.4
3379+
3380
3381=== added file 'debian/patches/80_update_louie_imports.patch'
3382--- debian/patches/80_update_louie_imports.patch 1970-01-01 00:00:00 +0000
3383+++ debian/patches/80_update_louie_imports.patch 2010-07-05 01:49:22 +0000
3384@@ -0,0 +1,37 @@
3385+--- rhythmbox-0.12.5.orig/plugins/coherence/upnp_coherence/__init__.py
3386++++ rhythmbox-0.12.5/plugins/coherence/upnp_coherence/__init__.py
3387+@@ -12,7 +12,7 @@
3388+
3389+ import gconf
3390+
3391+-import louie
3392++import coherence.extern.louie as louie
3393+
3394+ from coherence import log
3395+
3396+only in patch2:
3397+unchanged:
3398+--- rhythmbox-0.12.5.orig/plugins/coherence/upnp_coherence/MediaStore.py
3399++++ rhythmbox-0.12.5/plugins/coherence/upnp_coherence/MediaStore.py
3400+@@ -6,7 +6,7 @@
3401+
3402+ import os.path
3403+ import rhythmdb
3404+-import louie
3405++import coherence.extern.louie as louie
3406+ import urllib
3407+
3408+ from coherence import __version_info__
3409+only in patch2:
3410+unchanged:
3411+--- rhythmbox-0.12.5.orig/plugins/coherence/upnp_coherence/MediaPlayer.py
3412++++ rhythmbox-0.12.5/plugins/coherence/upnp_coherence/MediaPlayer.py
3413+@@ -13,7 +13,7 @@
3414+ from coherence.upnp.core.soap_service import errorCode
3415+ from coherence.upnp.core import DIDLLite
3416+
3417+-import louie
3418++import coherence.extern.louie as louie
3419+
3420+ from coherence.extern.simple_plugin import Plugin
3421+
3422
3423=== added file 'debian/patches/82_rhythmbox-indicators.patch'
3424--- debian/patches/82_rhythmbox-indicators.patch 1970-01-01 00:00:00 +0000
3425+++ debian/patches/82_rhythmbox-indicators.patch 2010-07-05 01:49:22 +0000
3426@@ -0,0 +1,634 @@
3427+# Description: indicator application use
3428+# Upstream: https://bugzilla.gnome.org/show_bug.cgi?id=606972
3429+# Ubuntu: https://bugs.launchpad.net/ubuntu/+source/rhythmbox/+bug/498588
3430+diff --git a/configure.ac b/configure.ac
3431+index 6349a15..134ec20 100644
3432+--- a/configure.ac
3433++++ b/configure.ac
3434+@@ -46,6 +46,7 @@ LIBSOUP_REQS=2.26.0
3435+ GUDEV_REQS=143
3436+ LIBMTP_REQS=0.3.0
3437+ PYGOBJECT_REQUIRED=2.15.4
3438++APPINDICATOR_REQS=0.0.13
3439+
3440+ AC_MSG_CHECKING([for GNU extension fwrite_unlocked])
3441+ AC_LINK_IFELSE(
3442+@@ -314,6 +315,29 @@ if test x$enable_libnotify = xyes ; then
3443+ AC_SUBST(NOTIFY_LIBS)
3444+ fi
3445+
3446++dnl application indicator
3447++AC_ARG_ENABLE([appindicator],
3448++ AS_HELP_STRING([--enable-appindicator[=@<:@no/auto/yes@:>@]],
3449++ [Build support for application indicators]),
3450++ [enable_appindicator=$enableval],
3451++ [enable_appindicator="auto"])
3452++
3453++if test x$enable_appindicator = xauto ; then
3454++ PKG_CHECK_EXISTS([appindicator-0.1 >= $APPINDICATOR_REQS],
3455++ [enable_appindicator="yes"],
3456++ [enable_appindicator="no"])
3457++fi
3458++
3459++if test x$enable_appindicator = xyes ; then
3460++ PKG_CHECK_MODULES(APP_INDICATOR,
3461++ [appindicator-0.1 >= $APPINDICATOR_REQS],
3462++ AC_DEFINE(HAVE_APP_INDICATOR, 1, [Have AppIndicator]))
3463++fi
3464++AM_CONDITIONAL(HAVE_APP_INDICATOR, test x"$enable_appindicator" = xyes)
3465++
3466++AC_SUBST(APP_INDICATOR_CFLAGS)
3467++AC_SUBST(APP_INDICATOR_LIBS)
3468++
3469+ dnl daap support
3470+ if test "x$enable_daap" != "xno"; then
3471+ if test x"$have_mdns" = xno; then
3472+@@ -951,4 +975,10 @@ else
3473+ AC_MSG_NOTICE([ iTunes detection browser plugin (for podcasts) disabled])
3474+ fi
3475+
3476++if test "x$enable_appindicator" != xno ; then
3477++ AC_MSG_NOTICE([** Application indicators enabled])
3478++else
3479++ AC_MSG_NOTICE([ Application indicators not enabled.])
3480++fi
3481++
3482+ AC_MSG_NOTICE([End options])
3483+diff --git a/plugins/status-icon/Makefile.am b/plugins/status-icon/Makefile.am
3484+index f8265fc..df75b93 100644
3485+--- a/plugins/status-icon/Makefile.am
3486++++ b/plugins/status-icon/Makefile.am
3487+@@ -4,8 +4,15 @@ plugindir = $(PLUGINDIR)/status-icon
3488+ plugin_LTLIBRARIES = libstatus-icon.la
3489+
3490+ ICON_IMPL_FILES = \
3491+- rb-tray-icon-gtk.h \
3492++ rb-tray-icon-gtk.h
3493++
3494++if HAVE_APP_INDICATOR
3495++ICON_IMPL_FILES += \
3496++ rb-indicator.c
3497++else
3498++ICON_IMPL_FILES += \
3499+ rb-tray-icon-gtk.c
3500++endif
3501+
3502+ libstatus_icon_la_SOURCES = \
3503+ rb-status-icon-plugin.h \
3504+@@ -20,6 +27,7 @@ libstatus_icon_la_LIBTOOLFLAGS = --tag=disable-static
3505+ libstatus_icon_la_LIBADD = \
3506+ $(top_builddir)/shell/librhythmbox-core.la \
3507+ $(NOTIFY_LIBS) \
3508++ $(APP_INDICATOR_LIBS) \
3509+ $(NULL)
3510+
3511+ INCLUDES = \
3512+@@ -36,6 +44,7 @@ INCLUDES = \
3513+ -DSHARE_DIR=\"$(pkgdatadir)\" \
3514+ -DDATADIR=\""$(datadir)"\" \
3515+ $(RHYTHMBOX_CFLAGS) \
3516++ $(APP_INDICATOR_CFLAGS) \
3517+ -D_XOPEN_SOURCE -D_BSD_SOURCE
3518+
3519+ uixmldir = $(plugindir)
3520+diff --git a/plugins/status-icon/rb-indicator.c b/plugins/status-icon/rb-indicator.c
3521+new file mode 100644
3522+index 0000000..134a3c7
3523+--- /dev/null
3524++++ b/plugins/status-icon/rb-indicator.c
3525+@@ -0,0 +1,279 @@
3526++/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
3527++ *
3528++ * Copyright (C) 2003,2004 Colin Walters <walters@redhat.com>
3529++ * Copyright (C) 2009 Canonical Ltd.
3530++ *
3531++ * This program is free software; you can redistribute it and/or modify
3532++ * it under the terms of the GNU General Public License as published by
3533++ * the Free Software Foundation; either version 2 of the License, or
3534++ * (at your option) any later version.
3535++ *
3536++ * The Rhythmbox authors hereby grant permission for non-GPL compatible
3537++ * GStreamer plugins to be used and distributed together with GStreamer
3538++ * and Rhythmbox. This permission is above and beyond the permissions granted
3539++ * by the GPL license by which Rhythmbox is covered. If you modify this code
3540++ * you may extend this exception to your version of the code, but you are not
3541++ * obligated to do so. If you do not wish to do so, delete this exception
3542++ * statement from your version.
3543++ *
3544++ * This program is distributed in the hope that it will be useful,
3545++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
3546++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
3547++ * GNU General Public License for more details.
3548++ *
3549++ * You should have received a copy of the GNU General Public License
3550++ * along with this program; if not, write to the Free Software
3551++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
3552++ *
3553++ */
3554++
3555++#include <config.h>
3556++
3557++#include <unistd.h>
3558++#include <stdlib.h>
3559++#include <string.h>
3560++
3561++#include <glib/gi18n.h>
3562++#include <gtk/gtk.h>
3563++
3564++#include <libappindicator/app-indicator.h>
3565++
3566++#include "rb-tray-icon-gtk.h"
3567++#include "rb-stock-icons.h"
3568++#include "rb-debug.h"
3569++#include "rb-shell-player.h"
3570++#include "rb-util.h"
3571++
3572++
3573++static void rb_tray_icon_class_init (RBTrayIconClass *klass);
3574++static void rb_tray_icon_init (RBTrayIcon *indicator);
3575++static void rb_tray_icon_constructed (GObject *object);
3576++static void rb_tray_icon_dispose (GObject *object);
3577++static void rb_tray_icon_set_property (GObject *object,
3578++ guint prop_id,
3579++ const GValue *value,
3580++ GParamSpec *pspec);
3581++static void rb_tray_icon_get_property (GObject *object,
3582++ guint prop_id,
3583++ GValue *value,
3584++ GParamSpec *pspec);
3585++static void rb_tray_icon_playing_changed_cb (RBShellPlayer *player,
3586++ gboolean playing,
3587++ RBTrayIcon *indicator);
3588++
3589++struct _RBTrayIconPrivate
3590++{
3591++ RBStatusIconPlugin *plugin;
3592++ AppIndicator *indicator;
3593++ RBShellPlayer *shell_player;
3594++};
3595++
3596++enum
3597++{
3598++ PROP_0,
3599++ PROP_PLUGIN,
3600++ PROP_SHELL_PLAYER
3601++};
3602++
3603++enum
3604++{
3605++ LAST_SIGNAL,
3606++};
3607++
3608++G_DEFINE_TYPE (RBTrayIcon, rb_tray_icon, G_TYPE_OBJECT)
3609++
3610++static void
3611++rb_tray_icon_class_init (RBTrayIconClass *klass)
3612++{
3613++ GObjectClass *object_class = G_OBJECT_CLASS (klass);
3614++
3615++ object_class->dispose = rb_tray_icon_dispose;
3616++ object_class->constructed = rb_tray_icon_constructed;
3617++
3618++ object_class->set_property = rb_tray_icon_set_property;
3619++ object_class->get_property = rb_tray_icon_get_property;
3620++
3621++ g_object_class_install_property (object_class,
3622++ PROP_PLUGIN,
3623++ g_param_spec_object ("plugin",
3624++ "RBStatusIconPlugin",
3625++ "RBStatusIconPlugin object",
3626++ RB_TYPE_STATUS_ICON_PLUGIN,
3627++ G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
3628++ g_object_class_install_property (object_class,
3629++ PROP_SHELL_PLAYER,
3630++ g_param_spec_object ("shell-player",
3631++ "RBShellPlayer",
3632++ "RBShellPlayer object",
3633++ RB_TYPE_SHELL_PLAYER,
3634++ G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
3635++
3636++ g_type_class_add_private (klass, sizeof (RBTrayIconPrivate));
3637++}
3638++
3639++static void
3640++rb_tray_icon_init (RBTrayIcon *indicator)
3641++{
3642++ indicator->priv = G_TYPE_INSTANCE_GET_PRIVATE ((indicator), RB_TYPE_TRAY_ICON, RBTrayIconPrivate);
3643++
3644++ indicator->priv->indicator = app_indicator_new_with_path ("rhythmbox",
3645++ RB_STOCK_TRAY_ICON_NOT_PLAYING,
3646++ APP_INDICATOR_CATEGORY_APPLICATION_STATUS,
3647++ SHARE_DIR G_DIR_SEPARATOR_S "icons");
3648++ app_indicator_set_status (indicator->priv->indicator,
3649++ APP_INDICATOR_STATUS_PASSIVE);
3650++}
3651++
3652++static void
3653++rb_tray_icon_constructed (GObject *object)
3654++{
3655++ RBTrayIcon *indicator;
3656++ GtkWidget *menu;
3657++
3658++ RB_CHAIN_GOBJECT_METHOD (rb_tray_icon_parent_class, constructed, object);
3659++ indicator = RB_TRAY_ICON (object);
3660++
3661++ menu = rb_status_icon_get_popup (indicator->priv->plugin);
3662++ app_indicator_set_menu (indicator->priv->indicator,
3663++ GTK_MENU (menu));
3664++
3665++ g_signal_connect_object (indicator->priv->shell_player,
3666++ "playing-changed",
3667++ G_CALLBACK (rb_tray_icon_playing_changed_cb),
3668++ indicator, 0);
3669++}
3670++
3671++static void
3672++rb_tray_icon_dispose (GObject *object)
3673++{
3674++ RBTrayIcon *indicator;
3675++
3676++ g_return_if_fail (object != NULL);
3677++ g_return_if_fail (RB_IS_TRAY_ICON (object));
3678++
3679++ indicator = RB_TRAY_ICON (object);
3680++
3681++ g_return_if_fail (indicator->priv != NULL);
3682++
3683++ if (indicator->priv->indicator != NULL) {
3684++ g_object_unref (indicator->priv->indicator);
3685++ indicator->priv->indicator = NULL;
3686++ }
3687++
3688++ G_OBJECT_CLASS (rb_tray_icon_parent_class)->dispose (object);
3689++}
3690++
3691++static void
3692++rb_tray_icon_playing_changed_cb (RBShellPlayer *player, gboolean playing, RBTrayIcon *indicator)
3693++{
3694++ const char *icon_name;
3695++
3696++ icon_name = playing ? RB_STOCK_TRAY_ICON_PLAYING : RB_STOCK_TRAY_ICON_NOT_PLAYING;
3697++ app_indicator_set_icon (indicator->priv->indicator, icon_name);
3698++}
3699++
3700++static void
3701++rb_tray_icon_set_property (GObject *object,
3702++ guint prop_id,
3703++ const GValue *value,
3704++ GParamSpec *pspec)
3705++{
3706++ RBTrayIcon *indicator = RB_TRAY_ICON (object);
3707++
3708++ switch (prop_id)
3709++ {
3710++ case PROP_SHELL_PLAYER:
3711++ indicator->priv->shell_player = g_value_get_object (value);
3712++ break;
3713++ case PROP_PLUGIN:
3714++ indicator->priv->plugin = g_value_get_object (value);
3715++ break;
3716++ default:
3717++ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
3718++ break;
3719++ }
3720++}
3721++
3722++static void
3723++rb_tray_icon_get_property (GObject *object,
3724++ guint prop_id,
3725++ GValue *value,
3726++ GParamSpec *pspec)
3727++{
3728++ RBTrayIcon *indicator = RB_TRAY_ICON (object);
3729++
3730++ switch (prop_id)
3731++ {
3732++ case PROP_SHELL_PLAYER:
3733++ g_value_set_object (value, indicator->priv->shell_player);
3734++ break;
3735++ case PROP_PLUGIN:
3736++ g_value_set_object (value, indicator->priv->plugin);
3737++ break;
3738++ default:
3739++ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
3740++ break;
3741++ }
3742++}
3743++
3744++
3745++RBTrayIcon *
3746++rb_tray_icon_new (RBStatusIconPlugin *plugin,
3747++ RBShellPlayer *shell_player)
3748++{
3749++ return g_object_new (RB_TYPE_TRAY_ICON,
3750++ "plugin", plugin,
3751++ "shell-player", shell_player,
3752++ NULL);
3753++}
3754++
3755++
3756++/**
3757++ * rb_tray_icon_get_geom:
3758++ * @icon: the #RBTrayIcon
3759++ * @x: returns the x position of the tray icon
3760++ * @y: returns the y position of the tray icon
3761++ * @width: returns the width of the tray icon
3762++ * @height: returns the height of the tray icon
3763++ *
3764++ * Retrieves the current position and size of the tray icon.
3765++ */
3766++void
3767++rb_tray_icon_get_geom (RBTrayIcon *indicator, int *x, int *y, int *width, int *height)
3768++{
3769++ *x = 0;
3770++ *y = 0;
3771++ *width = 0;
3772++ *height = 0;
3773++}
3774++
3775++void
3776++rb_tray_icon_trigger_tooltip_query (RBTrayIcon *indicator)
3777++{
3778++}
3779++
3780++
3781++gboolean
3782++rb_tray_icon_is_embedded (RBTrayIcon *indicator)
3783++{
3784++ return FALSE;
3785++}
3786++
3787++#ifdef HAVE_NOTIFY
3788++void
3789++rb_tray_icon_attach_notification (RBTrayIcon *icon, NotifyNotification *notification)
3790++{
3791++}
3792++#endif
3793++
3794++void
3795++rb_tray_icon_set_visible (RBTrayIcon *indicator, gboolean visible)
3796++{
3797++ app_indicator_set_status (indicator->priv->indicator,
3798++ visible ? APP_INDICATOR_STATUS_ACTIVE : APP_INDICATOR_STATUS_PASSIVE);
3799++}
3800++
3801++void
3802++rb_tray_icon_menu_popup (RBTrayIcon *icon, GtkWidget *popup, gint button)
3803++{
3804++}
3805+diff --git a/plugins/status-icon/rb-status-icon-plugin.c b/plugins/status-icon/rb-status-icon-plugin.c
3806+index 4c931b5..9c50d65 100644
3807+--- a/plugins/status-icon/rb-status-icon-plugin.c
3808++++ b/plugins/status-icon/rb-status-icon-plugin.c
3809+@@ -107,6 +107,9 @@ struct _RBStatusIconPluginPrivate
3810+ /* current playing data */
3811+ char *current_title;
3812+ char *current_album_and_artist; /* from _album_ by _artist_ */
3813++#ifdef HAVE_APP_INDICATOR
3814++ char *current_artist;
3815++#endif
3816+
3817+ /* tooltip data */
3818+ char *tooltip_markup;
3819+@@ -139,12 +142,17 @@ static GtkActionEntry rb_status_icon_plugin_actions [] =
3820+ {
3821+ { "MusicClose", GTK_STOCK_CLOSE, N_("_Close"), "<control>W",
3822+ N_("Hide the music player window"),
3823+- G_CALLBACK (toggle_window_cmd) }
3824++ G_CALLBACK (toggle_window_cmd) },
3825++ { "TrayShowWindow", NULL, N_("_Show Rhythmbox"), NULL,
3826++ N_("Show the music player window"),
3827++ G_CALLBACK (toggle_window_cmd) },
3828++ { "TrayDisplayArtist", NULL, NULL, NULL, NULL },
3829++ { "TrayDisplayTitle", NULL, N_("Not playing"), NULL, NULL, NULL }
3830+ };
3831+
3832+ static GtkToggleActionEntry rb_status_icon_plugin_toggle_entries [] =
3833+ {
3834+- { "TrayShowWindow", NULL, N_("_Show Music Player"), NULL,
3835++ { "TrayToggleWindow", NULL, N_("_Show Music Player"), NULL,
3836+ N_("Choose music to play"),
3837+ G_CALLBACK (show_window_cmd) },
3838+ { "TrayShowNotifications", NULL, N_("Show N_otifications"), NULL,
3839+@@ -289,6 +297,24 @@ rb_status_icon_plugin_button_press_event (RBStatusIconPlugin *plugin,
3840+ }
3841+ }
3842+
3843++GtkWidget *
3844++rb_status_icon_get_popup (RBStatusIconPlugin *plugin)
3845++{
3846++#ifdef HAVE_APP_INDICATOR
3847++ GtkWidget *popup;
3848++ GtkUIManager *uim;
3849++
3850++ g_object_get (plugin->priv->shell, "ui-manager", &uim, NULL);
3851++ popup = gtk_ui_manager_get_widget (GTK_UI_MANAGER (uim),
3852++ "/RhythmboxIndicator");
3853++ g_object_unref (uim);
3854++
3855++ return popup;
3856++#else
3857++ return NULL;
3858++#endif
3859++}
3860++
3861+ static void
3862+ sync_actions (RBStatusIconPlugin *plugin)
3863+ {
3864+@@ -298,7 +324,7 @@ sync_actions (RBStatusIconPlugin *plugin)
3865+ plugin->priv->syncing_actions = TRUE;
3866+
3867+ action = gtk_action_group_get_action (plugin->priv->action_group,
3868+- "TrayShowWindow");
3869++ "TrayToggleWindow");
3870+ g_object_get (plugin->priv->shell, "visibility", &visible, NULL);
3871+ gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), visible);
3872+
3873+@@ -460,10 +486,12 @@ should_notify (RBStatusIconPlugin *plugin)
3874+
3875+ case ICON_ALWAYS:
3876+ case ICON_OWNS_WINDOW:
3877++#ifndef HAVE_APP_INDICATOR
3878+ if (rb_tray_icon_is_embedded (plugin->priv->tray_icon) == FALSE) {
3879+ rb_debug ("status icon is not embedded, not notifying");
3880+ return FALSE;
3881+ }
3882++#endif
3883+ break;
3884+
3885+ default:
3886+@@ -571,10 +599,32 @@ update_tooltip (RBStatusIconPlugin *plugin)
3887+ gboolean playing;
3888+ char *elapsed_string;
3889+ GString *secondary;
3890++#ifdef HAVE_APP_INDICATOR
3891++ GtkAction *action;
3892++#endif
3893+
3894+ rb_shell_player_get_playing (plugin->priv->shell_player, &playing, NULL);
3895+ elapsed_string = rb_shell_player_get_playing_time_string (plugin->priv->shell_player);
3896+
3897++#ifdef HAVE_APP_INDICATOR
3898++ action = gtk_action_group_get_action (plugin->priv->action_group,
3899++ "TrayDisplayArtist");
3900++ if (plugin->priv->current_artist != NULL &&
3901++ *plugin->priv->current_artist != '\0') {
3902++ gtk_action_set_label (action, plugin->priv->current_artist);
3903++ gtk_action_set_visible (action, TRUE);
3904++ } else {
3905++ gtk_action_set_visible (action, FALSE);
3906++ }
3907++
3908++ action = gtk_action_group_get_action (plugin->priv->action_group,
3909++ "TrayDisplayTitle");
3910++ if (plugin->priv->current_title == NULL) {
3911++ gtk_action_set_label (action, _("Not playing"));
3912++ } else {
3913++ gtk_action_set_label (action, plugin->priv->current_title);
3914++ }
3915++#endif
3916+ secondary = g_string_sized_new (100);
3917+ if (plugin->priv->current_album_and_artist != NULL) {
3918+ g_string_append (secondary, plugin->priv->current_album_and_artist);
3919+@@ -701,6 +751,10 @@ update_current_playing_data (RBStatusIconPlugin *plugin, RhythmDBEntry *entry)
3920+ g_free (plugin->priv->current_album_and_artist);
3921+ plugin->priv->current_title = NULL;
3922+ plugin->priv->current_album_and_artist = NULL;
3923++#ifdef HAVE_APP_INDICATOR
3924++ g_free (plugin->priv->current_artist);
3925++ plugin->priv->current_artist = NULL;
3926++#endif
3927+
3928+ if (entry == NULL)
3929+ return;
3930+@@ -712,11 +766,17 @@ update_current_playing_data (RBStatusIconPlugin *plugin, RhythmDBEntry *entry)
3931+ entry,
3932+ RHYTHMDB_PROP_STREAM_SONG_ARTIST);
3933+ if (value != NULL) {
3934++#ifdef HAVE_APP_INDICATOR
3935++ plugin->priv->current_artist = g_strdup (g_value_get_string (value));
3936++#endif
3937+ artist = markup_escape (g_value_get_string (value));
3938+ g_value_unset (value);
3939+ g_free (value);
3940+ } else {
3941+ artist = markup_escape (rhythmdb_entry_get_string (entry, RHYTHMDB_PROP_ARTIST));
3942++#ifdef HAVE_APP_INDICATOR
3943++ plugin->priv->current_artist = g_strdup (rhythmdb_entry_get_string (entry, RHYTHMDB_PROP_ARTIST));
3944++#endif
3945+ }
3946+
3947+ /* get album, preferring streaming song details */
3948+@@ -1222,6 +1282,14 @@ impl_get_config_widget (RBPlugin *bplugin)
3949+ plugin->priv->icon_combo = GTK_WIDGET (gtk_builder_get_object (builder, "statusiconmode"));
3950+ plugin->priv->notify_combo = GTK_WIDGET (gtk_builder_get_object (builder, "notificationmode"));
3951+ plugin->priv->wheel_combo = GTK_WIDGET (gtk_builder_get_object (builder, "mousewheelmode"));
3952++#ifdef HAVE_APP_INDICATOR
3953++ gtk_widget_hide (GTK_WIDGET (gtk_builder_get_object (builder, "mousewheelmode")));
3954++ gtk_widget_set_no_show_all (GTK_WIDGET (gtk_builder_get_object (builder, "mousewheelmode")),
3955++ TRUE);
3956++ gtk_widget_hide (GTK_WIDGET (gtk_builder_get_object (builder, "mousewheellabel")));
3957++ gtk_widget_set_no_show_all (GTK_WIDGET (gtk_builder_get_object (builder, "mousewheellabel")),
3958++ TRUE);
3959++#endif
3960+ g_signal_connect_object (plugin->priv->notify_combo,
3961+ "changed",
3962+ G_CALLBACK (notification_config_changed_cb),
3963+@@ -1251,6 +1319,9 @@ impl_activate (RBPlugin *bplugin,
3964+ RhythmDBEntry *entry;
3965+ GtkWindow *window;
3966+ char *uifile;
3967++#ifdef HAVE_APP_INDICATOR
3968++ GtkAction *action;
3969++#endif
3970+
3971+ rb_debug ("activating status icon plugin");
3972+
3973+@@ -1330,6 +1401,18 @@ impl_activate (RBPlugin *bplugin,
3974+ }
3975+ update_tooltip (plugin);
3976+
3977++#ifdef HAVE_APP_INDICATOR
3978++ action = gtk_action_group_get_action (plugin->priv->action_group,
3979++ "TrayDisplayArtist");
3980++ gtk_action_set_visible (action, FALSE);
3981++ gtk_action_set_sensitive (action, FALSE);
3982++
3983++ action = gtk_action_group_get_action (plugin->priv->action_group,
3984++ "TrayDisplayTitle");
3985++ gtk_action_set_visible (action, TRUE);
3986++ gtk_action_set_sensitive (action, FALSE);
3987++#endif
3988++
3989+ g_object_unref (ui_manager);
3990+ g_object_unref (window);
3991+ }
3992+@@ -1418,6 +1501,10 @@ impl_deactivate (RBPlugin *bplugin,
3993+ plugin->priv->current_title = NULL;
3994+ plugin->priv->current_album_and_artist = NULL;
3995+ plugin->priv->tooltip_markup = NULL;
3996++#ifdef HAVE_APP_INDICATOR
3997++ g_free (plugin->priv->current_artist);
3998++ plugin->priv->current_artist = NULL;
3999++#endif
4000+
4001+ forget_pixbufs (plugin);
4002+ }
4003+diff --git a/plugins/status-icon/rb-status-icon-plugin.h b/plugins/status-icon/rb-status-icon-plugin.h
4004+index 8472c15..26ea40b 100644
4005+--- a/plugins/status-icon/rb-status-icon-plugin.h
4006++++ b/plugins/status-icon/rb-status-icon-plugin.h
4007+@@ -72,6 +72,8 @@ gboolean rb_status_icon_plugin_set_tooltip (GtkWidget *widget,
4008+ GtkTooltip *tooltip,
4009+ RBStatusIconPlugin *plugin);
4010+
4011++GtkWidget *rb_status_icon_get_popup (RBStatusIconPlugin *plugin);
4012++
4013+ G_END_DECLS
4014+
4015+ #endif /* __RB_STATUS_ICON_PLUGIN_H */
4016+diff --git a/plugins/status-icon/status-icon-preferences.ui b/plugins/status-icon/status-icon-preferences.ui
4017+index 3376591..7990886 100644
4018+--- a/plugins/status-icon/status-icon-preferences.ui
4019++++ b/plugins/status-icon/status-icon-preferences.ui
4020+@@ -161,7 +161,7 @@
4021+ </packing>
4022+ </child>
4023+ <child>
4024+- <object class="GtkLabel" id="label5">
4025++ <object class="GtkLabel" id="mousewheellabel">
4026+ <property name="visible">True</property>
4027+ <property name="xalign">0</property>
4028+ <property name="label" translatable="yes">_Mouse wheel:</property>
4029+diff --git a/plugins/status-icon/status-icon-ui.xml b/plugins/status-icon/status-icon-ui.xml
4030+index a5cb6e1..a4eee9d 100644
4031+--- a/plugins/status-icon/status-icon-ui.xml
4032++++ b/plugins/status-icon/status-icon-ui.xml
4033+@@ -15,12 +15,26 @@
4034+ <menuitem name="PreviousTray" action="ControlPrevious"/>
4035+ <menuitem name="NextTray" action="ControlNext"/>
4036+ <separator/>
4037+- <menuitem name="ShowWindowTray" action="TrayShowWindow"/>
4038++ <menuitem name="ShowWindowTray" action="TrayToggleWindow"/>
4039+ <menuitem name="ShowNotifications" action="TrayShowNotifications"/>
4040+ <separator/>
4041+ <placeholder name="PluginPlaceholder"/> <!-- .. hmm. -->
4042+ <separator/>
4043+ <menuitem name="QuitTray" action="MusicQuit"/>
4044+ </popup>
4045++
4046++ <popup name="RhythmboxIndicator">
4047++ <menuitem name="DisplayArtist" action="TrayDisplayArtist"/>
4048++ <menuitem name="DisplayTitle" action="TrayDisplayTitle"/>
4049++ <separator/>
4050++ <menuitem name="PlayTray" action="ControlPlay"/>
4051++ <separator/>
4052++ <menuitem name="PreviousTray" action="ControlPrevious"/>
4053++ <menuitem name="NextTray" action="ControlNext"/>
4054++ <separator/>
4055++ <menuitem name="ShowWindowTray" action="TrayShowWindow"/>
4056++ <menuitem name="QuitTray" action="MusicQuit"/>
4057++ </popup>
4058++
4059+ </ui>
4060+
4061
4062=== added file 'debian/patches/90_autoreconf.patch'
4063--- debian/patches/90_autoreconf.patch 1970-01-01 00:00:00 +0000
4064+++ debian/patches/90_autoreconf.patch 2010-07-05 01:49:22 +0000
4065@@ -0,0 +1,12802 @@
4066+diff -Nur -x '*.orig' -x '*~' rhythmbox-0.12.8/aclocal.m4 rhythmbox-0.12.8.new/aclocal.m4
4067+--- rhythmbox-0.12.8/aclocal.m4 2010-03-28 11:06:12.000000000 +0200
4068++++ rhythmbox-0.12.8.new/aclocal.m4 2010-03-29 10:46:45.000000000 +0200
4069+@@ -548,6 +548,8263 @@
4070+ AC_SUBST(DISABLE_DEPRECATED)
4071+ ])
4072+
4073++dnl Do not call GNOME_DOC_DEFINES directly. It is split out from
4074++dnl GNOME_DOC_INIT to allow gnome-doc-utils to bootstrap off itself.
4075++AC_DEFUN([GNOME_DOC_DEFINES],
4076++[
4077++AC_ARG_WITH([help-dir],
4078++ AC_HELP_STRING([--with-help-dir=DIR], [path to help docs]),,
4079++ [with_help_dir='${datadir}/gnome/help'])
4080++HELP_DIR="$with_help_dir"
4081++AC_SUBST(HELP_DIR)
4082++
4083++AC_ARG_WITH([omf-dir],
4084++ AC_HELP_STRING([--with-omf-dir=DIR], [path to OMF files]),,
4085++ [with_omf_dir='${datadir}/omf'])
4086++OMF_DIR="$with_omf_dir"
4087++AC_SUBST(OMF_DIR)
4088++
4089++AC_ARG_WITH([help-formats],
4090++ AC_HELP_STRING([--with-help-formats=FORMATS], [list of formats]),,
4091++ [with_help_formats=''])
4092++DOC_USER_FORMATS="$with_help_formats"
4093++AC_SUBST(DOC_USER_FORMATS)
4094++
4095++AC_ARG_ENABLE([scrollkeeper],
4096++ [AC_HELP_STRING([--disable-scrollkeeper],
4097++ [do not make updates to the scrollkeeper database])],,
4098++ enable_scrollkeeper=yes)
4099++AM_CONDITIONAL([ENABLE_SK],[test "$gdu_cv_have_gdu" = "yes" -a "$enable_scrollkeeper" = "yes"])
4100++
4101++dnl disable scrollkeeper automatically for distcheck
4102++DISTCHECK_CONFIGURE_FLAGS="--disable-scrollkeeper $DISTCHECK_CONFIGURE_FLAGS"
4103++AC_SUBST(DISTCHECK_CONFIGURE_FLAGS)
4104++
4105++AM_CONDITIONAL([HAVE_GNOME_DOC_UTILS],[test "$gdu_cv_have_gdu" = "yes"])
4106++])
4107++
4108++# GNOME_DOC_INIT ([MINIMUM-VERSION],[ACTION-IF-FOUND],[ACTION-IF-NOT-FOUND])
4109++#
4110++AC_DEFUN([GNOME_DOC_INIT],
4111++[AC_REQUIRE([AC_PROG_LN_S])dnl
4112++
4113++ifelse([$1],,[gdu_cv_version_required=0.3.2],[gdu_cv_version_required=$1])
4114++
4115++AC_MSG_CHECKING([gnome-doc-utils >= $gdu_cv_version_required])
4116++PKG_CHECK_EXISTS([gnome-doc-utils >= $gdu_cv_version_required],
4117++ [gdu_cv_have_gdu=yes],[gdu_cv_have_gdu=no])
4118++
4119++if test "$gdu_cv_have_gdu" = "yes"; then
4120++ AC_MSG_RESULT([yes])
4121++ ifelse([$2],,[:],[$2])
4122++else
4123++ AC_MSG_RESULT([no])
4124++ ifelse([$3],,[AC_MSG_ERROR([gnome-doc-utils >= $gdu_cv_version_required not found])],[$3])
4125++fi
4126++
4127++GNOME_DOC_DEFINES
4128++])
4129++
4130++dnl -*- mode: autoconf -*-
4131++
4132++# serial 1
4133++
4134++dnl Usage:
4135++dnl GTK_DOC_CHECK([minimum-gtk-doc-version])
4136++AC_DEFUN([GTK_DOC_CHECK],
4137++[
4138++ AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first
4139++ AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first
4140++ dnl for overriding the documentation installation directory
4141++ AC_ARG_WITH([html-dir],
4142++ AS_HELP_STRING([--with-html-dir=PATH], [path to installed docs]),,
4143++ [with_html_dir='${datadir}/gtk-doc/html'])
4144++ HTML_DIR="$with_html_dir"
4145++ AC_SUBST([HTML_DIR])
4146++
4147++ dnl enable/disable documentation building
4148++ AC_ARG_ENABLE([gtk-doc],
4149++ AS_HELP_STRING([--enable-gtk-doc],
4150++ [use gtk-doc to build documentation [[default=no]]]),,
4151++ [enable_gtk_doc=no])
4152++
4153++ if test x$enable_gtk_doc = xyes; then
4154++ ifelse([$1],[],
4155++ [PKG_CHECK_EXISTS([gtk-doc],,
4156++ AC_MSG_ERROR([gtk-doc not installed and --enable-gtk-doc requested]))],
4157++ [PKG_CHECK_EXISTS([gtk-doc >= $1],,
4158++ AC_MSG_ERROR([You need to have gtk-doc >= $1 installed to build gtk-doc]))])
4159++ fi
4160++
4161++ AC_MSG_CHECKING([whether to build gtk-doc documentation])
4162++ AC_MSG_RESULT($enable_gtk_doc)
4163++
4164++ AC_PATH_PROGS(GTKDOC_CHECK,gtkdoc-check,)
4165++
4166++ AM_CONDITIONAL([ENABLE_GTK_DOC], [test x$enable_gtk_doc = xyes])
4167++ AM_CONDITIONAL([GTK_DOC_USE_LIBTOOL], [test -n "$LIBTOOL"])
4168++])
4169++
4170++
4171++dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml])
4172++# serial 40 IT_PROG_INTLTOOL
4173++AC_DEFUN([IT_PROG_INTLTOOL], [
4174++AC_PREREQ([2.50])dnl
4175++AC_REQUIRE([AM_NLS])dnl
4176++
4177++case "$am__api_version" in
4178++ 1.[01234])
4179++ AC_MSG_ERROR([Automake 1.5 or newer is required to use intltool])
4180++ ;;
4181++ *)
4182++ ;;
4183++esac
4184++
4185++if test -n "$1"; then
4186++ AC_MSG_CHECKING([for intltool >= $1])
4187++
4188++ INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
4189++ INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3`
4190++ [INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
4191++ ]
4192++ AC_MSG_RESULT([$INTLTOOL_APPLIED_VERSION found])
4193++ test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" ||
4194++ AC_MSG_ERROR([Your intltool is too old. You need intltool $1 or later.])
4195++fi
4196++
4197++AC_PATH_PROG(INTLTOOL_UPDATE, [intltool-update])
4198++AC_PATH_PROG(INTLTOOL_MERGE, [intltool-merge])
4199++AC_PATH_PROG(INTLTOOL_EXTRACT, [intltool-extract])
4200++if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then
4201++ AC_MSG_ERROR([The intltool scripts were not found. Please install intltool.])
4202++fi
4203++
4204++ INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
4205++INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
4206++ INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
4207++ INTLTOOL_PROP_RULE='%.prop: %.prop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
4208++ INTLTOOL_OAF_RULE='%.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -p $(top_srcdir)/po $< [$]@'
4209++ INTLTOOL_PONG_RULE='%.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
4210++ INTLTOOL_SERVER_RULE='%.server: %.server.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
4211++ INTLTOOL_SHEET_RULE='%.sheet: %.sheet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
4212++INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
4213++ INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
4214++ INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
4215++ INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< [$]@'
4216++ INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
4217++ INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
4218++ INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
4219++ INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
4220++ INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
4221++ INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
4222++ INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
4223++
4224++_IT_SUBST(INTLTOOL_DESKTOP_RULE)
4225++_IT_SUBST(INTLTOOL_DIRECTORY_RULE)
4226++_IT_SUBST(INTLTOOL_KEYS_RULE)
4227++_IT_SUBST(INTLTOOL_PROP_RULE)
4228++_IT_SUBST(INTLTOOL_OAF_RULE)
4229++_IT_SUBST(INTLTOOL_PONG_RULE)
4230++_IT_SUBST(INTLTOOL_SERVER_RULE)
4231++_IT_SUBST(INTLTOOL_SHEET_RULE)
4232++_IT_SUBST(INTLTOOL_SOUNDLIST_RULE)
4233++_IT_SUBST(INTLTOOL_UI_RULE)
4234++_IT_SUBST(INTLTOOL_XAM_RULE)
4235++_IT_SUBST(INTLTOOL_KBD_RULE)
4236++_IT_SUBST(INTLTOOL_XML_RULE)
4237++_IT_SUBST(INTLTOOL_XML_NOMERGE_RULE)
4238++_IT_SUBST(INTLTOOL_CAVES_RULE)
4239++_IT_SUBST(INTLTOOL_SCHEMAS_RULE)
4240++_IT_SUBST(INTLTOOL_THEME_RULE)
4241++_IT_SUBST(INTLTOOL_SERVICE_RULE)
4242++_IT_SUBST(INTLTOOL_POLICY_RULE)
4243++
4244++# Check the gettext tools to make sure they are GNU
4245++AC_PATH_PROG(XGETTEXT, xgettext)
4246++AC_PATH_PROG(MSGMERGE, msgmerge)
4247++AC_PATH_PROG(MSGFMT, msgfmt)
4248++AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
4249++if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then
4250++ AC_MSG_ERROR([GNU gettext tools not found; required for intltool])
4251++fi
4252++xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`"
4253++mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`"
4254++mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`"
4255++if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then
4256++ AC_MSG_ERROR([GNU gettext tools not found; required for intltool])
4257++fi
4258++
4259++AC_PATH_PROG(INTLTOOL_PERL, perl)
4260++if test -z "$INTLTOOL_PERL"; then
4261++ AC_MSG_ERROR([perl not found])
4262++fi
4263++AC_MSG_CHECKING([for perl >= 5.8.1])
4264++$INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1
4265++if test $? -ne 0; then
4266++ AC_MSG_ERROR([perl 5.8.1 is required for intltool])
4267++else
4268++ IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`"
4269++ AC_MSG_RESULT([$IT_PERL_VERSION])
4270++fi
4271++if test "x$2" != "xno-xml"; then
4272++ AC_MSG_CHECKING([for XML::Parser])
4273++ if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then
4274++ AC_MSG_RESULT([ok])
4275++ else
4276++ AC_MSG_ERROR([XML::Parser perl module is required for intltool])
4277++ fi
4278++fi
4279++
4280++# Substitute ALL_LINGUAS so we can use it in po/Makefile
4281++AC_SUBST(ALL_LINGUAS)
4282++
4283++# Set DATADIRNAME correctly if it is not set yet
4284++# (copied from glib-gettext.m4)
4285++if test -z "$DATADIRNAME"; then
4286++ AC_LINK_IFELSE(
4287++ [AC_LANG_PROGRAM([[]],
4288++ [[extern int _nl_msg_cat_cntr;
4289++ return _nl_msg_cat_cntr]])],
4290++ [DATADIRNAME=share],
4291++ [case $host in
4292++ *-*-solaris*)
4293++ dnl On Solaris, if bind_textdomain_codeset is in libc,
4294++ dnl GNU format message catalog is always supported,
4295++ dnl since both are added to the libc all together.
4296++ dnl Hence, we'd like to go with DATADIRNAME=share
4297++ dnl in this case.
4298++ AC_CHECK_FUNC(bind_textdomain_codeset,
4299++ [DATADIRNAME=share], [DATADIRNAME=lib])
4300++ ;;
4301++ *)
4302++ [DATADIRNAME=lib]
4303++ ;;
4304++ esac])
4305++fi
4306++AC_SUBST(DATADIRNAME)
4307++
4308++IT_PO_SUBDIR([po])
4309++
4310++])
4311++
4312++
4313++# IT_PO_SUBDIR(DIRNAME)
4314++# ---------------------
4315++# All po subdirs have to be declared with this macro; the subdir "po" is
4316++# declared by IT_PROG_INTLTOOL.
4317++#
4318++AC_DEFUN([IT_PO_SUBDIR],
4319++[AC_PREREQ([2.53])dnl We use ac_top_srcdir inside AC_CONFIG_COMMANDS.
4320++dnl
4321++dnl The following CONFIG_COMMANDS should be exetuted at the very end
4322++dnl of config.status.
4323++AC_CONFIG_COMMANDS_PRE([
4324++ AC_CONFIG_COMMANDS([$1/stamp-it], [
4325++ if [ ! grep "^# INTLTOOL_MAKEFILE$" "$1/Makefile.in" > /dev/null ]; then
4326++ AC_MSG_ERROR([$1/Makefile.in.in was not created by intltoolize.])
4327++ fi
4328++ rm -f "$1/stamp-it" "$1/stamp-it.tmp" "$1/POTFILES" "$1/Makefile.tmp"
4329++ >"$1/stamp-it.tmp"
4330++ [sed '/^#/d
4331++ s/^[[].*] *//
4332++ /^[ ]*$/d
4333++ '"s|^| $ac_top_srcdir/|" \
4334++ "$srcdir/$1/POTFILES.in" | sed '$!s/$/ \\/' >"$1/POTFILES"
4335++ ]
4336++ [sed '/^POTFILES =/,/[^\\]$/ {
4337++ /^POTFILES =/!d
4338++ r $1/POTFILES
4339++ }
4340++ ' "$1/Makefile.in" >"$1/Makefile"]
4341++ rm -f "$1/Makefile.tmp"
4342++ mv "$1/stamp-it.tmp" "$1/stamp-it"
4343++ ])
4344++])dnl
4345++])
4346++
4347++# _IT_SUBST(VARIABLE)
4348++# -------------------
4349++# Abstract macro to do either _AM_SUBST_NOTMAKE or AC_SUBST
4350++#
4351++AC_DEFUN([_IT_SUBST],
4352++[
4353++AC_SUBST([$1])
4354++m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([$1])])
4355++]
4356++)
4357++
4358++# deprecated macros
4359++AU_ALIAS([AC_PROG_INTLTOOL], [IT_PROG_INTLTOOL])
4360++# A hint is needed for aclocal from Automake <= 1.9.4:
4361++# AC_DEFUN([AC_PROG_INTLTOOL], ...)
4362++
4363++
4364++# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
4365++#
4366++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
4367++# 2006, 2007, 2008 Free Software Foundation, Inc.
4368++# Written by Gordon Matzigkeit, 1996
4369++#
4370++# This file is free software; the Free Software Foundation gives
4371++# unlimited permission to copy and/or distribute it, with or without
4372++# modifications, as long as this notice is preserved.
4373++
4374++m4_define([_LT_COPYING], [dnl
4375++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
4376++# 2006, 2007, 2008 Free Software Foundation, Inc.
4377++# Written by Gordon Matzigkeit, 1996
4378++#
4379++# This file is part of GNU Libtool.
4380++#
4381++# GNU Libtool is free software; you can redistribute it and/or
4382++# modify it under the terms of the GNU General Public License as
4383++# published by the Free Software Foundation; either version 2 of
4384++# the License, or (at your option) any later version.
4385++#
4386++# As a special exception to the GNU General Public License,
4387++# if you distribute this file as part of a program or library that
4388++# is built using GNU Libtool, you may include this file under the
4389++# same distribution terms that you use for the rest of that program.
4390++#
4391++# GNU Libtool is distributed in the hope that it will be useful,
4392++# but WITHOUT ANY WARRANTY; without even the implied warranty of
4393++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
4394++# GNU General Public License for more details.
4395++#
4396++# You should have received a copy of the GNU General Public License
4397++# along with GNU Libtool; see the file COPYING. If not, a copy
4398++# can be downloaded from http://www.gnu.org/licenses/gpl.html, or
4399++# obtained by writing to the Free Software Foundation, Inc.,
4400++# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
4401++])
4402++
4403++# serial 56 LT_INIT
4404++
4405++
4406++# LT_PREREQ(VERSION)
4407++# ------------------
4408++# Complain and exit if this libtool version is less that VERSION.
4409++m4_defun([LT_PREREQ],
4410++[m4_if(m4_version_compare(m4_defn([LT_PACKAGE_VERSION]), [$1]), -1,
4411++ [m4_default([$3],
4412++ [m4_fatal([Libtool version $1 or higher is required],
4413++ 63)])],
4414++ [$2])])
4415++
4416++
4417++# _LT_CHECK_BUILDDIR
4418++# ------------------
4419++# Complain if the absolute build directory name contains unusual characters
4420++m4_defun([_LT_CHECK_BUILDDIR],
4421++[case `pwd` in
4422++ *\ * | *\ *)
4423++ AC_MSG_WARN([Libtool does not cope well with whitespace in `pwd`]) ;;
4424++esac
4425++])
4426++
4427++
4428++# LT_INIT([OPTIONS])
4429++# ------------------
4430++AC_DEFUN([LT_INIT],
4431++[AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT
4432++AC_BEFORE([$0], [LT_LANG])dnl
4433++AC_BEFORE([$0], [LT_OUTPUT])dnl
4434++AC_BEFORE([$0], [LTDL_INIT])dnl
4435++m4_require([_LT_CHECK_BUILDDIR])dnl
4436++
4437++dnl Autoconf doesn't catch unexpanded LT_ macros by default:
4438++m4_pattern_forbid([^_?LT_[A-Z_]+$])dnl
4439++m4_pattern_allow([^(_LT_EOF|LT_DLGLOBAL|LT_DLLAZY_OR_NOW|LT_MULTI_MODULE)$])dnl
4440++dnl aclocal doesn't pull ltoptions.m4, ltsugar.m4, or ltversion.m4
4441++dnl unless we require an AC_DEFUNed macro:
4442++AC_REQUIRE([LTOPTIONS_VERSION])dnl
4443++AC_REQUIRE([LTSUGAR_VERSION])dnl
4444++AC_REQUIRE([LTVERSION_VERSION])dnl
4445++AC_REQUIRE([LTOBSOLETE_VERSION])dnl
4446++m4_require([_LT_PROG_LTMAIN])dnl
4447++
4448++dnl Parse OPTIONS
4449++_LT_SET_OPTIONS([$0], [$1])
4450++
4451++# This can be used to rebuild libtool when needed
4452++LIBTOOL_DEPS="$ltmain"
4453++
4454++# Always use our own libtool.
4455++LIBTOOL='$(SHELL) $(top_builddir)/libtool'
4456++AC_SUBST(LIBTOOL)dnl
4457++
4458++_LT_SETUP
4459++
4460++# Only expand once:
4461++m4_define([LT_INIT])
4462++])# LT_INIT
4463++
4464++# Old names:
4465++AU_ALIAS([AC_PROG_LIBTOOL], [LT_INIT])
4466++AU_ALIAS([AM_PROG_LIBTOOL], [LT_INIT])
4467++dnl aclocal-1.4 backwards compatibility:
4468++dnl AC_DEFUN([AC_PROG_LIBTOOL], [])
4469++dnl AC_DEFUN([AM_PROG_LIBTOOL], [])
4470++
4471++
4472++# _LT_CC_BASENAME(CC)
4473++# -------------------
4474++# Calculate cc_basename. Skip known compiler wrappers and cross-prefix.
4475++m4_defun([_LT_CC_BASENAME],
4476++[for cc_temp in $1""; do
4477++ case $cc_temp in
4478++ compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;;
4479++ distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;
4480++ \-*) ;;
4481++ *) break;;
4482++ esac
4483++done
4484++cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
4485++])
4486++
4487++
4488++# _LT_FILEUTILS_DEFAULTS
4489++# ----------------------
4490++# It is okay to use these file commands and assume they have been set
4491++# sensibly after `m4_require([_LT_FILEUTILS_DEFAULTS])'.
4492++m4_defun([_LT_FILEUTILS_DEFAULTS],
4493++[: ${CP="cp -f"}
4494++: ${MV="mv -f"}
4495++: ${RM="rm -f"}
4496++])# _LT_FILEUTILS_DEFAULTS
4497++
4498++
4499++# _LT_SETUP
4500++# ---------
4501++m4_defun([_LT_SETUP],
4502++[AC_REQUIRE([AC_CANONICAL_HOST])dnl
4503++AC_REQUIRE([AC_CANONICAL_BUILD])dnl
4504++_LT_DECL([], [host_alias], [0], [The host system])dnl
4505++_LT_DECL([], [host], [0])dnl
4506++_LT_DECL([], [host_os], [0])dnl
4507++dnl
4508++_LT_DECL([], [build_alias], [0], [The build system])dnl
4509++_LT_DECL([], [build], [0])dnl
4510++_LT_DECL([], [build_os], [0])dnl
4511++dnl
4512++AC_REQUIRE([AC_PROG_CC])dnl
4513++AC_REQUIRE([LT_PATH_LD])dnl
4514++AC_REQUIRE([LT_PATH_NM])dnl
4515++dnl
4516++AC_REQUIRE([AC_PROG_LN_S])dnl
4517++test -z "$LN_S" && LN_S="ln -s"
4518++_LT_DECL([], [LN_S], [1], [Whether we need soft or hard links])dnl
4519++dnl
4520++AC_REQUIRE([LT_CMD_MAX_LEN])dnl
4521++_LT_DECL([objext], [ac_objext], [0], [Object file suffix (normally "o")])dnl
4522++_LT_DECL([], [exeext], [0], [Executable file suffix (normally "")])dnl
4523++dnl
4524++m4_require([_LT_FILEUTILS_DEFAULTS])dnl
4525++m4_require([_LT_CHECK_SHELL_FEATURES])dnl
4526++m4_require([_LT_CMD_RELOAD])dnl
4527++m4_require([_LT_CHECK_MAGIC_METHOD])dnl
4528++m4_require([_LT_CMD_OLD_ARCHIVE])dnl
4529++m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
4530++
4531++_LT_CONFIG_LIBTOOL_INIT([
4532++# See if we are running on zsh, and set the options which allow our
4533++# commands through without removal of \ escapes INIT.
4534++if test -n "\${ZSH_VERSION+set}" ; then
4535++ setopt NO_GLOB_SUBST
4536++fi
4537++])
4538++if test -n "${ZSH_VERSION+set}" ; then
4539++ setopt NO_GLOB_SUBST
4540++fi
4541++
4542++_LT_CHECK_OBJDIR
4543++
4544++m4_require([_LT_TAG_COMPILER])dnl
4545++_LT_PROG_ECHO_BACKSLASH
4546++
4547++case $host_os in
4548++aix3*)
4549++ # AIX sometimes has problems with the GCC collect2 program. For some
4550++ # reason, if we set the COLLECT_NAMES environment variable, the problems
4551++ # vanish in a puff of smoke.
4552++ if test "X${COLLECT_NAMES+set}" != Xset; then
4553++ COLLECT_NAMES=
4554++ export COLLECT_NAMES
4555++ fi
4556++ ;;
4557++esac
4558++
4559++# Sed substitution that helps us do robust quoting. It backslashifies
4560++# metacharacters that are still active within double-quoted strings.
4561++sed_quote_subst='s/\([["`$\\]]\)/\\\1/g'
4562++
4563++# Same as above, but do not quote variable references.
4564++double_quote_subst='s/\([["`\\]]\)/\\\1/g'
4565++
4566++# Sed substitution to delay expansion of an escaped shell variable in a
4567++# double_quote_subst'ed string.
4568++delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
4569++
4570++# Sed substitution to delay expansion of an escaped single quote.
4571++delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
4572++
4573++# Sed substitution to avoid accidental globbing in evaled expressions
4574++no_glob_subst='s/\*/\\\*/g'
4575++
4576++# Global variables:
4577++ofile=libtool
4578++can_build_shared=yes
4579++
4580++# All known linkers require a `.a' archive for static linking (except MSVC,
4581++# which needs '.lib').
4582++libext=a
4583++
4584++with_gnu_ld="$lt_cv_prog_gnu_ld"
4585++
4586++old_CC="$CC"
4587++old_CFLAGS="$CFLAGS"
4588++
4589++# Set sane defaults for various variables
4590++test -z "$CC" && CC=cc
4591++test -z "$LTCC" && LTCC=$CC
4592++test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
4593++test -z "$LD" && LD=ld
4594++test -z "$ac_objext" && ac_objext=o
4595++
4596++_LT_CC_BASENAME([$compiler])
4597++
4598++# Only perform the check for file, if the check method requires it
4599++test -z "$MAGIC_CMD" && MAGIC_CMD=file
4600++case $deplibs_check_method in
4601++file_magic*)
4602++ if test "$file_magic_cmd" = '$MAGIC_CMD'; then
4603++ _LT_PATH_MAGIC
4604++ fi
4605++ ;;
4606++esac
4607++
4608++# Use C for the default configuration in the libtool script
4609++LT_SUPPORTED_TAG([CC])
4610++_LT_LANG_C_CONFIG
4611++_LT_LANG_DEFAULT_CONFIG
4612++_LT_CONFIG_COMMANDS
4613++])# _LT_SETUP
4614++
4615++
4616++# _LT_PROG_LTMAIN
4617++# ---------------
4618++# Note that this code is called both from `configure', and `config.status'
4619++# now that we use AC_CONFIG_COMMANDS to generate libtool. Notably,
4620++# `config.status' has no value for ac_aux_dir unless we are using Automake,
4621++# so we pass a copy along to make sure it has a sensible value anyway.
4622++m4_defun([_LT_PROG_LTMAIN],
4623++[m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([ltmain.sh])])dnl
4624++_LT_CONFIG_LIBTOOL_INIT([ac_aux_dir='$ac_aux_dir'])
4625++ltmain="$ac_aux_dir/ltmain.sh"
4626++])# _LT_PROG_LTMAIN
4627++
4628++
4629++
4630++# So that we can recreate a full libtool script including additional
4631++# tags, we accumulate the chunks of code to send to AC_CONFIG_COMMANDS
4632++# in macros and then make a single call at the end using the `libtool'
4633++# label.
4634++
4635++
4636++# _LT_CONFIG_LIBTOOL_INIT([INIT-COMMANDS])
4637++# ----------------------------------------
4638++# Register INIT-COMMANDS to be passed to AC_CONFIG_COMMANDS later.
4639++m4_define([_LT_CONFIG_LIBTOOL_INIT],
4640++[m4_ifval([$1],
4641++ [m4_append([_LT_OUTPUT_LIBTOOL_INIT],
4642++ [$1
4643++])])])
4644++
4645++# Initialize.
4646++m4_define([_LT_OUTPUT_LIBTOOL_INIT])
4647++
4648++
4649++# _LT_CONFIG_LIBTOOL([COMMANDS])
4650++# ------------------------------
4651++# Register COMMANDS to be passed to AC_CONFIG_COMMANDS later.
4652++m4_define([_LT_CONFIG_LIBTOOL],
4653++[m4_ifval([$1],
4654++ [m4_append([_LT_OUTPUT_LIBTOOL_COMMANDS],
4655++ [$1
4656++])])])
4657++
4658++# Initialize.
4659++m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS])
4660++
4661++
4662++# _LT_CONFIG_SAVE_COMMANDS([COMMANDS], [INIT_COMMANDS])
4663++# -----------------------------------------------------
4664++m4_defun([_LT_CONFIG_SAVE_COMMANDS],
4665++[_LT_CONFIG_LIBTOOL([$1])
4666++_LT_CONFIG_LIBTOOL_INIT([$2])
4667++])
4668++
4669++
4670++# _LT_FORMAT_COMMENT([COMMENT])
4671++# -----------------------------
4672++# Add leading comment marks to the start of each line, and a trailing
4673++# full-stop to the whole comment if one is not present already.
4674++m4_define([_LT_FORMAT_COMMENT],
4675++[m4_ifval([$1], [
4676++m4_bpatsubst([m4_bpatsubst([$1], [^ *], [# ])],
4677++ [['`$\]], [\\\&])]m4_bmatch([$1], [[!?.]$], [], [.])
4678++)])
4679++
4680++
4681++
4682++
4683++
4684++# _LT_DECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION], [IS-TAGGED?])
4685++# -------------------------------------------------------------------
4686++# CONFIGNAME is the name given to the value in the libtool script.
4687++# VARNAME is the (base) name used in the configure script.
4688++# VALUE may be 0, 1 or 2 for a computed quote escaped value based on
4689++# VARNAME. Any other value will be used directly.
4690++m4_define([_LT_DECL],
4691++[lt_if_append_uniq([lt_decl_varnames], [$2], [, ],
4692++ [lt_dict_add_subkey([lt_decl_dict], [$2], [libtool_name],
4693++ [m4_ifval([$1], [$1], [$2])])
4694++ lt_dict_add_subkey([lt_decl_dict], [$2], [value], [$3])
4695++ m4_ifval([$4],
4696++ [lt_dict_add_subkey([lt_decl_dict], [$2], [description], [$4])])
4697++ lt_dict_add_subkey([lt_decl_dict], [$2],
4698++ [tagged?], [m4_ifval([$5], [yes], [no])])])
4699++])
4700++
4701++
4702++# _LT_TAGDECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION])
4703++# --------------------------------------------------------
4704++m4_define([_LT_TAGDECL], [_LT_DECL([$1], [$2], [$3], [$4], [yes])])
4705++
4706++
4707++# lt_decl_tag_varnames([SEPARATOR], [VARNAME1...])
4708++# ------------------------------------------------
4709++m4_define([lt_decl_tag_varnames],
4710++[_lt_decl_filter([tagged?], [yes], $@)])
4711++
4712++
4713++# _lt_decl_filter(SUBKEY, VALUE, [SEPARATOR], [VARNAME1..])
4714++# ---------------------------------------------------------
4715++m4_define([_lt_decl_filter],
4716++[m4_case([$#],
4717++ [0], [m4_fatal([$0: too few arguments: $#])],
4718++ [1], [m4_fatal([$0: too few arguments: $#: $1])],
4719++ [2], [lt_dict_filter([lt_decl_dict], [$1], [$2], [], lt_decl_varnames)],
4720++ [3], [lt_dict_filter([lt_decl_dict], [$1], [$2], [$3], lt_decl_varnames)],
4721++ [lt_dict_filter([lt_decl_dict], $@)])[]dnl
4722++])
4723++
4724++
4725++# lt_decl_quote_varnames([SEPARATOR], [VARNAME1...])
4726++# --------------------------------------------------
4727++m4_define([lt_decl_quote_varnames],
4728++[_lt_decl_filter([value], [1], $@)])
4729++
4730++
4731++# lt_decl_dquote_varnames([SEPARATOR], [VARNAME1...])
4732++# ---------------------------------------------------
4733++m4_define([lt_decl_dquote_varnames],
4734++[_lt_decl_filter([value], [2], $@)])
4735++
4736++
4737++# lt_decl_varnames_tagged([SEPARATOR], [VARNAME1...])
4738++# ---------------------------------------------------
4739++m4_define([lt_decl_varnames_tagged],
4740++[m4_assert([$# <= 2])dnl
4741++_$0(m4_quote(m4_default([$1], [[, ]])),
4742++ m4_ifval([$2], [[$2]], [m4_dquote(lt_decl_tag_varnames)]),
4743++ m4_split(m4_normalize(m4_quote(_LT_TAGS)), [ ]))])
4744++m4_define([_lt_decl_varnames_tagged],
4745++[m4_ifval([$3], [lt_combine([$1], [$2], [_], $3)])])
4746++
4747++
4748++# lt_decl_all_varnames([SEPARATOR], [VARNAME1...])
4749++# ------------------------------------------------
4750++m4_define([lt_decl_all_varnames],
4751++[_$0(m4_quote(m4_default([$1], [[, ]])),
4752++ m4_if([$2], [],
4753++ m4_quote(lt_decl_varnames),
4754++ m4_quote(m4_shift($@))))[]dnl
4755++])
4756++m4_define([_lt_decl_all_varnames],
4757++[lt_join($@, lt_decl_varnames_tagged([$1],
4758++ lt_decl_tag_varnames([[, ]], m4_shift($@))))dnl
4759++])
4760++
4761++
4762++# _LT_CONFIG_STATUS_DECLARE([VARNAME])
4763++# ------------------------------------
4764++# Quote a variable value, and forward it to `config.status' so that its
4765++# declaration there will have the same value as in `configure'. VARNAME
4766++# must have a single quote delimited value for this to work.
4767++m4_define([_LT_CONFIG_STATUS_DECLARE],
4768++[$1='`$ECHO "X$][$1" | $Xsed -e "$delay_single_quote_subst"`'])
4769++
4770++
4771++# _LT_CONFIG_STATUS_DECLARATIONS
4772++# ------------------------------
4773++# We delimit libtool config variables with single quotes, so when
4774++# we write them to config.status, we have to be sure to quote all
4775++# embedded single quotes properly. In configure, this macro expands
4776++# each variable declared with _LT_DECL (and _LT_TAGDECL) into:
4777++#
4778++# <var>='`$ECHO "X$<var>" | $Xsed -e "$delay_single_quote_subst"`'
4779++m4_defun([_LT_CONFIG_STATUS_DECLARATIONS],
4780++[m4_foreach([_lt_var], m4_quote(lt_decl_all_varnames),
4781++ [m4_n([_LT_CONFIG_STATUS_DECLARE(_lt_var)])])])
4782++
4783++
4784++# _LT_LIBTOOL_TAGS
4785++# ----------------
4786++# Output comment and list of tags supported by the script
4787++m4_defun([_LT_LIBTOOL_TAGS],
4788++[_LT_FORMAT_COMMENT([The names of the tagged configurations supported by this script])dnl
4789++available_tags="_LT_TAGS"dnl
4790++])
4791++
4792++
4793++# _LT_LIBTOOL_DECLARE(VARNAME, [TAG])
4794++# -----------------------------------
4795++# Extract the dictionary values for VARNAME (optionally with TAG) and
4796++# expand to a commented shell variable setting:
4797++#
4798++# # Some comment about what VAR is for.
4799++# visible_name=$lt_internal_name
4800++m4_define([_LT_LIBTOOL_DECLARE],
4801++[_LT_FORMAT_COMMENT(m4_quote(lt_dict_fetch([lt_decl_dict], [$1],
4802++ [description])))[]dnl
4803++m4_pushdef([_libtool_name],
4804++ m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [libtool_name])))[]dnl
4805++m4_case(m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [value])),
4806++ [0], [_libtool_name=[$]$1],
4807++ [1], [_libtool_name=$lt_[]$1],
4808++ [2], [_libtool_name=$lt_[]$1],
4809++ [_libtool_name=lt_dict_fetch([lt_decl_dict], [$1], [value])])[]dnl
4810++m4_ifval([$2], [_$2])[]m4_popdef([_libtool_name])[]dnl
4811++])
4812++
4813++
4814++# _LT_LIBTOOL_CONFIG_VARS
4815++# -----------------------
4816++# Produce commented declarations of non-tagged libtool config variables
4817++# suitable for insertion in the LIBTOOL CONFIG section of the `libtool'
4818++# script. Tagged libtool config variables (even for the LIBTOOL CONFIG
4819++# section) are produced by _LT_LIBTOOL_TAG_VARS.
4820++m4_defun([_LT_LIBTOOL_CONFIG_VARS],
4821++[m4_foreach([_lt_var],
4822++ m4_quote(_lt_decl_filter([tagged?], [no], [], lt_decl_varnames)),
4823++ [m4_n([_LT_LIBTOOL_DECLARE(_lt_var)])])])
4824++
4825++
4826++# _LT_LIBTOOL_TAG_VARS(TAG)
4827++# -------------------------
4828++m4_define([_LT_LIBTOOL_TAG_VARS],
4829++[m4_foreach([_lt_var], m4_quote(lt_decl_tag_varnames),
4830++ [m4_n([_LT_LIBTOOL_DECLARE(_lt_var, [$1])])])])
4831++
4832++
4833++# _LT_TAGVAR(VARNAME, [TAGNAME])
4834++# ------------------------------
4835++m4_define([_LT_TAGVAR], [m4_ifval([$2], [$1_$2], [$1])])
4836++
4837++
4838++# _LT_CONFIG_COMMANDS
4839++# -------------------
4840++# Send accumulated output to $CONFIG_STATUS. Thanks to the lists of
4841++# variables for single and double quote escaping we saved from calls
4842++# to _LT_DECL, we can put quote escaped variables declarations
4843++# into `config.status', and then the shell code to quote escape them in
4844++# for loops in `config.status'. Finally, any additional code accumulated
4845++# from calls to _LT_CONFIG_LIBTOOL_INIT is expanded.
4846++m4_defun([_LT_CONFIG_COMMANDS],
4847++[AC_PROVIDE_IFELSE([LT_OUTPUT],
4848++ dnl If the libtool generation code has been placed in $CONFIG_LT,
4849++ dnl instead of duplicating it all over again into config.status,
4850++ dnl then we will have config.status run $CONFIG_LT later, so it
4851++ dnl needs to know what name is stored there:
4852++ [AC_CONFIG_COMMANDS([libtool],
4853++ [$SHELL $CONFIG_LT || AS_EXIT(1)], [CONFIG_LT='$CONFIG_LT'])],
4854++ dnl If the libtool generation code is destined for config.status,
4855++ dnl expand the accumulated commands and init code now:
4856++ [AC_CONFIG_COMMANDS([libtool],
4857++ [_LT_OUTPUT_LIBTOOL_COMMANDS], [_LT_OUTPUT_LIBTOOL_COMMANDS_INIT])])
4858++])#_LT_CONFIG_COMMANDS
4859++
4860++
4861++# Initialize.
4862++m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS_INIT],
4863++[
4864++
4865++# The HP-UX ksh and POSIX shell print the target directory to stdout
4866++# if CDPATH is set.
4867++(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
4868++
4869++sed_quote_subst='$sed_quote_subst'
4870++double_quote_subst='$double_quote_subst'
4871++delay_variable_subst='$delay_variable_subst'
4872++_LT_CONFIG_STATUS_DECLARATIONS
4873++LTCC='$LTCC'
4874++LTCFLAGS='$LTCFLAGS'
4875++compiler='$compiler_DEFAULT'
4876++
4877++# Quote evaled strings.
4878++for var in lt_decl_all_varnames([[ \
4879++]], lt_decl_quote_varnames); do
4880++ case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
4881++ *[[\\\\\\\`\\"\\\$]]*)
4882++ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
4883++ ;;
4884++ *)
4885++ eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
4886++ ;;
4887++ esac
4888++done
4889++
4890++# Double-quote double-evaled strings.
4891++for var in lt_decl_all_varnames([[ \
4892++]], lt_decl_dquote_varnames); do
4893++ case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
4894++ *[[\\\\\\\`\\"\\\$]]*)
4895++ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
4896++ ;;
4897++ *)
4898++ eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
4899++ ;;
4900++ esac
4901++done
4902++
4903++# Fix-up fallback echo if it was mangled by the above quoting rules.
4904++case \$lt_ECHO in
4905++*'\\\[$]0 --fallback-echo"')dnl "
4906++ lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\[$]0 --fallback-echo"\[$]/\[$]0 --fallback-echo"/'\`
4907++ ;;
4908++esac
4909++
4910++_LT_OUTPUT_LIBTOOL_INIT
4911++])
4912++
4913++
4914++# LT_OUTPUT
4915++# ---------
4916++# This macro allows early generation of the libtool script (before
4917++# AC_OUTPUT is called), incase it is used in configure for compilation
4918++# tests.
4919++AC_DEFUN([LT_OUTPUT],
4920++[: ${CONFIG_LT=./config.lt}
4921++AC_MSG_NOTICE([creating $CONFIG_LT])
4922++cat >"$CONFIG_LT" <<_LTEOF
4923++#! $SHELL
4924++# Generated by $as_me.
4925++# Run this file to recreate a libtool stub with the current configuration.
4926++
4927++lt_cl_silent=false
4928++SHELL=\${CONFIG_SHELL-$SHELL}
4929++_LTEOF
4930++
4931++cat >>"$CONFIG_LT" <<\_LTEOF
4932++AS_SHELL_SANITIZE
4933++_AS_PREPARE
4934++
4935++exec AS_MESSAGE_FD>&1
4936++exec AS_MESSAGE_LOG_FD>>config.log
4937++{
4938++ echo
4939++ AS_BOX([Running $as_me.])
4940++} >&AS_MESSAGE_LOG_FD
4941++
4942++lt_cl_help="\
4943++\`$as_me' creates a local libtool stub from the current configuration,
4944++for use in further configure time tests before the real libtool is
4945++generated.
4946++
4947++Usage: $[0] [[OPTIONS]]
4948++
4949++ -h, --help print this help, then exit
4950++ -V, --version print version number, then exit
4951++ -q, --quiet do not print progress messages
4952++ -d, --debug don't remove temporary files
4953++
4954++Report bugs to <bug-libtool@gnu.org>."
4955++
4956++lt_cl_version="\
4957++m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl
4958++m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION])
4959++configured by $[0], generated by m4_PACKAGE_STRING.
4960++
4961++Copyright (C) 2008 Free Software Foundation, Inc.
4962++This config.lt script is free software; the Free Software Foundation
4963++gives unlimited permision to copy, distribute and modify it."
4964++
4965++while test $[#] != 0
4966++do
4967++ case $[1] in
4968++ --version | --v* | -V )
4969++ echo "$lt_cl_version"; exit 0 ;;
4970++ --help | --h* | -h )
4971++ echo "$lt_cl_help"; exit 0 ;;
4972++ --debug | --d* | -d )
4973++ debug=: ;;
4974++ --quiet | --q* | --silent | --s* | -q )
4975++ lt_cl_silent=: ;;
4976++
4977++ -*) AC_MSG_ERROR([unrecognized option: $[1]
4978++Try \`$[0] --help' for more information.]) ;;
4979++
4980++ *) AC_MSG_ERROR([unrecognized argument: $[1]
4981++Try \`$[0] --help' for more information.]) ;;
4982++ esac
4983++ shift
4984++done
4985++
4986++if $lt_cl_silent; then
4987++ exec AS_MESSAGE_FD>/dev/null
4988++fi
4989++_LTEOF
4990++
4991++cat >>"$CONFIG_LT" <<_LTEOF
4992++_LT_OUTPUT_LIBTOOL_COMMANDS_INIT
4993++_LTEOF
4994++
4995++cat >>"$CONFIG_LT" <<\_LTEOF
4996++AC_MSG_NOTICE([creating $ofile])
4997++_LT_OUTPUT_LIBTOOL_COMMANDS
4998++AS_EXIT(0)
4999++_LTEOF
5000++chmod +x "$CONFIG_LT"
The diff has been truncated for viewing.

Subscribers

People subscribed via source and target branches

to all changes: