[Pkg-pulseaudio-devel] [SCM] pavucontrol packaging branch, master, updated. debian/0.9.5-1-10-gd1cd349

[sjoerd at users.alioth.debian.org]

The branch, master has been updated
       via  d1cd349c0d636caf44a60206200dd72b09e46c4b (commit)
      from  a0c6475c316512d46e432fcf4336fc62256c7e7f (commit)


- Shortlog ------------------------------------------------------------
d1cd349 * debian/patches/0001-Define-missing-flags.patch

Summary of changes:
 debian/changelog                                   |    5 +++-
 ...ct-invalid-category-entry-in-desktop-file.patch |   25 --------------------
 debian/patches/0001-Define-missing-flags.patch     |   25 ++++++++++++++++++++
 debian/patches/series                              |    2 +-
 4 files changed, 30 insertions(+), 27 deletions(-)
-----------------------------------------------------------------------
Details of changes:

commit d1cd349c0d636caf44a60206200dd72b09e46c4b
Author: Sjoerd Simons <sjoerd at luon.net>
Date:   Sat Apr 26 00:37:33 2008 +0200

    * debian/patches/0001-Define-missing-flags.patch
      - Added. Define some flags that are not in the current version of
      pulseaudio

diff --git a/debian/changelog b/debian/changelog
index 7d73410..3aa8466 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,11 @@
 pavucontrol (0.9.6+svn20080426-1) UNRELEASED; 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
 
- -- Sjoerd Simons <sjoerd at debian.org>  Sat, 26 Apr 2008 00:21:52 +0200
+ -- Sjoerd Simons <sjoerd at debian.org>  Sat, 26 Apr 2008 00:36:05 +0200
 
 pavucontrol (0.9.6-1) unstable; urgency=low
 
diff --git a/debian/patches/0001-Correct-invalid-category-entry-in-desktop-file.patch b/debian/patches/0001-Correct-invalid-category-entry-in-desktop-file.patch
deleted file mode 100644
index 65b117f..0000000
--- a/debian/patches/0001-Correct-invalid-category-entry-in-desktop-file.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 6f2f58a2ab100b89d6208908c930fb41de61e2bc Mon Sep 17 00:00:00 2001
-From: CJ van den Berg <cj at vdbonline.com>
-Date: Thu, 29 Nov 2007 00:18:58 +0100
-Subject: [PATCH] Correct invalid category entry in desktop file
-
-This desktop entry lists a category that is not one of the registered
-Main or Additional Categories in the FreeDesktop specification.
-
-Refer to http://standards.freedesktop.org/menu-spec/1.0/apa.html for
-details.
----
- src/pavucontrol.desktop |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/src/pavucontrol.desktop b/src/pavucontrol.desktop
-index fecc007..1faea8c 100644
---- a/src/pavucontrol.desktop
-+++ b/src/pavucontrol.desktop
-@@ -8,5 +8,5 @@ Exec=pavucontrol
- Icon=multimedia-volume-control
- StartupNotify=true
- Type=Application
--Categories=Application;AudioVideo;Audio;
-+Categories=AudioVideo;Audio;
- GenericName[en_GB]=Volume Control
diff --git a/debian/patches/0001-Define-missing-flags.patch b/debian/patches/0001-Define-missing-flags.patch
new file mode 100644
index 0000000..d784145
--- /dev/null
+++ b/debian/patches/0001-Define-missing-flags.patch
@@ -0,0 +1,25 @@
+From 81234c49c1b881b6b84cd5df935c0891afc27043 Mon Sep 17 00:00:00 2001
+From: Sjoerd Simons <sjoerd at luon.net>
+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;
diff --git a/debian/patches/series b/debian/patches/series
index 0435add..2233bfa 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-0001-Correct-invalid-category-entry-in-desktop-file.patch
+0001-Define-missing-flags.patch

-- 
pavucontrol packaging