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

[Yves-Alexis Perez]

Author: corsac-guest
Date: 2005-11-30 10:41:42 +0000 (Wed, 30 Nov 2005)
New Revision: 335

Modified:
   desktop/trunk/xfce4-mixer/debian/changelog
   desktop/trunk/xfce4-mixer/debian/control
   desktop/trunk/xfce4-mixer/debian/copyright
   desktop/trunk/xfce4-mixer/debian/rules
Log:
xfce4-mixer becomes modular (alsa/oss)



Modified: desktop/trunk/xfce4-mixer/debian/changelog
===================================================================
--- desktop/trunk/xfce4-mixer/debian/changelog	2005-11-29 11:35:07 UTC (rev 334)
+++ desktop/trunk/xfce4-mixer/debian/changelog	2005-11-30 10:41:42 UTC (rev 335)
@@ -1,3 +1,9 @@
+xfce4-mixer (4.2.3-2) unstable; urgency=low
+
+  * Build the libs for alsa and oss in two packages
+
+ -- Yves-Alexis Perez <corsac at corsac.net>  Wed, 30 Nov 2005 11:40:32 +0100
+
 xfce4-mixer (4.2.3-1) unstable; urgency=low
 
   * New Upstream Release

Modified: desktop/trunk/xfce4-mixer/debian/control
===================================================================
--- desktop/trunk/xfce4-mixer/debian/control	2005-11-29 11:35:07 UTC (rev 334)
+++ desktop/trunk/xfce4-mixer/debian/control	2005-11-30 10:41:42 UTC (rev 335)
@@ -8,7 +8,7 @@
 
 Package: xfce4-mixer
 Architecture: any
