r15757 - in /desktop/unstable/gnome-media/debian: cddb-slave2-properties.1 changelog control control.in gnome-cd.1 gnome-cd.xpm gnome-media-common.install gnome-media.menu libgnome-media0.install rules

svena-guest at users.alioth.debian.org svena-guest at users.alioth.debian.org
Wed Apr 23 20:43:17 UTC 2008 

Author: svena-guest
Date: Wed Apr 23 20:43:17 2008
New Revision: 15757

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=15757
Log:
* Disable building of gnome-cd and cddb-slave. These are soon to be
  deprecated upstream, and we already ship better alternatives.
  - Updated description in control.in
  - Deleted icon and man pages
  - Removed the gnome-cd menu entry
  - Removed the pixmaps dir from gnome-media-common.install
  - Removed the gnome-media, idl and bonobo dirs 
    from libgnome-media0.install

Removed:
    desktop/unstable/gnome-media/debian/cddb-slave2-properties.1
    desktop/unstable/gnome-media/debian/gnome-cd.1
    desktop/unstable/gnome-media/debian/gnome-cd.xpm
Modified:
    desktop/unstable/gnome-media/debian/changelog
    desktop/unstable/gnome-media/debian/control
    desktop/unstable/gnome-media/debian/control.in
    desktop/unstable/gnome-media/debian/gnome-media-common.install
    desktop/unstable/gnome-media/debian/gnome-media.menu
    desktop/unstable/gnome-media/debian/libgnome-media0.install
    desktop/unstable/gnome-media/debian/rules

Modified: desktop/unstable/gnome-media/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-media/debian/changelog?rev=15757&op=diff
==============================================================================
--- desktop/unstable/gnome-media/debian/changelog (original)
+++ desktop/unstable/gnome-media/debian/changelog Wed Apr 23 20:43:17 2008
@@ -1,5 +1,6 @@
 gnome-media (2.22.0-2) UNRELEASED; urgency=low
 
+  [ Sam Morris ]
   * Add 02_restore-mixer-track-type.patch to restore the display of the type
     of each track in the volume control preferences. Taken from
     <http://bugzilla.gnome.org/28064>. 
@@ -8,6 +9,16 @@
     r3837. Fixes: <http://bugzilla.gnome.org/528252>.
   * Add 04_sort-tracks-by-type.patch. Taken from
     <http://bugzilla.gnome.org/528064>.
+
+  [ Sven Arvidsson ]
+  * Disable building of gnome-cd and cddb-slave. These are soon to be
+    deprecated upstream, and we already ship better alternatives.
+    - Updated description in control.in
+    - Deleted icon and man pages
+    - Removed the gnome-cd menu entry
+    - Removed the pixmaps dir from gnome-media-common.install
+    - Removed the gnome-media, idl and bonobo dirs 
+      from libgnome-media0.install
 
  -- Sam Morris <sam at robots.org.uk>  Tue, 15 Apr 2008 01:23:28 +0100
 

Modified: desktop/unstable/gnome-media/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-media/debian/control?rev=15757&op=diff
==============================================================================
--- desktop/unstable/gnome-media/debian/control (original)
+++ desktop/unstable/gnome-media/debian/control Wed Apr 23 20:43:17 2008
@@ -42,7 +42,6 @@
          gstreamer0.10-plugins-good
 Description: GNOME media utilities
  This package contains a few media utilities for the GNOME desktop:
-  * the GNOME CD player, with CDDB support;
   * the GNOME GStreamer-based audio mixer;
   * a volume level meter for ESD;
   * the GNOME Sound Recorder;
@@ -65,10 +64,9 @@
          ${misc:Depends}
 Replaces: gnome-media (<< 2.12.0-4)
 Description: runtime libraries for the GNOME media utilities
- This package contains two media-related libraries used by the GNOME
+ This package contains media-related libraries used by the GNOME
  suite:
   * libgnome-media-profiles, to handle media profiles;
-  * libcddb-slave2, to handle access to CDDB databases.
 
 Package: libgnome-media-dev
 Architecture: any
@@ -79,4 +77,3 @@
  This package contains static libraries and development headers for the
  GNOME media libraries:
   * libgnome-media-profiles, to handle media profiles;
-  * libcddb-slave2, to handle access to CDDB databases.

