[Pkg-xfce-commits] r2233 - in desktop/branches/svn-snapshots: . xfce4-mixer xfce4-mixer/debian

corsac at alioth.debian.org corsac at alioth.debian.org
Sat Aug 23 22:42:10 UTC 2008


Author: corsac
Date: 2008-08-23 22:42:09 +0000 (Sat, 23 Aug 2008)
New Revision: 2233

Added:
   desktop/branches/svn-snapshots/xfce4-mixer/
Removed:
   desktop/branches/svn-snapshots/xfce4-mixer/debian/xfce4-mixer-alsa.shlibs
   desktop/branches/svn-snapshots/xfce4-mixer/debian/xfce4-mixer-oss.shlibs
Modified:
   desktop/branches/svn-snapshots/xfce4-mixer/debian/changelog
   desktop/branches/svn-snapshots/xfce4-mixer/debian/compat
   desktop/branches/svn-snapshots/xfce4-mixer/debian/control
   desktop/branches/svn-snapshots/xfce4-mixer/debian/lintian-override
   desktop/branches/svn-snapshots/xfce4-mixer/debian/rules
Log:
new 4.6 alpha release

Copied: desktop/branches/svn-snapshots/xfce4-mixer (from rev 2217, desktop/trunk/xfce4-mixer)


Property changes on: desktop/branches/svn-snapshots/xfce4-mixer
___________________________________________________________________
Name: svn:mergeinfo
   + 

Modified: desktop/branches/svn-snapshots/xfce4-mixer/debian/changelog
===================================================================
--- desktop/trunk/xfce4-mixer/debian/changelog	2008-08-13 21:30:11 UTC (rev 2217)
+++ desktop/branches/svn-snapshots/xfce4-mixer/debian/changelog	2008-08-23 22:42:09 UTC (rev 2233)
@@ -1,3 +1,12 @@
+xfce4-mixer (4.5.80-1) UNRELEASED; urgency=low
+
+  * new upstream alpha release.
+    - drop the two packages -oss and -alsa.
+  * debian/rules:
+    - switch to dh7 now that we only have one binary package.
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Sat, 23 Aug 2008 22:04:19 +0200
+
 xfce4-mixer (4.4.2-3) unstable; urgency=low
 
   * switch to triggers:

Modified: desktop/branches/svn-snapshots/xfce4-mixer/debian/compat
===================================================================
--- desktop/trunk/xfce4-mixer/debian/compat	2008-08-13 21:30:11 UTC (rev 2217)
+++ desktop/branches/svn-snapshots/xfce4-mixer/debian/compat	2008-08-23 22:42:09 UTC (rev 2233)
@@ -1 +1 @@
-4
+7

Modified: desktop/branches/svn-snapshots/xfce4-mixer/debian/control
===================================================================
--- desktop/trunk/xfce4-mixer/debian/control	2008-08-13 21:30:11 UTC (rev 2217)
+++ desktop/branches/svn-snapshots/xfce4-mixer/debian/control	2008-08-23 22:42:09 UTC (rev 2233)
@@ -3,38 +3,15 @@
 Priority: optional
 Maintainer: Debian Xfce Maintainers <pkg-xfce-devel at lists.alioth.debian.org>
 Uploaders: Emanuele Rocca <ema at debian.org>, Simon Huggins <huggie at earth.li>, Yves-Alexis Perez <corsac at debian.org>
-Build-Depends: debhelper (>= 4.2.1), libgtk2.0-dev (>= 2.10.1), libxft-dev, xfce4-panel-dev (>= 4.4.2), libasound2-dev (>= 0.9.0) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libxml-parser-perl, chrpath, quilt, dpkg-dev (>= 1.14.4)
-Standards-Version: 3.7.3
+Build-Depends: debhelper (>= 7.0.13), pkg-config, libglib2.0-dev, libgstreamer-plugins-base0.10-dev, libgtk2.0-dev, libxfce4util-dev (>= 4.5.80), libxfcegui4-dev (>= 4.5.80), xfce4-panel-dev (>= 4.5.80)
+Standards-Version: 3.8.0
 Homepage: http://www.xfce.org/
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/xfce4-mixer/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/xfce4-mixer/
 
 Package: xfce4-mixer
 Architecture: any
