debdiff for merge from debian

[Baptiste Mille-Mathias]

di da doum, I'll attach it right away

[Baptiste Mille-Mathias (bmillemathias)]

here it comes

[Baptiste Mille-Mathias (bmillemathias)]

Oh I forgot,

diff of rules between previous rb version and this one, I keep the rules file from the debian package.
[...]
-DEB_INSTALL_MANPAGES_rhythmbox := debian/rhythmbox.1 \
- debian/rhythmbox-client.1
-

 [...]

-# work around #204975 until debhelper is fixed
-DEB_DH_MAKESHLIBS_ARGS_rhythmbox := -n
-
-clean::
- rm -f help/C/authors.xml
+# exclude plugins from shlibs generation
+DEB_DH_MAKESHLIBS_ARGS_rhythmbox += -Xdebian/$(cdbs_curpkg)/usr/lib/rhythmbox

 binary-install/rhythmbox::
- # kill *.a and *.la files of plugins
- find debian/rhythmbox/usr/lib/rhythmbox/plugins -name '*.a' -exec rm -f '{}' ';'
- find debian/rhythmbox/usr/lib/rhythmbox/plugins -name '*.la' -exec rm -f '{}' ';'
+ # kill *.a and *.la files of plugins and the shared lib
+ find debian/rhythmbox -name '*.a' -exec rm -f '{}' ';'
+ find debian/rhythmbox -name '*.la' -exec rm -f '{}' ';'
        dh_pysupport /usr/lib/rhythmbox/plugins
- dh_python

[Sebastien Bacher (seb128)]

not an upstream bug

[Sebastien Bacher (seb128)]

Thank youi for the work, fixed with this upload now:

 rhythmbox (0.10.0-1ubuntu1) gutsy; urgency=low
 .
   * Upload to gutsy (Ubuntu: #112458)
 .
   [ Baptiste Mille-Mathias ]
   * Sync with Debian:
     - Depends on gstreamer0.10-x
     - Recommends gnome-control-center (>= 2.15.90)
   * debian/control.in:
     - Build-Depends on liblaunchpad-integration-dev
     - use Recommends instead of Depends for gstreamer0.10-plugins-ugly since
       it's an universe package
     - updated python-support to 0.5.6
     - updated python version to 2.5
   * debian/patches/01_lpi.patch,
     debian/patches/02_autoconf.patch:
     - patches for launchpad-integration
   * debian/patches/06_oggradios.patch:
     - list only ogg stations by default