Modified: desktop/unstable/gnome-media/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-media/debian/control.in?rev=15757&op=diff
==============================================================================
--- desktop/unstable/gnome-media/debian/control.in (original)
+++ desktop/unstable/gnome-media/debian/control.in Wed Apr 23 20:43:17 2008
@@ -42,7 +42,6 @@
          gstreamer0.10-plugins-good
 Description: GNOME media utilities
  This package contains a few media utilities for the GNOME desktop:
-  * the GNOME CD player, with CDDB support;
   * the GNOME GStreamer-based audio mixer;
   * a volume level meter for ESD;
   * the GNOME Sound Recorder;
@@ -65,10 +64,9 @@
          ${misc:Depends}
 Replaces: gnome-media (<< 2.12.0-4)
 Description: runtime libraries for the GNOME media utilities
- This package contains two media-related libraries used by the GNOME
+ This package contains media-related libraries used by the GNOME
  suite:
   * libgnome-media-profiles, to handle media profiles;
-  * libcddb-slave2, to handle access to CDDB databases.
 
 Package: libgnome-media-dev
 Architecture: any
@@ -79,4 +77,3 @@
  This package contains static libraries and development headers for the
  GNOME media libraries:
   * libgnome-media-profiles, to handle media profiles;
-  * libcddb-slave2, to handle access to CDDB databases.

Modified: desktop/unstable/gnome-media/debian/gnome-media-common.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-media/debian/gnome-media-common.install?rev=15757&op=diff
==============================================================================
--- desktop/unstable/gnome-media/debian/gnome-media-common.install (original)
+++ desktop/unstable/gnome-media/debian/gnome-media-common.install Wed Apr 23 20:43:17 2008
@@ -6,4 +6,3 @@
 debian/tmp/usr/share/icons
 debian/tmp/usr/share/gnome/help
 debian/tmp/usr/share/gnome-sound-recorder
-debian/tmp/usr/share/pixmaps

Modified: desktop/unstable/gnome-media/debian/gnome-media.menu
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-media/debian/gnome-media.menu?rev=15757&op=diff
==============================================================================
--- desktop/unstable/gnome-media/debian/gnome-media.menu (original)
+++ desktop/unstable/gnome-media/debian/gnome-media.menu Wed Apr 23 20:43:17 2008
@@ -1,7 +1,5 @@
 ?package(gnome-media):needs="X11" section="Applications/Sound" \
   title="gmix (Gnome 2.0 Mixer)" icon="/usr/share/pixmaps/gnome-mixer.xpm" command="/usr/bin/gnome-volume-control"
-?package(gnome-media):needs="X11" section="Applications/Sound" \
-  title="gnome-cd (Gnome 2.0 CD Player)" icon="/usr/share/pixmaps/gnome-cd.xpm" command="/usr/bin/gnome-cd"
 ?package(gnome-media):needs="X11" section="Applications/Sound" \
   title="vumeter (Gnome 2.0 Volume Meter)" icon="/usr/share/pixmaps/gnome-vumeter.xpm" command="/usr/bin/vumeter"
 ?package(gnome-media):needs="X11" section="Applications/Sound" \

Modified: desktop/unstable/gnome-media/debian/libgnome-media0.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-media/debian/libgnome-media0.install?rev=15757&op=diff
==============================================================================
--- desktop/unstable/gnome-media/debian/libgnome-media0.install (original)
+++ desktop/unstable/gnome-media/debian/libgnome-media0.install Wed Apr 23 20:43:17 2008
@@ -1,5 +1,2 @@
-debian/tmp/usr/lib/gnome-media
-debian/tmp/usr/lib/bonobo
 debian/tmp/usr/lib/libglade/2.0/*.so
 debian/tmp/usr/lib/*.so.*
-debian/tmp/usr/share/idl

Modified: desktop/unstable/gnome-media/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-media/debian/rules?rev=15757&op=diff
==============================================================================
--- desktop/unstable/gnome-media/debian/rules (original)
+++ desktop/unstable/gnome-media/debian/rules Wed Apr 23 20:43:17 2008
@@ -8,5 +8,7 @@
 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 += --disable-cddbslave --disable-gnomecd
+
 LDFLAGS += -Wl,-z,defs -Wl,--as-needed

More information about the pkg-gnome-commits mailing list