r29687 - in /packages/experimental/rhythmbox/debian: ./ patches/

jeansch-guest at users.alioth.debian.org jeansch-guest at users.alioth.debian.org
Mon Sep 19 19:15:53 UTC 2011


Author: jeansch-guest
Date: Mon Sep 19 19:15:52 2011
New Revision: 29687

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=29687
Log:
* New upstream git snashot.
* Removed debian/patches/01_fix_null_pointer_dereference.patch
  - b-g-o #659261 fixed upstream
* Added debian/patches/01_fix_visualizer_plugin_dir.patch (b-g-o #659508)
* Added debian/patches/02_disable_rb_client_desktop.patch (b-g-o #659510)
* debian/copyright
  - Fixed GPL-2 location
* debian/*.install
  - Moved plugin data files in the right package

Added:
    packages/experimental/rhythmbox/debian/patches/01_fix_visualizer_plugin_dir.patch
    packages/experimental/rhythmbox/debian/patches/02_disable_rb_client_desktop.patch
Removed:
    packages/experimental/rhythmbox/debian/patches/01_fix_null_pointer_dereference.patch
Modified:
    packages/experimental/rhythmbox/debian/changelog
    packages/experimental/rhythmbox/debian/copyright
    packages/experimental/rhythmbox/debian/patches/series
    packages/experimental/rhythmbox/debian/rhythmbox-plugins.install
    packages/experimental/rhythmbox/debian/rhythmbox.install

Modified: packages/experimental/rhythmbox/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/rhythmbox/debian/changelog?rev=29687&op=diff
==============================================================================
--- packages/experimental/rhythmbox/debian/changelog [utf-8] (original)
+++ packages/experimental/rhythmbox/debian/changelog [utf-8] Mon Sep 19 19:15:52 2011
@@ -1,4 +1,18 @@
-rhythmbox (2.90.1~git20110915.42165b-2) experimental; urgency=low
+rhythmbox (2.90.1~git20110919.2dfea6-1) UNRELEASED; urgency=low
+
+  * New upstream git snashot.
+  * Removed debian/patches/01_fix_null_pointer_dereference.patch
+    - b-g-o #659261 fixed upstream
+  * Added debian/patches/01_fix_visualizer_plugin_dir.patch (b-g-o #659508)
+  * Added debian/patches/02_disable_rb_client_desktop.patch (b-g-o #659510)
+  * debian/copyright
+    - Fixed GPL-2 location
+  * debian/*.install
+    - Moved plugin data files in the right package
+
+ -- Jean Schurger <jean at schurger.org>  Mon, 19 Sep 2011 11:57:02 -0400
+
+rhythmbox (2.90.1~git20110915.42165b-2) UNRELEASED; urgency=low
 
   * debian/patches/*
     - Fix a crash when a grilo source have no search capabilities
@@ -6,7 +20,7 @@
 
  -- Jean Schurger <jean at schurger.org>  Fri, 16 Sep 2011 11:08:51 -0400
 
-rhythmbox (2.90.1~git20110915.42165b-1) experimental; urgency=low
+rhythmbox (2.90.1~git20110915.42165b-1) UNRELEASED; urgency=low
 
   * New upstream git snashot.
   * debian/rules, debian/control.in, debian/rhythmbox-plugins.install

Modified: packages/experimental/rhythmbox/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/rhythmbox/debian/copyright?rev=29687&op=diff
==============================================================================
--- packages/experimental/rhythmbox/debian/copyright [utf-8] (original)
+++ packages/experimental/rhythmbox/debian/copyright [utf-8] Mon Sep 19 19:15:52 2011
@@ -57,7 +57,7 @@
    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 
 On Debian systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL'.
+Public License can be found in `/usr/share/common-licenses/GPL-2'.
 
 
 The files ./widgets/rb-segmented-bar.[ch] are:

Added: packages/experimental/rhythmbox/debian/patches/01_fix_visualizer_plugin_dir.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/rhythmbox/debian/patches/01_fix_visualizer_plugin_dir.patch?rev=29687&op=file
==============================================================================
--- packages/experimental/rhythmbox/debian/patches/01_fix_visualizer_plugin_dir.patch (added)
+++ packages/experimental/rhythmbox/debian/patches/01_fix_visualizer_plugin_dir.patch [utf-8] Mon Sep 19 19:15:52 2011
@@ -1,0 +1,26 @@
+Description: Fix visualizer plugin data install path
+diff -uNr rhythmbox-2.90.1~git20110919.2dfea6.orig/plugins/visualizer/Makefile.am rhythmbox-2.90.1~git20110919.2dfea6/plugins/visualizer/Makefile.am
+--- rhythmbox-2.90.1~git20110919.2dfea6.orig/plugins/visualizer/Makefile.am	2011-09-19 13:02:40.000000000 -0400
++++ rhythmbox-2.90.1~git20110919.2dfea6/plugins/visualizer/Makefile.am	2011-09-19 13:08:09.055597294 -0400
+@@ -1,6 +1,7 @@
+ bULL =
+ 
+ plugindir = $(PLUGINDIR)/visualizer
++plugindatadir = $(PLUGINDATADIR)/visualizer
+ plugin_LTLIBRARIES = libvisualizer.la
+ 
+ libvisualizer_la_SOURCES =			\
+@@ -30,12 +31,11 @@
+ 	-DPIXMAP_DIR=\""$(datadir)/pixmaps"\"		\
+ 	-DSHARE_DIR=\"$(pkgdatadir)\"                   \
+ 	-DDATADIR=\""$(datadir)"\"			\
+-	-DPLUGIN_SRC_DIR=\""$(ROOT_UNINSTALLED_DIR)/plugins/visualizer"\" \
+ 	$(RHYTHMBOX_CFLAGS)				\
+ 	$(CLUTTER_CFLAGS)					\
+ 	-D_XOPEN_SOURCE -D_BSD_SOURCE
+ 
+-mxthemedir = $(plugindir)
++mxthemedir = $(plugindatadir)
+ mxtheme_DATA = 						\
+ 	visualizer.css					\
+ 	button-active.png				\

Added: packages/experimental/rhythmbox/debian/patches/02_disable_rb_client_desktop.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/rhythmbox/debian/patches/02_disable_rb_client_desktop.patch?rev=29687&op=file
==============================================================================
--- packages/experimental/rhythmbox/debian/patches/02_disable_rb_client_desktop.patch (added)
+++ packages/experimental/rhythmbox/debian/patches/02_disable_rb_client_desktop.patch [utf-8] Mon Sep 19 19:15:52 2011
@@ -1,0 +1,30 @@
+Description: rhythmbox-client seems to not exists anymore
+Index: rhythmbox-2.90.1~git20110919.2dfea6/data/Makefile.am
+===================================================================
+--- rhythmbox-2.90.1~git20110919.2dfea6.orig/data/Makefile.am	2011-09-19 13:02:39.000000000 -0400
++++ rhythmbox-2.90.1~git20110919.2dfea6/data/Makefile.am	2011-09-19 14:32:21.176251830 -0400
+@@ -4,7 +4,7 @@
+ @INTLTOOL_DESKTOP_RULE@
+ 
+ Multimediadir = $(datadir)/applications
+-Multimedia_in_files = rhythmbox.desktop.in rhythmbox-device.desktop.in
++Multimedia_in_files = rhythmbox.desktop.in
+ Multimedia_DATA = $(Multimedia_in_files:.desktop.in=.desktop)
+ 
+ playlists_in_files = playlists.xml.in
+@@ -56,8 +56,7 @@
+ 	     $(man_MANS)            \
+ 	     $(playlists_in_files)  \
+ 	     $(profiles_DATA)       \
+-	     rhythmbox.desktop.in.in \
+-	     rhythmbox-device.desktop.in.in
++	     rhythmbox.desktop.in.in
+ 
+ CLEANFILES = 					\
+ 	rhythmbox.desktop			\
+@@ -65,5 +64,4 @@
+ 	org.gnome.Rhythmbox.service		\
+ 	playlists.xml				\
+ 	rhythmbox.desktop.in			\
+-	rhythmbox-device.desktop.in		\
+ 	gschemas.compiled

Modified: packages/experimental/rhythmbox/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/rhythmbox/debian/patches/series?rev=29687&op=diff
==============================================================================
--- packages/experimental/rhythmbox/debian/patches/series [utf-8] (original)
+++ packages/experimental/rhythmbox/debian/patches/series [utf-8] Mon Sep 19 19:15:52 2011
@@ -1,1 +1,2 @@
-01_fix_null_pointer_dereference.patch
+01_fix_visualizer_plugin_dir.patch
+02_disable_rb_client_desktop.patch

Modified: packages/experimental/rhythmbox/debian/rhythmbox-plugins.install
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/rhythmbox/debian/rhythmbox-plugins.install?rev=29687&op=diff
==============================================================================
--- packages/experimental/rhythmbox/debian/rhythmbox-plugins.install [utf-8] (original)
+++ packages/experimental/rhythmbox/debian/rhythmbox-plugins.install [utf-8] Mon Sep 19 19:15:52 2011
@@ -1,27 +1,42 @@
 debian/tmp/usr/lib/mozilla/plugins/librhythmbox-itms-detection-plugin.so
 debian/tmp/usr/lib/rhythmbox/plugins/artdisplay
+debian/tmp/usr/share/rhythmbox/plugins/artdisplay
 debian/tmp/usr/lib/rhythmbox/plugins/audiocd
+debian/tmp/usr/share/rhythmbox/plugins/audiocd
 debian/tmp/usr/lib/rhythmbox/plugins/audioscrobbler
+debian/tmp/usr/share/rhythmbox/plugins/audioscrobbler
 debian/tmp/usr/lib/rhythmbox/plugins/context
+debian/tmp/usr/share/rhythmbox/plugins/context
 debian/tmp/usr/lib/rhythmbox/plugins/daap
+debian/tmp/usr/share/rhythmbox/plugins/daap
 debian/tmp/usr/lib/rhythmbox/plugins/dbus-media-server
 debian/tmp/usr/lib/rhythmbox/plugins/fmradio
+debian/tmp/usr/share/rhythmbox/plugins/fmradio
 debian/tmp/usr/lib/rhythmbox/plugins/generic-player
+debian/tmp/usr/share/rhythmbox/plugins/generic-player
 debian/tmp/usr/lib/rhythmbox/plugins/grilo
 debian/tmp/usr/lib/rhythmbox/plugins/im-status
 debian/tmp/usr/lib/rhythmbox/plugins/ipod
+debian/tmp/usr/share/rhythmbox/plugins/ipod
 debian/tmp/usr/lib/rhythmbox/plugins/iradio
+debian/tmp/usr/share/rhythmbox/plugins/iradio
 debian/tmp/usr/lib/rhythmbox/plugins/lyrics
+debian/tmp/usr/share/rhythmbox/plugins/lyrics
 debian/tmp/usr/lib/rhythmbox/plugins/magnatune
+debian/tmp/usr/share/rhythmbox/plugins/magnatune
 debian/tmp/usr/lib/rhythmbox/plugins/mmkeys
 debian/tmp/usr/lib/rhythmbox/plugins/mpris
 debian/tmp/usr/lib/rhythmbox/plugins/mtpdevice
+debian/tmp/usr/share/rhythmbox/plugins/mtpdevice
 debian/tmp/usr/lib/rhythmbox/plugins/notification
 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/share/rhythmbox/plugins/rblirc
 debian/tmp/usr/lib/rhythmbox/plugins/rbzeitgeist
 debian/tmp/usr/lib/rhythmbox/plugins/replaygain
+debian/tmp/usr/share/rhythmbox/plugins/replaygain
 debian/tmp/usr/lib/rhythmbox/plugins/sendto
 debian/tmp/usr/lib/rhythmbox/plugins/visualizer
+debian/tmp/usr/share/rhythmbox/plugins/visualizer

Modified: packages/experimental/rhythmbox/debian/rhythmbox.install
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/rhythmbox/debian/rhythmbox.install?rev=29687&op=diff
==============================================================================
--- packages/experimental/rhythmbox/debian/rhythmbox.install [utf-8] (original)
+++ packages/experimental/rhythmbox/debian/rhythmbox.install [utf-8] Mon Sep 19 19:15:52 2011
@@ -6,7 +6,11 @@
 debian/tmp/usr/share/locale
 debian/tmp/usr/share/man
 debian/tmp/usr/share/omf
-debian/tmp/usr/share/rhythmbox
+debian/tmp/usr/share/rhythmbox/*.ui
+debian/tmp/usr/share/rhythmbox/playlists.xml
+debian/tmp/usr/share/rhythmbox/rhythmbox-ui.xml
+debian/tmp/usr/share/rhythmbox/rhythmbox.gep
+debian/tmp/usr/share/rhythmbox/icons/
 debian/tmp/usr/bin
 debian/tmp/usr/lib/rhythmbox/rhythmbox-metadata
 debian/tmp/usr/share/glib-2.0/schemas




More information about the pkg-gnome-commits mailing list