-Depends: ${shlibs:Depends}, xfce4-panel (>= 4.2.3-1), procps
+Depends: ${shlibs:Depends}, xfce4-panel (>= 4.2.3-1), xfce4-mixer-oss (= ${Source-Version}) | xfce4-mixer-alsa (= ${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
@@ -16,3 +16,28 @@
  desktop as a plugin for the Xfce4 main panel.
  .
  Homepage: http://www.xfce.org/
+
+Package: xfce4-mixer-alsa
+Architecture: any
+Depends: ${shlibs:Depends}
+Replaces: xfce4-mixer-oss
+Conflicts: xfce4-mixer-oss
+Recommends: xfce4-mixer
+Suggests: alsa-utils
+Description: Xfce4 Mixer ALSA backend
+ This is the ALSA backend for xfce4-mixer.
+ .
+ Homepage: http://www.xfce.org/
+
+
+Package: xfce4-mixer-oss
+Architecture: any
+Depends: ${shlibs:Depends}
+Replaces: xfce4-mixer-alsa
+Conflicts: xfce4-mixer-alsa
+Recommends: xfce4-mixer
+Suggests: alsa-utils
+Description: Xfce4 Mixer OSS backend
+ This is the OSS backend for xfce4-mixer.
+ .
+ Homepage: http://www.xfce.org/

Modified: desktop/trunk/xfce4-mixer/debian/copyright
===================================================================
--- desktop/trunk/xfce4-mixer/debian/copyright	2005-11-29 11:35:07 UTC (rev 334)
+++ desktop/trunk/xfce4-mixer/debian/copyright	2005-11-30 10:41:42 UTC (rev 335)
@@ -8,6 +8,9 @@
 
 		Danny Milosavljevic <danny_milo at yahoo.com>
 		Benedikt Meurer <Benedikt.Meurer at unix-ag.uni-siegen.de>
+	
+Code for building alsa/oss packages is inspired by os-works debian packages
+(http://www.os-works.com) by Benedikt Meurer.
 		
 Copyright:
 

Modified: desktop/trunk/xfce4-mixer/debian/rules
===================================================================
--- desktop/trunk/xfce4-mixer/debian/rules	2005-11-29 11:35:07 UTC (rev 334)
+++ desktop/trunk/xfce4-mixer/debian/rules	2005-11-30 10:41:42 UTC (rev 335)
@@ -14,13 +14,29 @@
 config.status: configure
 	
 	dh_testdir
-	./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --enable-final
 
+	#configure the two variants:
+	for variant in alsa oss; do\
+	mkdir $(CURDIR)/debian/build-$$variant && \
+	cd $(CURDIR)/debian/build-$$variant && \
+	$(CURDIR)/configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --enable-final --with-sound=$$variant;\
+	done
+
+	touch config.status
+	
 build: build-stamp
 build-stamp: config.status
 	
 	dh_testdir
-	$(MAKE)
+	
+	#build the two variants:
+	for variant in alsa oss;do\
+	cd $(CURDIR)/debian/build-$$variant/lib && $(MAKE);\
+	done
+
+	#make the mixer from alsa variant
+	cd $(CURDIR)/debian/build-alsa && $(MAKE)
+	
 	touch build-stamp
 
 clean:
@@ -28,6 +44,10 @@
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp 
+	
+	for variant in alsa oss;do\
+	rm -rf $(CURDIR)/debian/build-$$variant;\
+	done
 
 	-$(MAKE) distclean
 
@@ -47,22 +67,32 @@
 	dh_clean -k
 	dh_installdirs
 
-	$(MAKE) install DESTDIR=`pwd`/debian/xfce4-mixer
+	#install the two variants:
+	for variant in alsa oss;do\
+	cd $(CURDIR)/debian/build-$$variant/lib &&\
+	$(MAKE) install DESTDIR=$(CURDIR)/debian/xfce4-mixer-$$variant;\
+	done
 
+	#install common mixer from alsa variant
+	cd $(CURDIR)/debian/build-alsa &&\
+	$(MAKE) install DESTDIR=$(CURDIR)/debian/xfce4-mixer
+	#and remove libs presents in alsa/oss variants:
+	rm -f $(CURDIR)/debian/xfce4-mixer/usr/lib/xfce4/modules/libxfce4mixer.*
+
 	# install menu pixmap
 	install -d $(CURDIR)/debian/xfce4-mixer/usr/share/pixmaps
 	install -c -m 644 $(CURDIR)/debian/xfce4-mixer.xpm \
 		$(CURDIR)/debian/xfce4-mixer/usr/share/pixmaps
 
 
-	rm -f `pwd`/debian/xfce4-mixer/usr/lib/xfce4/mcs-plugins/*.la
-	rm -f `pwd`/debian/xfce4-mixer/usr/lib/xfce4/mcs-plugins/*.a
-	rm -f `pwd`/debian/xfce4-mixer/usr/lib/xfce4/panel-plugins/*.la
-	rm -f `pwd`/debian/xfce4-mixer/usr/lib/xfce4/panel-plugins/*.a
+	rm -f $(CURDIR)/debian/xfce4-mixer/usr/lib/xfce4/mcs-plugins/*.la
+	rm -f $(CURDIR)/debian/xfce4-mixer/usr/lib/xfce4/mcs-plugins/*.a
+	rm -f $(CURDIR)/debian/xfce4-mixer/usr/lib/xfce4/panel-plugins/*.la
+	rm -f $(CURDIR)/debian/xfce4-mixer/usr/lib/xfce4/panel-plugins/*.a
 
-	install -d `pwd`/debian/xfce4-mixer/usr/share/lintian/overrides
+	install -d $(CURDIR)/debian/xfce4-mixer/usr/share/lintian/overrides
 	install -c -m 644 $(CURDIR)/debian/lintian-override \
-		`pwd`/debian/xfce4-mixer/usr/share/lintian/overrides/xfce4-mixer
+		$(CURDIR)/debian/xfce4-mixer/usr/share/lintian/overrides/xfce4-mixer
 
 binary-indep: build install
 binary-arch: build install
@@ -80,7 +110,7 @@
 	dh_fixperms
 	dh_installdeb
 	
-	dh_shlibdeps -l`pwd`/debian/xfce4-mixer/usr/lib/xfce4/modules/
+	dh_shlibdeps -l$(CURDIR)/debian/xfce4-mixer/usr/lib/xfce4/modules/
 	dh_gencontrol
 	
 	dh_md5sums