Changeset 6160 for pkg/frankie

Timestamp:

12/15/09 03:24:59 (3 years ago)

Author:

alanbach-guest

Message:

• Sync'd with Debian 0.12.6-2

Location:

pkg/frankie/main/rhythmbox/trunk/debian

Files:

• NEWS (added)
• changelog (modified) (2 diffs)
• control (modified) (5 diffs)
• control.in (modified) (5 diffs)
• patches (added)
• patches/01_dlna_vorbis.patch (added)
• patches/series (added)
• rules (modified) (3 diffs)

pkg/frankie/main/rhythmbox/trunk/debian/changelog

@@ +1 @@
+rhythmbox (0.12.6-2) unstable; urgency=low
+
+  [ Josselin Mouette ]
+  * Switch to quilt for patch management.
+  * 01_dlna_vorbis.patch: patch from Brent Hendricks to enable Ogg 
+    Vorbis playback on UPnP/DLNA shares. Closes: #558694.
+  * Use gudev on Linux, not HAL.
+  * Conflict against HAL-enabled gvfs. Part of Closes: #561083.
+  * Depend on media-player-info on Linux. 
+
+ -- Alan Baghumian <alan@technotux.org>  Mon, 14 Dec 2009 18:24:33 -0800
+
+rhythmbox (0.12.6-1) unstable; urgency=low
+
+  * New upstream release.
+    - Builds with ld's --no-add-needed and binutils-gold. Closes: #556320.
+    - debian/patches/01_inhibit_g-session.patch,
+      debian/patches/02_track_finished.patch:
+      + Removed, fixed upstream.
+
+ -- Emilio Pozuelo Monfort <pochu@debian.org>  Sun, 22 Nov 2009 13:07:31 +0100
+
+rhythmbox (0.12.5-2) unstable; urgency=low
+
+  [ Josselin Mouette ]
+  * 01_inhibit_g-session.patch: stolen upstream. Use gnome-session to 
+    inhibit suspension. Closes: #553504.
+
+  [ Emilio Pozuelo Monfort ]
+  * debian/control.in:
+    - Build depend on xulrunner-dev rather than iceape-dev.
+      Closes: #555913.
+
+  [ Josselin Mouette ]
+  * 02_track_finished.patch: stolen upstream. Clear the track status 
+    when read has finished. Closes: #555189.
+
+ -- Josselin Mouette <joss@debian.org>  Thu, 19 Nov 2009 10:59:02 +0100
+
+rhythmbox (0.12.5-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Emilio Pozuelo Monfort <pochu@debian.org>  Fri, 18 Sep 2009 18:00:38 +0200
+
+rhythmbox (0.12.4-2) unstable; urgency=low
+
+  * Stop build-depending on libnautilus-burn-dev, we get the cd burning
+    support through libbrasero-media-dev.
+
+ -- Emilio Pozuelo Monfort <pochu@debian.org>  Thu, 03 Sep 2009 17:48:58 +0200
+
+rhythmbox (0.12.4-1) unstable; urgency=low
+
+  * debian/NEWS: mention that the tray icon is now a plugin. Closes:
+    #537137, #539612.
+  * New upstream release.
+  * Standards-Version is 3.8.3, no changes needed.
+  * debian/rules:
+    - Don't pass --with-gecko to configure, it's not used anymore.
+    - Don't ship librhythmbox-core.so, it's a private library
+      to be used by rhythmbox and its plugins.
+    - Exclude /usr/lib/mozilla from the shlibs generation too.
+
+ -- Emilio Pozuelo Monfort <pochu@debian.org>  Wed, 26 Aug 2009 18:00:42 +0200
+
 rhythmbox (0.12.3-1) unstable; urgency=low
 
@@ -20 +86 @@
   * Enabled brasero now it's in unstable.
 
- -- Alan Baghumian <alan@technotux.org>  Tue, 28 Jul 2009 17:45:52 -0700
+ -- Josselin Mouette <joss@debian.org>  Wed, 08 Jul 2009 22:49:25 +0200
 
 rhythmbox (0.12.1-1) unstable; urgency=low

pkg/frankie/main/rhythmbox/trunk/debian/control

@@ +1 @@
+# This file is autogenerated. DO NOT EDIT!
+# 
+# Modifications should be made to debian/control.in instead.
+# This file is regenerated automatically in the clean target.
+
 Source: rhythmbox
 Section: gnome
 Priority: optional
 Maintainer: Loic Minier <lool@dooz.org>
-Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Emilio Pozuelo Monfort <pochu@ubuntu.com>, Josselin Mouette <joss@debian.org>, Sebastian Dröge <slomo@debian.org>, Sjoerd Simons <sjoerd@debian.org>
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Emilio Pozuelo Monfort <pochu@debian.org>, Josselin Mouette <joss@debian.org>
 Build-Depends: cdbs (>= 0.4.37),
                debhelper (>= 5.0.37.2),
                gnome-pkg-tools,
+               quilt,
                intltool (>= 0.35.0),
                libdbus-glib-1-dev (>= 0.35),
@@ -17 +23 @@
                libgpod-dev (>= 0.6),
                libmusicbrainz4-dev (>= 2.1.0),
-               libnautilus-burn-dev (>= 2.21.6),
                libbrasero-media-dev (>= 0.9.1),
                libtotem-plparser-dev (>= 2.26.0),
@@ -24 +29 @@
                libsoup2.4-dev (>= 2.26.0),
                libsoup-gnome2.4-dev (>= 2.26.0),
-               libhal-dev (>= 0.5),
+               libgudev-1.0-dev (>= 143) | not+linux-gnu,
+               libhal-dev (>= 0.5) | linux-gnu,
                libmtp-dev (>= 0.3.0),
                libgnome-keyring-dev,
@@ -40 +46 @@
                python-gst0.10-dev (>= 0.10.1),
                python-gobject-dev (>= 2.13.2),
-               iceape-dev (>= 1.1.9-5),
+               xulrunner-dev,
                docbook-xsl (>= 1.54.1),
                docbook-utils (>= 0.6.11),
                pkg-config,
                libglib2.0-doc,
-               libgtk2.0-doc,
-               libglade2-dev,
-               libgnome2-dev
-Standards-Version: 3.8.1
+               libgtk2.0-doc
+Standards-Version: 3.8.3
 XS-Python-Version: >= 2.3
 
@@ -65 +69 @@
          gnome-icon-theme,
          gstreamer0.10-x,
-         python-gst0.10
+         python-gst0.10,
+         media-player-info [linux-any]
 Conflicts: gnome-control-center (<< 2.15.90)
+Breaks: gvfs (<< 1.4.1-6)
 Recommends: yelp,
             avahi-daemon,

pkg/frankie/main/rhythmbox/trunk/debian/control.in

@@ -7 +7 @@
                debhelper (>= 5.0.37.2),
                gnome-pkg-tools,
+               quilt,
                intltool (>= 0.35.0),
                libdbus-glib-1-dev (>= 0.35),
@@ -17 +18 @@
                libgpod-dev (>= 0.6),
                libmusicbrainz4-dev (>= 2.1.0),
-               libnautilus-burn-dev (>= 2.21.6),
                libbrasero-media-dev (>= 0.9.1),
                libtotem-plparser-dev (>= 2.26.0),
@@ -24 +24 @@
                libsoup2.4-dev (>= 2.26.0),
                libsoup-gnome2.4-dev (>= 2.26.0),
-               libhal-dev (>= 0.5),
+               libgudev-1.0-dev (>= 143) | not+linux-gnu,
+               libhal-dev (>= 0.5) | linux-gnu,
                libmtp-dev (>= 0.3.0),
                libgnome-keyring-dev,
@@ -40 +41 @@
                python-gst0.10-dev (>= 0.10.1),
                python-gobject-dev (>= 2.13.2),
-               iceape-dev (>= 1.1.9-5),
+               xulrunner-dev,
                docbook-xsl (>= 1.54.1),
                docbook-utils (>= 0.6.11),
                pkg-config,
                libglib2.0-doc,
-               libgtk2.0-doc,
-               libglade2-dev,
-               libgnome2-dev
-Standards-Version: 3.8.1
+               libgtk2.0-doc
+Standards-Version: 3.8.3
 XS-Python-Version: >= 2.3
 
@@ -65 +64 @@
          gnome-icon-theme,
          gstreamer0.10-x,
-         python-gst0.10
+         python-gst0.10,
+         media-player-info [linux-any]
 Conflicts: gnome-control-center (<< 2.15.90)
+Breaks: gvfs (<< 1.4.1-6)
 Recommends: yelp,
             avahi-daemon,

pkg/frankie/main/rhythmbox/trunk/debian/rules

@@ -2 +2 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 include /usr/share/cdbs/1/rules/utils.mk
 include /usr/share/cdbs/1/class/gnome.mk
@@ -8 +8 @@
 -include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
 
-# lirc support
 DEB_CONFIGURE_EXTRA_FLAGS += --enable-lirc
-# disable scrollkeeper-update in make install
 DEB_CONFIGURE_EXTRA_FLAGS += --disable-scrollkeeper
-# use iceape to build the plugin
-DEB_CONFIGURE_EXTRA_FLAGS += --with-gecko=iceape
+
+ifeq ($(DEB_HOST_ARCH_OS),linux)
+DEB_CONFIGURE_EXTRA_FLAGS += --without-hal --with-gudev
+else
+DEB_CONFIGURE_EXTRA_FLAGS += --with-hal --without-gudev
+endif
 
 # exclude plugins from shlibs generation
 DEB_DH_MAKESHLIBS_ARGS_rhythmbox += -Xdebian/$(cdbs_curpkg)/usr/lib/rhythmbox
+DEB_DH_MAKESHLIBS_ARGS_rhythmbox += -Xdebian/$(cdbs_curpkg)/usr/lib/mozilla
 
 binary-install/rhythmbox::
@@ -22 +25 @@
         find debian/rhythmbox -name '*.a' -exec rm -f '{}' ';'
         find debian/rhythmbox -name '*.la' -exec rm -f '{}' ';'
+        # librhythmbox-core.so is a private library, don't ship the .so symlink
+        rm debian/rhythmbox/usr/lib/librhythmbox-core.so
         dh_pysupport
-