--- pavucontrol-0.9.7.orig/debian/rules +++ pavucontrol-0.9.7/debian/rules @@ -0,0 +1,24 @@ +#!/usr/bin/make -f + +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 + +common-build-arch:: $(CURDIR)/debian/pavucontrol.1.txt + a2x -d manpage -f manpage $(CURDIR)/debian/pavucontrol.1.txt + +clean:: + rm -f $(CURDIR)/debian/pavucontrol.1.xml + rm -f $(CURDIR)/debian/pavucontrol.1 + +update-patch-series: + mkdir -p $(CURDIR)/debian/patches + rm -f $(CURDIR)/debian/patches/*.patch + git-format-patch -o $(CURDIR)/debian/patches patches ^upstream | \ + xargs -n 1 basename > $(CURDIR)/debian/patches/series + for patch in $$(ls $(CURDIR)/debian/patches/*.patch) ; \ + do \ + lines=$$(cat $$patch | wc -l) ; \ + head -n $$(($$lines - 3)) $$patch > $${patch}.chomped ; \ + mv $${patch}.chomped $$patch ; \ + done --- pavucontrol-0.9.7.orig/debian/changelog +++ pavucontrol-0.9.7/debian/changelog @@ -0,0 +1,98 @@ +pavucontrol (0.9.7-1ubuntu2) jaunty; urgency=low + + * 0002-Handle-noninitialised-data.patch: Backport from upstream + 01e4826b653065268e7a4b8d57e528836e167a23, makes pavucontrol + more robust against LP: #286273. + + -- Daniel T Chen Thu, 02 Apr 2009 00:21:20 -0400 + +pavucontrol (0.9.7-1ubuntu1) jaunty; urgency=low + + * Merge from Debian unstable: + - Recommend padevchooser, paman, and pavumeter. + + -- Luke Yelavich Wed, 26 Nov 2008 10:09:00 +1100 + +pavucontrol (0.9.7-1) UNRELEASED; urgency=low + + * New Upstream Version + * debian/control: Add Build-Depend on libpulse-dev (>= 0.9.12) and + libcanberra-gtk-dev + + -- Sjoerd Simons Sun, 19 Oct 2008 20:08:47 +0100 + +pavucontrol (0.9.6+svn20080426-1ubuntu1) intrepid; urgency=low + + * Merge from Debian unstable. + * Patches + + Rediff 0050-MenusRevisited. + * Packaging + + Recommend padevchooser, paman, and pavumeter; + + Adhere to DebianMaintainerField. + + -- Daniel T Chen Fri, 02 May 2008 22:40:59 -0400 + +pavucontrol (0.9.6+svn20080426-1) unstable; urgency=low + + * New upstream svn snapshot + * debian/patches/0001-Define-missing-flags.patch + - Added. Define some flags that are not in the current version of + pulseaudio + * debian/copyright: Updated + + -- Sjoerd Simons Sat, 26 Apr 2008 01:08:43 +0200 + +pavucontrol (0.9.6-1) unstable; urgency=low + + * New Upstream Version + * debian/control: Bump Build-Depends on libpulse-dev to >= 0.9.7. This + syncs up the debian build dependencies with the checks in configure.ac. + + -- CJ van den Berg Sat, 29 Mar 2008 00:26:08 +0100 + +pavucontrol (0.9.5-1ubuntu1) hardy; urgency=low + + * Packaging: + - Recommend padevchooser, paman, and pavumeter, + - maintainer field mangling. + * Patches: + - Apply (new) patch to mask the menu item ala MenusRevisited. + + -- Daniel T Chen Sun, 13 Jan 2008 12:23:24 -0500 + +pavucontrol (0.9.5-1) unstable; urgency=low + + * New Upstream Version. (Closes: #448329) + * debian/copyright: Remove LGPL. paprefs is now fully GPL. + * debian/control: + + Add Vcs-* fields. + + Add Homepage field. + + Add quilt patch system. + * debian/patches: + + Add 0001-Correct-invalid-category-entry-in-desktop-file.patch + * debian/menu: Move to Applications section now that Apps is obsolete. + + -- CJ van den Berg Wed, 21 Nov 2007 17:39:16 +0100 + +pavucontrol (0.9.4-2) unstable; urgency=low + + [ Loic Minier ] + * Fix typo in copyright. + + [ 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 Tue, 29 May 2007 10:00:36 +0200 + +pavucontrol (0.9.4-1) unstable; urgency=low + + [ CJ van den Berg ] + * Initial release + + [ Loic Minier ] + * Clarify which files are under which license. + + -- Loic Minier Sat, 21 Oct 2006 09:51:48 +0200 + --- pavucontrol-0.9.7.orig/debian/menu +++ pavucontrol-0.9.7/debian/menu @@ -0,0 +1,2 @@ +?package(pavucontrol):needs="X11" section="Applications/Sound"\ + title="pavucontrol" command="/usr/bin/pavucontrol" --- pavucontrol-0.9.7.orig/debian/control +++ pavucontrol-0.9.7/debian/control @@ -0,0 +1,29 @@ +Source: pavucontrol +Section: sound +Priority: optional +XSBC-Original-Maintainer: CJ van den Berg +Uploaders: Sjoerd Simons +Maintainer: Ubuntu MOTU Developers +Build-Depends: debhelper (>= 5), cdbs, autotools-dev, libpulse-dev (>= 0.9.12), + libgtkmm-2.4-dev, libglademm-2.4-dev, lynx, asciidoc, xmlto, quilt, + libcanberra-gtk-dev +Standards-Version: 3.7.2 +Vcs-Git: git://git.debian.org/git/pkg-pulseaudio/pavucontrol.git +Vcs-Browser: http://git.debian.org/?p=pkg-pulseaudio/pavucontrol.git +Homepage: http://0pointer.de/lennart/projects/pavucontrol/ + +Package: pavucontrol +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Recommends: padevchooser, paman, pavumeter +Description: PulseAudio Volume Control + PulseAudio, previously known as Polypaudio, is a sound server for POSIX and + WIN32 systems. It is a drop in replacement for the ESD sound server with + much better latency, mixing/re-sampling quality and overall architecture. + . + PulseAudio Volume Control (pavucontrol) is a simple GTK+ based volume + control tool (mixer) for the PulseAudio sound server. In contrast to + classic mixer tools this one allows you to control both the volume of + hardware devices and of each playback stream separately. It also allows + you to redirect a playback stream to another output device without + interrupting playback. --- pavucontrol-0.9.7.orig/debian/compat +++ pavucontrol-0.9.7/debian/compat @@ -0,0 +1 @@ +5 --- pavucontrol-0.9.7.orig/debian/copyright +++ pavucontrol-0.9.7/debian/copyright @@ -0,0 +1,30 @@ +This package was debianized by CJ van den Berg on +Wed, 10 Aug 2006 22:16:26 +0200. + +It was downloaded from http://0pointer.de/lennart/projects/pavucontrol/ + +Upstream Author: Lennart Poettering + +Copyright: 2006-2008 Lennart Poettering + 2008 Sjoerd Simons + +License: + + This package is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this package; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, + USA. + +On Debian systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL'. + --- pavucontrol-0.9.7.orig/debian/pavucontrol.1.txt +++ pavucontrol-0.9.7/debian/pavucontrol.1.txt @@ -0,0 +1,56 @@ +pavucontrol(1) +============== + + +Name +---- +pavucontrol - A volume control for the PulseAudio sound server + + +Synopsis +-------- +'pavucontrol' + + +Description +----------- +A simple volume control tool (mixer) for the PulseAudio sound server. In +contrast to classic mixer tools this one allows you to control both the +volume of hardware devices and of each playback stream separately. It also +allows you to redirect a playback stream to another output device without +interrupting playback. + + +Options +------- +_pavucontrol_ does not accept any options. + + +See Also +-------- +pulseaudio(1), pavumeter(1), padevchooser(1) + + +Resources +--------- +Homepage: http://0pointer.de/lennart/projects/pavucontrol/[] + +PulseAudio web site: http://pulseaudio.org/[] + + +Author +------ +Written by Lennart Poettering + + +Documentation +------------- +Documentation by CJ van den Berg . + + +Copying +------- +Copyright \(C) 2006 Lennart Poettering. Free use of this software is granted +under the terms of the GNU General Public License (GPL). + + --- pavucontrol-0.9.7.orig/debian/watch +++ pavucontrol-0.9.7/debian/watch @@ -0,0 +1,8 @@ +# Control file for uscan +# Run the "uscan" command to check for upstream updates and more. +# See uscan(1) for format + +# Compulsory line, this is a version 3 file +version=3 + +http://0pointer.de/lennart/projects/pavucontrol/ pavucontrol-(.*)\.tar\.gz --- pavucontrol-0.9.7.orig/debian/pavucontrol.manpages +++ pavucontrol-0.9.7/debian/pavucontrol.manpages @@ -0,0 +1 @@ +debian/pavucontrol.1 --- pavucontrol-0.9.7.orig/debian/patches/0002-Handle-noninitialised-data.patch +++ pavucontrol-0.9.7/debian/patches/0002-Handle-noninitialised-data.patch @@ -0,0 +1,34 @@ +Index: pavucontrol-0.9.7/src/pavucontrol.cc +=================================================================== +--- pavucontrol-0.9.7.orig/src/pavucontrol.cc 2009-04-02 00:19:11.000000000 -0400 ++++ pavucontrol-0.9.7/src/pavucontrol.cc 2009-04-02 00:20:54.000000000 -0400 +@@ -940,7 +940,7 @@ + info.channel_map.channels = 1; + info.channel_map.map[0] = PA_CHANNEL_POSITION_MONO; + info.volume = volume; +- info.device = device.c_str(); ++ info.device = device == "" ? NULL : device.c_str(); + info.mute = muteToggleButton->get_active(); + + pa_operation* o; +@@ -952,7 +952,6 @@ + pa_operation_unref(o); + } + +- + /*** MainWindow ***/ + + MainWindow::MainWindow(BaseObjectType* cobject, const Glib::RefPtr& x) : +@@ -1428,10 +1427,10 @@ + + eventRoleWidget->updating = true; + +- eventRoleWidget->device = info.device; ++ eventRoleWidget->device = info.device ? info.device : ""; + + volume.channels = 1; +- volume.values[0] = pa_cvolume_avg(&info.volume); ++ volume.values[0] = pa_cvolume_max(&info.volume); + + eventRoleWidget->setVolume(volume); + eventRoleWidget->muteToggleButton->set_active(info.mute); --- pavucontrol-0.9.7.orig/debian/patches/series +++ pavucontrol-0.9.7/debian/patches/series @@ -0,0 +1,2 @@ +0001-Define-missing-flags.patch +0002-Handle-noninitialised-data.patch --- pavucontrol-0.9.7.orig/debian/patches/0001-Define-missing-flags.patch +++ pavucontrol-0.9.7/debian/patches/0001-Define-missing-flags.patch @@ -0,0 +1,25 @@ +From 81234c49c1b881b6b84cd5df935c0891afc27043 Mon Sep 17 00:00:00 2001 +From: Sjoerd Simons +Date: Sat, 26 Apr 2008 00:35:24 +0200 +Subject: [PATCH] Define missing flags + +--- + src/pavucontrol.cc | 5 +++++ + 1 files changed, 5 insertions(+), 0 deletions(-) + +diff --git a/src/pavucontrol.cc b/src/pavucontrol.cc +index df734f1..a7d9314 100644 +--- a/src/pavucontrol.cc ++++ b/src/pavucontrol.cc +@@ -38,6 +38,11 @@ + #define GLADE_FILE "pavucontrol.glade" + #endif + ++/* Only defined in the glitch-free branch */ ++#define PA_SINK_DECIBEL_VOLUME 32 ++#define PA_SOURCE_DECIBEL_VOLUME 32 ++ ++ + static pa_context *context = NULL; + static int n_outstanding = 0; + static bool show_decibel = true;