[Pkg-xfce-commits] r418 - desktop/trunk/xfce4-mixer/debian

[Emanuele Rocca]

Author: ema
Date: 2006-01-03 14:18:01 +0000 (Tue, 03 Jan 2006)
New Revision: 418

Added:
   desktop/trunk/xfce4-mixer/debian/NEWS.Debian
Modified:
   desktop/trunk/xfce4-mixer/debian/changelog
   desktop/trunk/xfce4-mixer/debian/control
   desktop/trunk/xfce4-mixer/debian/rules
Log:
debian/control:
	+ removing/adding whitespaces where needed
	+ removing Conflicts/Replaces with -mixer in -mixer itself
	+ avoid recommending -mixer in -alsa and -oss, they already depend on -mixer
	
debian/changelog:
	+ added info about NEWS.Debian and the debian/control cleanup
	+ date updated :)

debian/rules:
	+ added NEWS.Debian to dh_installdocs

debian/NEWS.Debian:
	+ file added to explain the recent changes



Added: desktop/trunk/xfce4-mixer/debian/NEWS.Debian
===================================================================
--- desktop/trunk/xfce4-mixer/debian/NEWS.Debian	2006-01-03 09:22:40 UTC (rev 417)
+++ desktop/trunk/xfce4-mixer/debian/NEWS.Debian	2006-01-03 14:18:01 UTC (rev 418)
@@ -0,0 +1,11 @@
+xfce4-mixer (4.2.3-2) unstable; urgency=low
+
+  * Starting from this version, xfce4-mixer supplies the two following 
+    additional binary packages:
+    - xfce4-mixer-alsa
+    - xfce4-mixer-oss
+    
+    The default is to go with -alsa. If you use oss, install xfce4-mixer-oss 
+    instead.
+
+  -- Emanuele Rocca <ema at debian.org>  Tue, 03 Jan 2006 14:39:00 +0100

Modified: desktop/trunk/xfce4-mixer/debian/changelog
===================================================================
--- desktop/trunk/xfce4-mixer/debian/changelog	2006-01-03 09:22:40 UTC (rev 417)
+++ desktop/trunk/xfce4-mixer/debian/changelog	2006-01-03 14:18:01 UTC (rev 418)
@@ -1,9 +1,13 @@
-xfce4-mixer (4.2.3-2) UNRELEASED; urgency=low
+xfce4-mixer (4.2.3-2) unstable; urgency=low
 
-  * Build the libs for alsa and oss in two packages             closes: #316518
-  * Added a Build-Depend on libasound2
+  * Yves-Alexis Perez: 
+    - Build the libs for alsa and oss in two different packages  closes: #316518
+    - Added a Build-Depend on libasound2
+  * Emanuele Rocca:
+    - Added NEWS.Debian in order to explain the recent split in -alsa and -oss
+    - debian/control minor fixes
 
- -- Yves-Alexis Perez <corsac at corsac.net>  Wed, 30 Nov 2005 11:40:32 +0100
+ -- Yves-Alexis Perez <corsac at corsac.net>  Tue, 03 Jan 2006 14:39:00 +0100
 
 xfce4-mixer (4.2.3-1) unstable; urgency=low
 

Modified: desktop/trunk/xfce4-mixer/debian/control
===================================================================
--- desktop/trunk/xfce4-mixer/debian/control	2006-01-03 09:22:40 UTC (rev 417)
+++ desktop/trunk/xfce4-mixer/debian/control	2006-01-03 14:18:01 UTC (rev 418)
@@ -3,14 +3,12 @@
 Priority: optional
 Maintainer: Debian Xfce Maintainers <pkg-xfce-devel at lists.alioth.debian.org>
 Uploaders: Martin Loschwitz <madkiss at debian.org>, Emanuele Rocca <ema at debian.org>, Simon Huggins <huggie at earth.li>, Yves-Alexis Perez <corsac at corsac.net>
-Build-Depends: debhelper (>= 4.2.1-1), libgtk2.0-dev,  libxft-dev, xfce4-panel-dev (>= 4.2.3-1), libasound2-dev (>= 0.9.0)
+Build-Depends: debhelper (>= 4.2.1-1), libgtk2.0-dev, libxft-dev, xfce4-panel-dev (>= 4.2.3-1), libasound2-dev (>= 0.9.0)
 Standards-Version: 3.6.2
 
 Package: xfce4-mixer
 Architecture: any
-Depends: ${shlibs:Depends}, xfce4-panel (>= 4.2.3-1), xfce4-mixer-oss (= ${Source-Version}) | xfce4-mixer-alsa (= ${Source-Version}),procps
-Conflicts: xfce4-mixer (<= 4.2.3-1)
-Replaces: xfce4-mixer (<= 4.2.3-1)
+Depends: ${shlibs:Depends}, xfce4-panel (>= 4.2.3-1), xfce4-mixer-alsa (= ${Source-Version}) | xfce4-mixer-oss (= ${Source-Version}), procps
 Description: Xfce4 Mixer frontend
  This is the frontend for mixer settings delivered together
  with the Xfce4 desktop environment. It does the same jobs
@@ -24,7 +22,6 @@
 Depends: ${shlibs:Depends}, xfce4-mixer (= ${Source-Version})
 Replaces: xfce4-mixer-oss
 Conflicts: xfce4-mixer-oss, xfce4-mixer (<= 4.2.3-1)
-Recommends: xfce4-mixer
 Suggests: alsa-utils
 Description: Xfce4 Mixer ALSA backend
  This is the ALSA backend for xfce4-mixer.
@@ -37,7 +34,6 @@
 Depends: ${shlibs:Depends}, xfce4-mixer (= ${Source-Version})
 Replaces: xfce4-mixer-alsa
 Conflicts: xfce4-mixer-alsa, xfce4-mixer (<= 4.2.3-1)
-Recommends: xfce4-mixer
 Suggests: alsa-utils
 Description: Xfce4 Mixer OSS backend
  This is the OSS backend for xfce4-mixer.

Modified: desktop/trunk/xfce4-mixer/debian/rules
===================================================================
--- desktop/trunk/xfce4-mixer/debian/rules	2006-01-03 09:22:40 UTC (rev 417)
+++ desktop/trunk/xfce4-mixer/debian/rules	2006-01-03 14:18:01 UTC (rev 418)
@@ -101,7 +101,7 @@
 	dh_testroot
 	
 	dh_installchangelogs ChangeLog
-	dh_installdocs README 
+	dh_installdocs README debian/NEWS.Debian
 	dh_installman debian/xfce4-mixer.1
 	
 	dh_strip