r23052 - in /packages/unstable/rhythmbox/debian: changelog control control.in rhythmbox-plugin-cdrecorder.install rhythmbox-plugin-coherence.install rhythmbox-plugins.install rhythmbox.install rules
joss at users.alioth.debian.org
joss at users.alioth.debian.org
Mon Feb 15 17:26:23 UTC 2010
Author: joss
Date: Mon Feb 15 17:26:22 2010
New Revision: 23052
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=23052
Log:
* Split plugins in a separate rhythmbox-plugins package, plus another
one for the coherence plugin and one for the cdrecorder plugin.
Mostly based on a patch by Yves-Alexis Perez. Closes: #566711.
* rhythmbox-plugins depends on python-webkit and python-mako.
Closes: #558203.
Added:
packages/unstable/rhythmbox/debian/rhythmbox-plugin-cdrecorder.install
packages/unstable/rhythmbox/debian/rhythmbox-plugin-coherence.install
packages/unstable/rhythmbox/debian/rhythmbox-plugins.install
Modified:
packages/unstable/rhythmbox/debian/changelog
packages/unstable/rhythmbox/debian/control
packages/unstable/rhythmbox/debian/control.in
packages/unstable/rhythmbox/debian/rhythmbox.install
packages/unstable/rhythmbox/debian/rules
Modified: packages/unstable/rhythmbox/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/rhythmbox/debian/changelog?rev=23052&op=diff
==============================================================================
--- packages/unstable/rhythmbox/debian/changelog [utf-8] (original)
+++ packages/unstable/rhythmbox/debian/changelog [utf-8] Mon Feb 15 17:26:22 2010
@@ -1,3 +1,13 @@
+rhythmbox (0.12.6-4) unstable; urgency=low
+
+ * Split plugins in a separate rhythmbox-plugins package, plus another
+ one for the coherence plugin and one for the cdrecorder plugin.
+ Mostly based on a patch by Yves-Alexis Perez. Closes: #566711.
+ * rhythmbox-plugins depends on python-webkit and python-mako.
+ Closes: #558203.
+
+ -- Josselin Mouette <joss at debian.org> Mon, 15 Feb 2010 17:33:32 +0100
+
rhythmbox (0.12.6-3) unstable; urgency=low
[ Josselin Mouette ]
Modified: packages/unstable/rhythmbox/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/rhythmbox/debian/control?rev=23052&op=diff
==============================================================================
--- packages/unstable/rhythmbox/debian/control [utf-8] (original)
+++ packages/unstable/rhythmbox/debian/control [utf-8] Mon Feb 15 17:26:22 2010
@@ -10,7 +10,7 @@
Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Emilio Pozuelo Monfort <pochu at debian.org>, Josselin Mouette <joss at debian.org>
Build-Depends: cdbs (>= 0.4.37),
debhelper (>= 5.0.37.2),
- gnome-pkg-tools,
+ gnome-pkg-tools (>= 0.6),
quilt,
intltool (>= 0.35.0),
libdbus-glib-1-dev (>= 0.35),
@@ -77,11 +77,13 @@
hal [!linux-any],
notification-daemon,
gstreamer0.10-plugins-ugly,
- gvfs-backends
+ gvfs-backends,
+ rhythmbox-plugins
Suggests: gstreamer0.10-plugins-bad,
- python-coherence,
gnome-codec-install,
- gnome-control-center
+ gnome-control-center,
+ rhythmbox-plugin-coherence,
+ rhythmbox-plugin-cdrecorder
XB-Python-Version: ${python:Versions}
Description: music player and organizer for GNOME
Rhythmbox is a very easy to use music playing and management program
@@ -90,8 +92,6 @@
Internet Radio, iPod integration and generic portable audio player
support, Audio CD burning, Audio CD playback, music sharing, and
Podcasts.
- .
- You need the python-coherence package for DLNA/UPnp sharing plugin.
Package: rhythmbox-dbg
Architecture: any
@@ -112,3 +112,82 @@
Podcasts.
.
This package contains the debugging symbols for rhythmbox.
+
+Package: rhythmbox-plugins
+Architecture: any
+Depends: ${misc:Depends},
+ ${shlibs:Depends},
+ ${python:Depends},
+ rhythmbox (= ${binary:Version}),
+ python-webkit,
+ python-mako
+Conflicts: rhythmbox (<< 0.12.6-4)
+Replaces: rhythmbox (<< 0.12.6-4)
+XB-Python-Version: ${python:Versions}
+Description: plugins for rhythmbox music player
+ Rhythmbox is a very easy to use music playing and management program
+ which supports a wide range of audio formats (including mp3 and ogg).
+ Originally inspired by Apple's iTunes, the current version also supports
+ Internet Radio, iPod integration and generic portable audio player
+ support, Audio CD burning, Audio CD playback, music sharing, and
+ Podcasts.
+ .
+ This package contains the following plugins:
+ - Cover art
+ - Audio CD Player
+ - Last.fm
+ - Context Panel
+ - DAAP Music Sharing
+ - FM Radio
+ - Portable Players
+ - IM Status
+ - Portable Players - iPod
+ - Internet Radio
+ - Jamendo
+ - Song Lyrics
+ - Magnatune Store
+ - Media Player Keys
+ - Portable Players - MTP
+ - Power Manager
+ - Python Console
+ - LIRC
+ - Status Icon
+ - Visualization
+ - Browser plugin to integrate Rhythmbox with itunes
+
+Package: rhythmbox-plugin-cdrecorder
+Architecture: any
+Depends: ${misc:Depends},
+ ${shlibs:Depends},
+ rhythmbox (= ${binary:Version})
+Conflicts: rhythmbox (<< 0.12.6-4)
+Replaces: rhythmbox (<< 0.12.6-4)
+Description: burning plugin for rhythmbox music player
+ Rhythmbox is a very easy to use music playing and management program
+ which supports a wide range of audio formats (including mp3 and ogg).
+ Originally inspired by Apple's iTunes, the current version also supports
+ Internet Radio, iPod integration and generic portable audio player
+ support, Audio CD burning, Audio CD playback, music sharing, and
+ Podcasts.
+ .
+ This package contains the brasero based CD/DVD burning plugin.
+
+Package: rhythmbox-plugin-coherence
+Architecture: all
+Depends: ${misc:Depends},
+ ${python:Depends},
+ python-coherence,
+ rhythmbox (>= ${gnome:Version}),
+ rhythmbox (<< ${gnome:NextVersion})
+Conflicts: rhythmbox (<< 0.12.6-4)
+Replaces: rhythmbox (<< 0.12.6-4)
+XB-Python-Version: ${python:Versions}
+Description: UPnp plugin for rhythmbox music player
+ Rhythmbox is a very easy to use music playing and management program
+ which supports a wide range of audio formats (including mp3 and ogg).
+ Originally inspired by Apple's iTunes, the current version also supports
+ Internet Radio, iPod integration and generic portable audio player
+ support, Audio CD burning, Audio CD playback, music sharing, and
+ Podcasts.
+ .
+ This package contains the coherence DLNA/UPnp plugin.
Modified: packages/unstable/rhythmbox/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/rhythmbox/debian/control.in?rev=23052&op=diff
==============================================================================
--- packages/unstable/rhythmbox/debian/control.in [utf-8] (original)
+++ packages/unstable/rhythmbox/debian/control.in [utf-8] Mon Feb 15 17:26:22 2010
@@ -5,7 +5,7 @@
Uploaders: @GNOME_TEAM@
Build-Depends: cdbs (>= 0.4.37),
debhelper (>= 5.0.37.2),
- gnome-pkg-tools,
+ gnome-pkg-tools (>= 0.6),
quilt,
intltool (>= 0.35.0),
libdbus-glib-1-dev (>= 0.35),
@@ -72,11 +72,13 @@
hal [!linux-any],
notification-daemon,
gstreamer0.10-plugins-ugly,
- gvfs-backends
+ gvfs-backends,
+ rhythmbox-plugins
Suggests: gstreamer0.10-plugins-bad,
- python-coherence,
gnome-codec-install,
- gnome-control-center
+ gnome-control-center,
+ rhythmbox-plugin-coherence,
+ rhythmbox-plugin-cdrecorder
XB-Python-Version: ${python:Versions}
Description: music player and organizer for GNOME
Rhythmbox is a very easy to use music playing and management program
@@ -85,8 +87,6 @@
Internet Radio, iPod integration and generic portable audio player
support, Audio CD burning, Audio CD playback, music sharing, and
Podcasts.
- .
- You need the python-coherence package for DLNA/UPnp sharing plugin.
Package: rhythmbox-dbg
Architecture: any
@@ -107,3 +107,82 @@
Podcasts.
.
This package contains the debugging symbols for rhythmbox.
+
+Package: rhythmbox-plugins
+Architecture: any
+Depends: ${misc:Depends},
+ ${shlibs:Depends},
+ ${python:Depends},
+ rhythmbox (= ${binary:Version}),
+ python-webkit,
+ python-mako
+Conflicts: rhythmbox (<< 0.12.6-4)
+Replaces: rhythmbox (<< 0.12.6-4)
+XB-Python-Version: ${python:Versions}
+Description: plugins for rhythmbox music player
+ Rhythmbox is a very easy to use music playing and management program
+ which supports a wide range of audio formats (including mp3 and ogg).
+ Originally inspired by Apple's iTunes, the current version also supports
+ Internet Radio, iPod integration and generic portable audio player
+ support, Audio CD burning, Audio CD playback, music sharing, and
+ Podcasts.
+ .
+ This package contains the following plugins:
+ - Cover art
+ - Audio CD Player
+ - Last.fm
+ - Context Panel
+ - DAAP Music Sharing
+ - FM Radio
+ - Portable Players
+ - IM Status
+ - Portable Players - iPod
+ - Internet Radio
+ - Jamendo
+ - Song Lyrics
+ - Magnatune Store
+ - Media Player Keys
+ - Portable Players - MTP
+ - Power Manager
+ - Python Console
+ - LIRC
+ - Status Icon
+ - Visualization
+ - Browser plugin to integrate Rhythmbox with itunes
+
+Package: rhythmbox-plugin-cdrecorder
+Architecture: any
+Depends: ${misc:Depends},
+ ${shlibs:Depends},
+ rhythmbox (= ${binary:Version})
+Conflicts: rhythmbox (<< 0.12.6-4)
+Replaces: rhythmbox (<< 0.12.6-4)
+Description: burning plugin for rhythmbox music player
+ Rhythmbox is a very easy to use music playing and management program
+ which supports a wide range of audio formats (including mp3 and ogg).
+ Originally inspired by Apple's iTunes, the current version also supports
+ Internet Radio, iPod integration and generic portable audio player
+ support, Audio CD burning, Audio CD playback, music sharing, and
+ Podcasts.
+ .
+ This package contains the brasero based CD/DVD burning plugin.
+
+Package: rhythmbox-plugin-coherence
+Architecture: all
+Depends: ${misc:Depends},
+ ${python:Depends},
+ python-coherence,
+ rhythmbox (>= ${gnome:Version}),
+ rhythmbox (<< ${gnome:NextVersion})
+Conflicts: rhythmbox (<< 0.12.6-4)
+Replaces: rhythmbox (<< 0.12.6-4)
+XB-Python-Version: ${python:Versions}
+Description: UPnp plugin for rhythmbox music player
+ Rhythmbox is a very easy to use music playing and management program
+ which supports a wide range of audio formats (including mp3 and ogg).
+ Originally inspired by Apple's iTunes, the current version also supports
+ Internet Radio, iPod integration and generic portable audio player
+ support, Audio CD burning, Audio CD playback, music sharing, and
+ Podcasts.
+ .
+ This package contains the coherence DLNA/UPnp plugin.
Added: packages/unstable/rhythmbox/debian/rhythmbox-plugin-cdrecorder.install
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/rhythmbox/debian/rhythmbox-plugin-cdrecorder.install?rev=23052&op=file
==============================================================================
--- packages/unstable/rhythmbox/debian/rhythmbox-plugin-cdrecorder.install (added)
+++ packages/unstable/rhythmbox/debian/rhythmbox-plugin-cdrecorder.install [utf-8] Mon Feb 15 17:26:22 2010
@@ -1,0 +1,1 @@
+debian/tmp/usr/lib/rhythmbox/plugins/cd-recorder
Added: packages/unstable/rhythmbox/debian/rhythmbox-plugin-coherence.install
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/rhythmbox/debian/rhythmbox-plugin-coherence.install?rev=23052&op=file
==============================================================================
--- packages/unstable/rhythmbox/debian/rhythmbox-plugin-coherence.install (added)
+++ packages/unstable/rhythmbox/debian/rhythmbox-plugin-coherence.install [utf-8] Mon Feb 15 17:26:22 2010
@@ -1,0 +1,1 @@
+debian/tmp/usr/lib/rhythmbox/plugins/upnp_coherence
Added: packages/unstable/rhythmbox/debian/rhythmbox-plugins.install
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/rhythmbox/debian/rhythmbox-plugins.install?rev=23052&op=file
==============================================================================
--- packages/unstable/rhythmbox/debian/rhythmbox-plugins.install (added)
+++ packages/unstable/rhythmbox/debian/rhythmbox-plugins.install [utf-8] Mon Feb 15 17:26:22 2010
@@ -1,0 +1,22 @@
+debian/tmp/usr/lib/mozilla/plugins/librhythmbox-itms-detection-plugin.so
+debian/tmp/usr/lib/rhythmbox/plugins/artdisplay
+debian/tmp/usr/lib/rhythmbox/plugins/audiocd
+debian/tmp/usr/lib/rhythmbox/plugins/audioscrobbler
+debian/tmp/usr/lib/rhythmbox/plugins/context
+debian/tmp/usr/lib/rhythmbox/plugins/daap
+debian/tmp/usr/lib/rhythmbox/plugins/fmradio
+debian/tmp/usr/lib/rhythmbox/plugins/generic-player
+debian/tmp/usr/lib/rhythmbox/plugins/im-status
+debian/tmp/usr/lib/rhythmbox/plugins/ipod
+debian/tmp/usr/lib/rhythmbox/plugins/iradio
+debian/tmp/usr/lib/rhythmbox/plugins/jamendo
+debian/tmp/usr/lib/rhythmbox/plugins/lyrics
+debian/tmp/usr/lib/rhythmbox/plugins/magnatune
+debian/tmp/usr/lib/rhythmbox/plugins/mmkeys
+debian/tmp/usr/lib/rhythmbox/plugins/mtpdevice
+debian/tmp/usr/lib/rhythmbox/plugins/power-manager
+debian/tmp/usr/lib/rhythmbox/plugins/python-console
+debian/tmp/usr/lib/rhythmbox/plugins/rb
+debian/tmp/usr/lib/rhythmbox/plugins/rblirc
+debian/tmp/usr/lib/rhythmbox/plugins/status-icon
+debian/tmp/usr/lib/rhythmbox/plugins/visualizer
Modified: packages/unstable/rhythmbox/debian/rhythmbox.install
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/rhythmbox/debian/rhythmbox.install?rev=23052&op=diff
==============================================================================
--- packages/unstable/rhythmbox/debian/rhythmbox.install [utf-8] (original)
+++ packages/unstable/rhythmbox/debian/rhythmbox.install [utf-8] Mon Feb 15 17:26:22 2010
@@ -1,3 +1,6 @@
debian/rhythmbox-small.xpm usr/share/pixmaps
-debian/tmp/usr
+debian/tmp/usr/share
+debian/tmp/usr/bin
+debian/tmp/usr/lib/rhythmbox/rhythmbox-metadata
+debian/tmp/usr/lib/librhythmbox-core.so.*
debian/tmp/etc
Modified: packages/unstable/rhythmbox/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/rhythmbox/debian/rules?rev=23052&op=diff
==============================================================================
--- packages/unstable/rhythmbox/debian/rules [utf-8] (original)
+++ packages/unstable/rhythmbox/debian/rules [utf-8] Mon Feb 15 17:26:22 2010
@@ -5,6 +5,7 @@
include /usr/share/cdbs/1/rules/utils.mk
include /usr/share/cdbs/1/class/gnome.mk
include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
+include /usr/share/gnome-pkg-tools/1/rules/gnome-version.mk
-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
DEB_CONFIGURE_EXTRA_FLAGS += --enable-lirc
@@ -17,13 +18,10 @@
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
+DEB_DH_MAKESHLIBS_ARGS_rhythmbox-plugins += --no-act
+DEB_DH_MAKESHLIBS_ARGS_rhythmbox-plugin-cdrecorder += --no-act
-binary-install/rhythmbox::
- # 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 '{}' ';'
- # librhythmbox-core.so is a private library, don't ship the .so symlink
- rm debian/rhythmbox/usr/lib/librhythmbox-core.so
- dh_pysupport
+$(patsubst %,binary-post-install/%,$(DEB_PACKAGES)) ::
+ find debian/$(cdbs_curpkg) -name '*.a' -exec rm -f '{}' ';'
+ find debian/$(cdbs_curpkg) -name '*.la' -exec rm -f '{}' ';'
+ dh_pysupport -p$(cdbs_curpkg) /usr/lib/rhythmbox
More information about the pkg-gnome-commits
mailing list