[Pkg-pulseaudio-devel] [SCM] pavucontrol packaging branch, master, updated. debian/0.9.4-2-10-g80c320a
neurocyte-guest at users.alioth.debian.org
neurocyte-guest at users.alioth.debian.org
Wed Nov 28 23:33:46 UTC 2007
The branch, master has been updated
via 80c320a8dc5d035ab1161bf6630f35e99cf5ca1e (commit)
via 37dece2ee19c4072162f49648fd67bfb6c924021 (commit)
via 7365a53b6d1be2d50e1fe7f722d23e6677dfe4f4 (commit)
from 64f6a4ac2f3d90c67e77e5ea02c5b97d803bade0 (commit)
- Shortlog ------------------------------------------------------------
80c320a Move menu to Applications section now that Apps is obsolete
37dece2 Add patch to correct category in desktop file
7365a53 Add quilt patch system
Summary of changes:
debian/changelog | 4 +++
debian/control | 2 +-
debian/menu | 2 +-
...ct-invalid-category-entry-in-desktop-file.patch | 25 ++++++++++++++++++++
debian/patches/series | 1 +
debian/rules | 13 ++++++++++
6 files changed, 45 insertions(+), 2 deletions(-)
-----------------------------------------------------------------------
Details of changes:
commit 80c320a8dc5d035ab1161bf6630f35e99cf5ca1e
Author: CJ van den Berg <cj at vdbonline.com>
Date: Thu Nov 29 00:24:06 2007 +0100
Move menu to Applications section now that Apps is obsolete
diff --git a/debian/changelog b/debian/changelog
index 700e59e..3164319 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ pavucontrol (0.9.5-1) UNRELEASED; urgency=low
+ 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 <cj at vdbonline.com> Wed, 21 Nov 2007 17:39:16 +0100
diff --git a/debian/menu b/debian/menu
index a54fe48..5f8ef18 100644
--- a/debian/menu
+++ b/debian/menu
@@ -1,2 +1,2 @@
-?package(pavucontrol):needs="X11" section="Apps/Sound"\
+?package(pavucontrol):needs="X11" section="Applications/Sound"\
title="pavucontrol" command="/usr/bin/pavucontrol"
commit 37dece2ee19c4072162f49648fd67bfb6c924021
Author: CJ van den Berg <cj at vdbonline.com>
Date: Thu Nov 29 00:21:26 2007 +0100
Add patch to correct category in desktop file
diff --git a/debian/changelog b/debian/changelog
index 5fee635..700e59e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ pavucontrol (0.9.5-1) UNRELEASED; urgency=low
+ Add Vcs-* fields.
+ Add Homepage field.
+ Add quilt patch system.
+ * debian/patches:
+ + Add 0001-Correct-invalid-category-entry-in-desktop-file.patch
-- CJ van den Berg <cj at vdbonline.com> Wed, 21 Nov 2007 17:39:16 +0100
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
new file mode 100644
index 0000000..65b117f
--- /dev/null
+++ b/debian/patches/0001-Correct-invalid-category-entry-in-desktop-file.patch
@@ -0,0 +1,25 @@
+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/series b/debian/patches/series
new file mode 100644
index 0000000..0435add
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-Correct-invalid-category-entry-in-desktop-file.patch
commit 7365a53b6d1be2d50e1fe7f722d23e6677dfe4f4
Author: CJ van den Berg <cj at vdbonline.com>
Date: Thu Nov 29 00:13:41 2007 +0100
Add quilt patch system
diff --git a/debian/changelog b/debian/changelog
index 8d2d538..5fee635 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ pavucontrol (0.9.5-1) UNRELEASED; urgency=low
* debian/control:
+ Add Vcs-* fields.
+ Add Homepage field.
+ + Add quilt patch system.
-- CJ van den Berg <cj at vdbonline.com> Wed, 21 Nov 2007 17:39:16 +0100
diff --git a/debian/control b/debian/control
index fac7bf5..f9a8221 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: sound
Priority: optional
Maintainer: CJ van den Berg <cj at vdbonline.com>
Build-Depends: debhelper (>= 5), cdbs, autotools-dev, libpulse-dev,
- libgtkmm-2.4-dev, libglademm-2.4-dev, lynx, asciidoc, xmlto
+ libgtkmm-2.4-dev, libglademm-2.4-dev, lynx, asciidoc, xmlto, quilt
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
diff --git a/debian/rules b/debian/rules
index 4d4ca3c..860535f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,6 +2,7 @@
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
@@ -9,3 +10,15 @@ common-build-arch:: $(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 packaging
More information about the Pkg-pulseaudio-devel
mailing list