-Depends: ${shlibs:Depends}, xfce4-mixer-alsa (= ${binary:Version}) | xfce4-mixer-oss (= ${binary:Version})
-Conflicts: xfce4-mcs-manager (<< 4.4.2-3)
-Description: Xfce4 Mixer frontend
- This is the frontend for mixer settings delivered together
- with the Xfce4 desktop environment. It does the same jobs
- other mixer frontends do but is integrated into the Xfce4
- desktop as a plugin for the Xfce4 main panel.
-
-Package: xfce4-mixer-alsa
-Architecture: linux-any
 Depends: ${shlibs:Depends}
-Recommends: xfce4-mixer (= ${binary:Version})
-Replaces: xfce4-mixer-oss
-Conflicts: xfce4-mixer-oss, xfce4-mixer (<= 4.2.3-1)
-Suggests: alsa-utils
-Description: Xfce4 Mixer ALSA backend
- This is the ALSA backend for xfce4-mixer.
-
-Package: xfce4-mixer-oss
-Architecture: any
-Depends: ${shlibs:Depends}
-Recommends: xfce4-mixer (= ${binary:Version})
-Replaces: xfce4-mixer-alsa
-Conflicts: xfce4-mixer-alsa, xfce4-mixer (<= 4.2.3-1)
-Suggests: alsa-utils
-Description: Xfce4 Mixer OSS backend
- This is the OSS backend for xfce4-mixer.
+Replaces: xfce4-mixer-alsa, xfce4-mixer-oss
+Description: Xfce mixer application
+  Xfce mixer application.

Modified: desktop/branches/svn-snapshots/xfce4-mixer/debian/lintian-override
===================================================================
--- desktop/trunk/xfce4-mixer/debian/lintian-override	2008-08-13 21:30:11 UTC (rev 2217)
+++ desktop/branches/svn-snapshots/xfce4-mixer/debian/lintian-override	2008-08-23 22:42:09 UTC (rev 2233)
@@ -3,6 +3,3 @@
 xfce4-mixer binary: binary-or-shlib-defines-rpath ./usr/lib/xfce4/mcs-plugins/sound_settings.so /usr/lib/xfce4/modules
 xfce4-mixer binary: binary-or-shlib-defines-rpath ./usr/bin/xfce4-mixer /usr/lib/xfce4/modules
 xfce4-mixer binary: binary-or-shlib-defines-rpath ./usr/lib/xfce4/panel-plugins/xfce4-mixer-plugin /usr/lib/xfce4/modules
-
-# xfce4-mixer is part of Xfce, but still is modular
-xfce4-mixer: desktop-command-not-in-package /usr/share/applications/xfce-mixer-settings.desktop xfce-setting-show

Modified: desktop/branches/svn-snapshots/xfce4-mixer/debian/rules
===================================================================
--- desktop/trunk/xfce4-mixer/debian/rules	2008-08-13 21:30:11 UTC (rev 2217)
+++ desktop/branches/svn-snapshots/xfce4-mixer/debian/rules	2008-08-23 22:42:09 UTC (rev 2233)
@@ -1,145 +1,3 @@
 #!/usr/bin/make -f
