Bug#233363: Suggested solution
Magnus Therning
magnus at therning.org
Mon Feb 20 00:01:21 UTC 2006
Below is an attempt to a solution to this long-lived bug.
Index: gnome-media/gnome-media-2.12.0/debian/control
===================================================================
--- gnome-media.orig/gnome-media-2.12.0/debian/control 2006-02-19 22:18:05.000000000 +0000
+++ gnome-media/gnome-media-2.12.0/debian/control 2006-02-19 23:48:12.000000000 +0000
@@ -6,9 +6,31 @@
Standards-Version: 3.6.2
Build-Depends: libgnomevfs2-dev (>= 2.6.1.1-6), libgnomeui-dev, libgconf2-dev, libgail-dev, libgail-gnome-dev, libart-2.0-dev, libglib2.0-dev, libgnome2-dev, libesd0-dev (>= 0.2.23), libgtk2.0-dev (>= 2.4), debhelper (>= 4.2.27), scrollkeeper, libgstreamer0.8-dev, libgstreamer-gconf0.8-dev, libgnome-desktop-dev, libgstreamer-plugins0.8-dev, libxml-parser-perl, libnautilus-burn-dev (>= 2.12.2-2), cdbs, gnome-pkg-tools
+Package: gnome-media-common
+Architecture: all
+Depends: gnome-media
+Description: The GNOME Media Utilities - Common files
+ The GNOME Media Utilities include the following applications:
+ .
+ gnome-cd - GNOME CD player, with CDDB support
+ .
+ cddb-slave2-properties - Helper daemon for gnome-cd's CDDB support.
+ .
+ gnome-volume-control - GNOME GStreamer-based audio mixer.
+ .
+ vumeter - ESD volume level meter.
+ .
+ gnome-sound-recorder - GNOME Sound Recorder.
+ .
+ gstreamer-properties - GStreamer Properties Capplet.
+ .
+ gnome-audio-profiles-properties - Audio Profile editor.
+ .
+ This package contains the common files that the applications need.
+
Package: gnome-media
Architecture: any
-Depends: ${shlibs:Depends}, gstreamer0.8-misc, gstreamer0.8-alsa | gstreamer0.8-audiosink, gstreamer0.8-cdparanoia, ${misc:Depends}
+Depends: ${shlibs:Depends}, gnome-media-common, gstreamer0.8-misc, gstreamer0.8-alsa | gstreamer0.8-audiosink, gstreamer0.8-cdparanoia, ${misc:Depends}
Conflicts: gnome-media2
Description: The GNOME Media Utilities
The GNOME Media Utilities include the following applications:
@@ -26,3 +48,5 @@
gstreamer-properties - GStreamer Properties Capplet.
.
gnome-audio-profiles-properties - Audio Profile editor.
+ .
+ This package contains the applications.
Index: gnome-media/gnome-media-2.12.0/debian/changelog
===================================================================
--- gnome-media.orig/gnome-media-2.12.0/debian/changelog 2006-02-19 21:30:40.000000000 +0000
+++ gnome-media/gnome-media-2.12.0/debian/changelog 2006-02-19 22:33:49.000000000 +0000
@@ -1,3 +1,9 @@
+gnome-media (2.12.0-3mt) unstable; urgency=low
+
+ * Split architecture independent files into a common package.
+
+ -- Magnus Therning <magnus at therning.org> Sun, 19 Feb 2006 22:33:30 +0000
+
gnome-media (2.12.0-3) unstable; urgency=low
* Upload to unstable.
Index: gnome-media/gnome-media-2.12.0/debian/rules
===================================================================
--- gnome-media.orig/gnome-media-2.12.0/debian/rules 2006-02-19 21:30:40.000000000 +0000
+++ gnome-media/gnome-media-2.12.0/debian/rules 2006-02-19 23:30:30.000000000 +0000
@@ -7,9 +7,11 @@
include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
binary-install/gnome-media::
- install -o root -g root -m 644 debian/gnome-cd.xpm $(CURDIR)/debian/gnome-media/usr/share/pixmaps/gnome-cd.xpm
- install -o root -g root -m 644 debian/gnome-grecord.xpm $(CURDIR)/debian/gnome-media/usr/share/pixmaps/gnome-grecord.xpm
- install -o root -g root -m 644 debian/gnome-mixer.xpm $(CURDIR)/debian/gnome-media/usr/share/pixmaps/gnome-mixer.xpm
- install -o root -g root -m 644 debian/gnome-vumeter.xpm $(CURDIR)/debian/gnome-media/usr/share/pixmaps/gnome-vumeter.xpm
find debian/gnome-media -name *.a -exec rm -f {} \;
find debian/gnome-media -name *.la -exec rm -f {} \;
+
+binary-install/gnome-media-common::
+ install -o root -g root -m 644 -D debian/gnome-cd.xpm $(CURDIR)/debian/gnome-media-common/usr/share/pixmaps/gnome-cd.xpm
+ install -o root -g root -m 644 -D debian/gnome-grecord.xpm $(CURDIR)/debian/gnome-media-common/usr/share/pixmaps/gnome-grecord.xpm
+ install -o root -g root -m 644 -D debian/gnome-mixer.xpm $(CURDIR)/debian/gnome-media-common/usr/share/pixmaps/gnome-mixer.xpm
+ install -o root -g root -m 644 -D debian/gnome-vumeter.xpm $(CURDIR)/debian/gnome-media-common/usr/share/pixmaps/gnome-vumeter.xpm
Index: gnome-media/gnome-media-2.12.0/debian/gnome-media-common.manpages
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ gnome-media/gnome-media-2.12.0/debian/gnome-media-common.manpages 2006-02-19 22:53:57.000000000 +0000
@@ -0,0 +1 @@
+debian/*.1
Index: gnome-media/gnome-media-2.12.0/debian/gnome-media.manpages
===================================================================
--- gnome-media.orig/gnome-media-2.12.0/debian/gnome-media.manpages 2006-02-19 21:30:40.000000000 +0000
+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-debian/*.1
Index: gnome-media/gnome-media-2.12.0/debian/gnome-media-common.links
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ gnome-media/gnome-media-2.12.0/debian/gnome-media-common.links 2006-02-19 22:57:36.000000000 +0000
@@ -0,0 +1 @@
+/usr/share/man/man1/gnome-volume-control.1.gz /usr/share/man/man1/gnome-volume-control-alsa.1.gz
Index: gnome-media/gnome-media-2.12.0/debian/gnome-media.links
===================================================================
--- gnome-media.orig/gnome-media-2.12.0/debian/gnome-media.links 2006-02-19 21:30:40.000000000 +0000
+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-/usr/share/man/man1/gnome-volume-control.1.gz /usr/share/man/man1/gnome-volume-control-alsa.1.gz
Index: gnome-media/gnome-media-2.12.0/debian/gnome-media-common.menu
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ gnome-media/gnome-media-2.12.0/debian/gnome-media-common.menu 2006-02-19 22:58:30.000000000 +0000
@@ -0,0 +1,8 @@
+?package(gnome-media):needs="X11" section="Apps/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="Apps/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="Apps/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="Apps/Sound" \
+ title="grecord (GNOME 2.0 Recorder)" icon="/usr/share/pixmaps/gnome-grecord.xpm" command="/usr/bin/gnome-sound-recorder"
Index: gnome-media/gnome-media-2.12.0/debian/gnome-media.menu
===================================================================
--- gnome-media.orig/gnome-media-2.12.0/debian/gnome-media.menu 2006-02-19 21:30:40.000000000 +0000
+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,8 +0,0 @@
-?package(gnome-media):needs="X11" section="Apps/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="Apps/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="Apps/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="Apps/Sound" \
- title="grecord (GNOME 2.0 Recorder)" icon="/usr/share/pixmaps/gnome-grecord.xpm" command="/usr/bin/gnome-sound-recorder"
Index: gnome-media/gnome-media-2.12.0/debian/control.in
===================================================================
--- gnome-media.orig/gnome-media-2.12.0/debian/control.in 2006-02-19 21:30:40.000000000 +0000
+++ gnome-media/gnome-media-2.12.0/debian/control.in 2006-02-19 23:47:57.000000000 +0000
@@ -6,9 +6,31 @@
Standards-Version: 3.6.2
Build-Depends: libgnomevfs2-dev (>= 2.6.1.1-6), libgnomeui-dev, libgconf2-dev, libgail-dev, libgail-gnome-dev, libart-2.0-dev, libglib2.0-dev, libgnome2-dev, libesd0-dev (>= 0.2.23), libgtk2.0-dev (>= 2.4), debhelper (>= 4.2.27), scrollkeeper, libgstreamer0.8-dev, libgstreamer-gconf0.8-dev, libgnome-desktop-dev, libgstreamer-plugins0.8-dev, libxml-parser-perl, libnautilus-burn-dev (>= 2.12.2-2), cdbs, gnome-pkg-tools
+Package: gnome-media-common
+Architecture: all
+Depends: gnome-media
+Description: The GNOME Media Utilities - Common files
+ The GNOME Media Utilities include the following applications:
+ .
+ gnome-cd - GNOME CD player, with CDDB support
+ .
+ cddb-slave2-properties - Helper daemon for gnome-cd's CDDB support.
+ .
+ gnome-volume-control - GNOME GStreamer-based audio mixer.
+ .
+ vumeter - ESD volume level meter.
+ .
+ gnome-sound-recorder - GNOME Sound Recorder.
+ .
+ gstreamer-properties - GStreamer Properties Capplet.
+ .
+ gnome-audio-profiles-properties - Audio Profile editor.
+ .
+ This package contains the common files that the applications need.
+
Package: gnome-media
Architecture: any
-Depends: ${shlibs:Depends}, gstreamer0.8-misc, gstreamer0.8-alsa | gstreamer0.8-audiosink, gstreamer0.8-cdparanoia, ${misc:Depends}
+Depends: ${shlibs:Depends}, gnome-media-common, gstreamer0.8-misc, gstreamer0.8-alsa | gstreamer0.8-audiosink, gstreamer0.8-cdparanoia, ${misc:Depends}
Conflicts: gnome-media2
Description: The GNOME Media Utilities
The GNOME Media Utilities include the following applications:
@@ -26,3 +48,5 @@
gstreamer-properties - GStreamer Properties Capplet.
.
gnome-audio-profiles-properties - Audio Profile editor.
+ .
+ This package contains the applications.
Index: gnome-media/gnome-media-2.12.0/debian/gnome-media-common.postinst
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ gnome-media/gnome-media-2.12.0/debian/gnome-media-common.postinst 2006-02-19 23:04:08.000000000 +0000
@@ -0,0 +1,3 @@
+#!/bin/sh -e
+
+#DEBHELPER#
Index: gnome-media/gnome-media-2.12.0/debian/gnome-media-common.postrm
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ gnome-media/gnome-media-2.12.0/debian/gnome-media-common.postrm 2006-02-19 23:04:23.000000000 +0000
@@ -0,0 +1,3 @@
+#!/bin/sh -e
+
+#DEBHELPER#
Index: gnome-media/gnome-media-2.12.0/debian/gnome-media-common.install
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ gnome-media/gnome-media-2.12.0/debian/gnome-media-common.install 2006-02-19 23:28:33.000000000 +0000
@@ -0,0 +1 @@
+debian/tmp/usr/share usr
Index: gnome-media/gnome-media-2.12.0/debian/gnome-media.install
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ gnome-media/gnome-media-2.12.0/debian/gnome-media.install 2006-02-19 23:27:29.000000000 +0000
@@ -0,0 +1,2 @@
+debian/tmp/usr/bin usr
+debian/tmp/usr/lib usr
--
Magnus Therning (OpenPGP: 0xAB4DFBA4)
magnus at therning.org
http://therning.org/magnus
Software is not manufactured, it is something you write and publish.
Keep Europe free from software patents, we do not want censorship
by patent law on written works.
Do not meddle in the affairs of Wizards, for they are subtle and quick
to anger.
-- J.R.R Tolkien
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
Url : http://lists.alioth.debian.org/pipermail/pkg-gnome-maintainers/attachments/20060220/738237da/attachment-0001.pgp
More information about the Pkg-gnome-maintainers
mailing list