[Pkg-pulseaudio-devel] r142 - in /pavucontrol/trunk/debian: changelog control patches/00list patches/01_use_stock_g2.14_icons.dpatch rules

[neurocyte-guest at users.alioth.debian.org]

Author: neurocyte-guest
Date: Thu May 31 13:43:06 2007
New Revision: 142

URL: http://svn.debian.org/wsvn/pkg-pulseaudio/?sc=1&rev=142
Log:
Port to CDBS and drop obsolete icons patch

Removed:
    pavucontrol/trunk/debian/patches/00list
    pavucontrol/trunk/debian/patches/01_use_stock_g2.14_icons.dpatch
Modified:
    pavucontrol/trunk/debian/changelog
    pavucontrol/trunk/debian/control
    pavucontrol/trunk/debian/rules

Modified: pavucontrol/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-pulseaudio/pavucontrol/trunk/debian/changelog?rev=142&op=diff
==============================================================================
--- pavucontrol/trunk/debian/changelog (original)
+++ pavucontrol/trunk/debian/changelog Thu May 31 13:43:06 2007
@@ -1,8 +1,14 @@
 pavucontrol (0.9.4-2) UNRELEASED; urgency=low
 
+  [ Loic Minier ]
   * Fix typo in copyright.
 
- -- Loic Minier <lool at dooz.org>  Tue, 24 Oct 2006 21:00:22 +0200
+  [ CJ van den Berg ]
+  * debian/rules: Port to CDBS.
+  * debian/patches/01_use_stock_g2.14_icons.dpatch:
+    - Removed. No longer needed for Gnome 2.18.
+
+ -- CJ van den Berg <cj at vdbonline.com>  Tue, 29 May 2007 10:00:36 +0200
 
 pavucontrol (0.9.4-1) unstable; urgency=low
 

Modified: pavucontrol/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-pulseaudio/pavucontrol/trunk/debian/control?rev=142&op=diff
==============================================================================
--- pavucontrol/trunk/debian/control (original)
+++ pavucontrol/trunk/debian/control Thu May 31 13:43:06 2007
@@ -2,7 +2,7 @@
 Section: sound
 Priority: optional
 Maintainer: CJ van den Berg <cj at vdbonline.com>
-Build-Depends: debhelper (>= 5), dpatch, autotools-dev, libpulse-dev,
+Build-Depends: debhelper (>= 5), cdbs, autotools-dev, libpulse-dev,
     libgtkmm-2.4-dev, libglademm-2.4-dev, lynx
 Standards-Version: 3.7.2
 

Modified: pavucontrol/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-pulseaudio/pavucontrol/trunk/debian/rules?rev=142&op=diff
==============================================================================
--- pavucontrol/trunk/debian/rules (original)
+++ pavucontrol/trunk/debian/rules Thu May 31 13:43:06 2007
@@ -1,80 +1,4 @@
 #!/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)
-
-CFLAGS = -Wall -g
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2
-endif
-
-CONFIGURE_FLAGS = --prefix=/usr CFLAGS="$(CFLAGS)"
-
-ifeq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
-	CONFIGURE_FLAGS += --build=$(DEB_BUILD_GNU_TYPE)
-else
-	CONFIGURE_FLAGS += --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE)
-endif
-
-config.status: patch-stamp configure
-	dh_testdir
-	./configure $(CONFIGURE_FLAGS)
-
-build: build-stamp
-
-build-stamp:  config.status
-	dh_testdir
-	$(MAKE)
-	touch $@
-
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp 
-	-$(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 
-
-patch: patch-stamp
-patch-stamp:
-	dpatch apply-all
-	touch patch-stamp
-
-unpatch:
-	dpatch deapply-all
-	rm -rf patch-stamp debian/patched
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k 
-	dh_installdirs
-	$(MAKE) install DESTDIR=$(CURDIR)/debian/pavucontrol
-
-binary-indep: build install
-
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs 
-	dh_installdocs README
-	dh_installmenu
-	dh_strip
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install patch
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/autotools.mk