[Pkg-pulseaudio-devel] r126 - in /paman/trunk/debian: changelog control patches/00list patches/01_use_stock_g2.14_icons.dpatch patches/series patches/use_stock_g2.14_icons.patch rules
neurocyte-guest at users.alioth.debian.org
neurocyte-guest at users.alioth.debian.org
Sat May 26 22:07:23 UTC 2007
Author: neurocyte-guest
Date: Sat May 26 22:07:22 2007
New Revision: 126
URL: http://svn.debian.org/wsvn/pkg-pulseaudio/?sc=1&rev=126
Log:
Port to CDBS and quilt
Added:
paman/trunk/debian/patches/series
paman/trunk/debian/patches/use_stock_g2.14_icons.patch
- copied, changed from r95, paman/trunk/debian/patches/01_use_stock_g2.14_icons.dpatch
Removed:
paman/trunk/debian/patches/00list
paman/trunk/debian/patches/01_use_stock_g2.14_icons.dpatch
Modified:
paman/trunk/debian/changelog
paman/trunk/debian/control
paman/trunk/debian/rules
Modified: paman/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-pulseaudio/paman/trunk/debian/changelog?rev=126&op=diff
==============================================================================
--- paman/trunk/debian/changelog (original)
+++ paman/trunk/debian/changelog Sat May 26 22:07:22 2007
@@ -1,8 +1,10 @@
paman (0.9.3-2) unstable; urgency=low
* debian/control: Fix typos in package description. (closes: #398617)
+ * debian/rules: Port to CDBS and quilt.
+ * debian/patches: Reformat patches for quilt.
- -- CJ van den Berg <cj at vdbonline.com> Tue, 21 Nov 2006 11:44:32 +0100
+ -- CJ van den Berg <cj at vdbonline.com> Sat, 26 May 2007 23:11:13 +0200
paman (0.9.3-1) unstable; urgency=low
Modified: paman/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-pulseaudio/paman/trunk/debian/control?rev=126&op=diff
==============================================================================
--- paman/trunk/debian/control (original)
+++ paman/trunk/debian/control Sat May 26 22:07:22 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, quilt, autotools-dev, libpulse-dev,
libgtkmm-2.4-dev, libglademm-2.4-dev, lynx
Standards-Version: 3.7.2
Added: paman/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-pulseaudio/paman/trunk/debian/patches/series?rev=126&op=file
==============================================================================
--- paman/trunk/debian/patches/series (added)
+++ paman/trunk/debian/patches/series Sat May 26 22:07:22 2007
@@ -1,0 +1,2 @@
+# This series applies on GIT commit 47b53c7a90d8db33dd17c967ed14fd043143c862
+use_stock_g2.14_icons.patch
Copied: paman/trunk/debian/patches/use_stock_g2.14_icons.patch (from r95, paman/trunk/debian/patches/01_use_stock_g2.14_icons.dpatch)
URL: http://svn.debian.org/wsvn/pkg-pulseaudio/paman/trunk/debian/patches/use_stock_g2.14_icons.patch?rev=126&op=diff
==============================================================================
--- paman/trunk/debian/patches/01_use_stock_g2.14_icons.dpatch (original)
+++ paman/trunk/debian/patches/use_stock_g2.14_icons.patch Sat May 26 22:07:22 2007
@@ -1,15 +1,19 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_use_stock_g2.14_icons.dpatch by CJ van den Berg <cj at vdbonline.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: use stock GNOME 2.14 icons (instead of GNOME 2.16)
-
- at DPATCH@
-
-diff -Nru paman-0.9.3-orig/src/paman.desktop paman-0.9.3/src/paman.desktop
---- paman-0.9.3-orig/src/paman.desktop 2006-06-21 01:35:19.000000000 +0200
-+++ paman-0.9.3/src/paman.desktop 2006-10-06 14:06:23.686750365 +0200
-@@ -3,7 +3,7 @@
+Use stock GNOME 2.14 icons (instead of Tango icons)
+
+From: CJ van den Berg <cj at vdbonline.com>
+
+
+---
+
+ src/paman.desktop | 2 +-
+ src/paman.glade | 46 +++++++++++++++++++++++-----------------------
+ 2 files changed, 24 insertions(+), 24 deletions(-)
+
+diff --git a/src/paman.desktop b/src/paman.desktop
+index 8151a67..ddafaf2 100644
+--- a/src/paman.desktop
++++ b/src/paman.desktop
+@@ -3,7 +3,7 @@ Encoding=UTF-8
Name=PulseAudio Manager
Comment=Manager your PulseAudio sound server.
Exec=paman
@@ -18,9 +22,10 @@
StartupNotify=true
Type=Application
Categories=Application;AudioVideo;Audio;
-diff -Nru paman-0.9.3-orig/src/paman.glade paman-0.9.3/src/paman.glade
---- paman-0.9.3-orig/src/paman.glade 2006-06-21 01:29:32.000000000 +0200
-+++ paman-0.9.3/src/paman.glade 2006-10-06 14:06:47.741942447 +0200
+diff --git a/src/paman.glade b/src/paman.glade
+index c299a17..f2122a7 100644
+--- a/src/paman.glade
++++ b/src/paman.glade
@@ -13,7 +13,7 @@
<property name="default_height">500</property>
<property name="resizable">True</property>
Modified: paman/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-pulseaudio/paman/trunk/debian/rules?rev=126&op=diff
==============================================================================
--- paman/trunk/debian/rules (original)
+++ paman/trunk/debian/rules Sat May 26 22:07:22 2007
@@ -1,80 +1,5 @@
#!/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/paman
-
-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
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
More information about the Pkg-pulseaudio-devel
mailing list