-
-DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-DEB_HOST_ARCH_OS    ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
-
-CFLAGS = -Wall -g
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2
-endif
-
-
-ifeq (linux,$(DEB_HOST_ARCH_OS))
-VARIANTS=oss alsa
-else
-VARIANTS=oss
-endif
-
-patch: patch-stamp
-patch-stamp:
-	dh_testdir
-	QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2
-	touch patch-stamp
-
-unpatch:
-	dh_testdir
-	QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2
-	rm -rf .pc patch-stamp
-
-config.status: configure patch-stamp
-	
-	dh_testdir
-
-	#configure the two variants:
-	for variant in $(VARIANTS); 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 --libexecdir=\$${prefix}/lib --with-sound=$$variant;\
-	done
-
-	touch config.status
-	
-build: build-stamp
-build-stamp: config.status
-	
-	dh_testdir
-	
-	#build the two variants:
-	for variant in $(VARIANTS);do \
-	cd $(CURDIR)/debian/build-$$variant/lib && $(MAKE);\
-	done
-
-	#make the mixer from oss variant
-	cd $(CURDIR)/debian/build-oss && $(MAKE)
-	
-	touch build-stamp
-
-clean: unpatch
-	
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp config.status
-	
-	for variant in $(VARIANTS);do \
-	rm -rf $(CURDIR)/debian/build-$$variant;\
-	done
-
-	[ ! -f Makefile ] || $(MAKE) distclean
-
-ifneq "$(wildcard /usr/share/misc/config.sub)" ""
-	cp -f /usr/share/misc/config.sub config.sub
-endif
-ifneq "$(wildcard /usr/share/misc/config.guess)" ""
-	cp -f /usr/share/misc/config.guess config.guess
-endif
-
-	dh_clean $(CURDIR)/patch-stamp
-
-install: build
-	
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	dh_installdirs
-
-	#install the two variants:
-	for variant in $(VARIANTS);do \
-	cd $(CURDIR)/debian/build-$$variant/lib && \
-	$(MAKE) install DESTDIR=$(CURDIR)/debian/xfce4-mixer-$$variant;\
-	done
-
-	#install common mixer from oss variant
-	cd $(CURDIR)/debian/build-oss &&\
-	$(MAKE) install DESTDIR=$(CURDIR)/debian/xfce4-mixer
-	#and remove libs presents in alsa/oss variants:
-	rm -rf $(CURDIR)/debian/xfce4-mixer/usr/lib/xfce4/modules/
-
-	# 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 $(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
-	rm -f $(CURDIR)/debian/xfce4-mixer*/usr/lib/xfce4/modules/*.la
-	rm -f $(CURDIR)/debian/xfce4-mixer*/usr/lib/xfce4/modules/*.a
-
-	install -d $(CURDIR)/debian/xfce4-mixer/usr/share/lintian/overrides
-	install -c -m 644 $(CURDIR)/debian/lintian-override \
-		$(CURDIR)/debian/xfce4-mixer/usr/share/lintian/overrides/xfce4-mixer
-	chrpath -d -k `pwd`/debian/xfce4-mixer*/usr/lib/xfce4/modules/*
-	chrpath -r '/usr/lib/xfce4/modules' \
-		`pwd`/debian/xfce4-mixer/usr/lib/xfce4/*/* \
-		`pwd`/debian/xfce4-mixer/usr/bin/*
-
-binary-indep: build install
-binary-arch: build install
-	
-	dh_testdir
-	dh_testroot
-	
-	dh_installchangelogs ChangeLog
-	dh_installdocs README debian/NEWS.Debian
-	dh_installman debian/xfce4-mixer.1
-	
-	dh_strip
-	dh_compress
-	
-	dh_fixperms
-	dh_installdeb
-	
-	dh_shlibdeps -l$(CURDIR)/debian/xfce4-mixer/usr/lib/xfce4/modules/
-	dh_gencontrol -s
-	
-	dh_md5sums -s
-	dh_builddeb -s
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install 
+%:
+	dh $@

Deleted: desktop/branches/svn-snapshots/xfce4-mixer/debian/xfce4-mixer-alsa.shlibs
===================================================================
--- desktop/trunk/xfce4-mixer/debian/xfce4-mixer-alsa.shlibs	2008-08-13 21:30:11 UTC (rev 2217)
+++ desktop/branches/svn-snapshots/xfce4-mixer/debian/xfce4-mixer-alsa.shlibs	2008-08-23 22:42:09 UTC (rev 2233)
@@ -1 +0,0 @@
-libxfce4mixer 0 xfce4-mixer

Deleted: desktop/branches/svn-snapshots/xfce4-mixer/debian/xfce4-mixer-oss.shlibs
===================================================================
--- desktop/trunk/xfce4-mixer/debian/xfce4-mixer-oss.shlibs	2008-08-13 21:30:11 UTC (rev 2217)
+++ desktop/branches/svn-snapshots/xfce4-mixer/debian/xfce4-mixer-oss.shlibs	2008-08-23 22:42:09 UTC (rev 2233)
@@ -1 +0,0 @@
-libxfce4mixer 0 xfce4-mixer




More information about the Pkg-xfce-commits mailing list