[Pkg-pulseaudio-devel] [SCM] pavumeter packaging branch, master, updated. debian/0.9.2-2-7-gf52441a
neurocyte-guest at users.alioth.debian.org
neurocyte-guest at users.alioth.debian.org
Wed Nov 28 23:01:57 UTC 2007
The branch, master has been updated
via f52441a54e1f6ffaf44dacdf34444082754582de (commit)
via b92c995f3caa3cf3d036939b3c2a671415680fb2 (commit)
via 67b92c820e55ba3fbd17c83201930808b73ab9ed (commit)
from ef4867e5c811f0fd95c1404a5f175296875bf059 (commit)
- Shortlog ------------------------------------------------------------
f52441a Move to Applications section now that Apps is obsolete
b92c995 Add patch to correct invalid category in desktop files
67b92c8 Add quilt patch system
Summary of changes:
debian/changelog | 3 ++
debian/control | 2 +-
debian/menu | 2 +-
...t-invalid-category-entry-in-desktop-files.patch | 35 ++++++++++++++++++++
debian/patches/series | 1 +
debian/rules | 13 +++++++
6 files changed, 54 insertions(+), 2 deletions(-)
-----------------------------------------------------------------------
Details of changes:
commit f52441a54e1f6ffaf44dacdf34444082754582de
Author: CJ van den Berg <cj at vdbonline.com>
Date: Wed Nov 28 23:55:48 2007 +0100
Move to Applications section now that Apps is obsolete
diff --git a/debian/changelog b/debian/changelog
index 2c01a65..3a166b1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ pavumeter (0.9.3-1) UNRELEASED; urgency=low
* New Upstream Version (Closes: #448329)
* debian/patches/0001-Correct-invalid-category-entry-in-desktop-files.patch:
+ Added, removes invalid Application category.
+ * debian/menu: Move to Applications section now that Apps is obsolete.
-- CJ van den Berg <cj at vdbonline.com> Wed, 21 Nov 2007 17:09:43 +0100
diff --git a/debian/menu b/debian/menu
index 9ae05b5..5337fe4 100644
--- a/debian/menu
+++ b/debian/menu
@@ -1,2 +1,2 @@
-?package(pavumeter):needs="X11" section="Apps/Sound"\
+?package(pavumeter):needs="X11" section="Applications/Sound"\
title="pavumeter" command="/usr/bin/pavumeter"
commit b92c995f3caa3cf3d036939b3c2a671415680fb2
Author: CJ van den Berg <cj at vdbonline.com>
Date: Wed Nov 28 23:54:19 2007 +0100
Add patch to correct invalid category in desktop files
diff --git a/debian/changelog b/debian/changelog
index 05cc555..2c01a65 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
pavumeter (0.9.3-1) UNRELEASED; urgency=low
* New Upstream Version (Closes: #448329)
+ * debian/patches/0001-Correct-invalid-category-entry-in-desktop-files.patch:
+ + Added, removes invalid Application category.
-- CJ van den Berg <cj at vdbonline.com> Wed, 21 Nov 2007 17:09:43 +0100
diff --git a/debian/patches/0001-Correct-invalid-category-entry-in-desktop-files.patch b/debian/patches/0001-Correct-invalid-category-entry-in-desktop-files.patch
new file mode 100644
index 0000000..931bfcd
--- /dev/null
+++ b/debian/patches/0001-Correct-invalid-category-entry-in-desktop-files.patch
@@ -0,0 +1,35 @@
+From e356fd3a0973a5d96c72d959593b2d987915a42c Mon Sep 17 00:00:00 2001
+From: CJ van den Berg <cj at vdbonline.com>
+Date: Wed, 28 Nov 2007 23:44:32 +0100
+Subject: [PATCH] Correct invalid category entry in desktop files
+
+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/pavumeter-record.desktop | 2 +-
+ src/pavumeter.desktop | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/pavumeter-record.desktop b/src/pavumeter-record.desktop
+index 6363349..633126a 100644
+--- a/src/pavumeter-record.desktop
++++ b/src/pavumeter-record.desktop
+@@ -7,4 +7,4 @@ Exec=pavumeter --record
+ Icon=audio-input-microphone
+ StartupNotify=true
+ Type=Application
+-Categories=Application;AudioVideo;Audio;
++Categories=AudioVideo;Audio;
+diff --git a/src/pavumeter.desktop b/src/pavumeter.desktop
+index c28d343..c63be3c 100644
+--- a/src/pavumeter.desktop
++++ b/src/pavumeter.desktop
+@@ -7,4 +7,4 @@ Exec=pavumeter
+ Icon=audio-input-microphone
+ StartupNotify=true
+ Type=Application
+-Categories=Application;AudioVideo;Audio;
++Categories=AudioVideo;Audio;
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..b5887f0
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-Correct-invalid-category-entry-in-desktop-files.patch
commit 67b92c820e55ba3fbd17c83201930808b73ab9ed
Author: CJ van den Berg <cj at vdbonline.com>
Date: Wed Nov 28 23:35:49 2007 +0100
Add quilt patch system
diff --git a/debian/control b/debian/control
index 29a5773..d3842eb 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, lynx, asciidoc, xmlto
+ libgtkmm-2.4-dev, lynx, asciidoc, xmlto, quilt
Standards-Version: 3.7.2
Package: pavumeter
diff --git a/debian/rules b/debian/rules
index 2f8e1e4..ab45eb2 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/pavumeter.1.txt
a2x -d manpage -f manpage $(CURDIR)/debian/pavumeter.1.txt
@@ -9,3 +10,15 @@ common-build-arch:: $(CURDIR)/debian/pavumeter.1.txt
clean::
rm -f $(CURDIR)/debian/pavumeter.1.xml
rm -f $(CURDIR)/debian/pavumeter.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
--
pavumeter packaging
More information about the Pkg-pulseaudio-devel
mailing list