[Pkg-pulseaudio-devel] [SCM] paman packaging branch, master, updated. debian/0.9.3-2-11-g556110f
neurocyte-guest at users.alioth.debian.org
neurocyte-guest at users.alioth.debian.org
Tue Nov 13 09:54:31 UTC 2007
The branch, master has been updated
via 556110f98debebfcf1f69206edeceefa8ebfd659 (commit)
via e5f6d7776d7b60fee2a6f9145334659e916bf32e (commit)
via de265cdeb26b655aa2956b6daa579a740bb3fd4a (commit)
via 066d287806994ce66a3ddee506553da415c9d1b7 (commit)
from e3db6d127262a85165d77eec51f949fccf8dc2da (commit)
- Shortlog ------------------------------------------------------------
556110f Add 0001-Correct-invalid-category-entry-in-desktop-file.patch
e5f6d77 Move menu item to Applications section now that Apps is obsolete
de265cd Clean-up changelog
066d287 Add XS-Vcs-* tags
Summary of changes:
debian/changelog | 12 ++++++---
debian/control | 4 ++-
debian/menu | 2 +-
...ct-invalid-category-entry-in-desktop-file.patch | 24 ++++++++++++++++++++
debian/patches/series | 1 +
debian/rules | 13 ++++++++++
6 files changed, 50 insertions(+), 6 deletions(-)
-----------------------------------------------------------------------
Details of changes:
commit 556110f98debebfcf1f69206edeceefa8ebfd659
Author: CJ van den Berg <cj at vdbonline.com>
Date: Tue Nov 13 10:01:04 2007 +0100
Add 0001-Correct-invalid-category-entry-in-desktop-file.patch
diff --git a/debian/changelog b/debian/changelog
index aa04e9c..fd63706 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,8 +5,10 @@ paman (0.9.4-1) UNRELEASED; urgency=low
* debian/patches: Remove use_stock_gnome_icons patch. No longer required.
* debian/control: Add XS-Vcs-* tags.
* debian/menu: Move to Applications section now that Apps is obsolete.
+ * debian/patches:
+ + Add 0001-Correct-invalid-category-entry-in-desktop-file.patch
- -- CJ van den Berg <cj at vdbonline.com> Tue, 13 Nov 2007 09:56:46 +0100
+ -- CJ van den Berg <cj at vdbonline.com> Tue, 13 Nov 2007 10:05:54 +0100
paman (0.9.3-2) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 651599d..63fc125 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: paman
Section: sound
Priority: optional
Maintainer: CJ van den Berg <cj at vdbonline.com>
-Build-Depends: debhelper (>= 5), cdbs, autotools-dev, libpulse-dev,
+Build-Depends: debhelper (>= 5), cdbs, quilt, autotools-dev, libpulse-dev,
libgtkmm-2.4-dev, libglademm-2.4-dev, lynx, asciidoc, xmlto
Standards-Version: 3.7.2
XS-Vcs-Git: git://git.debian.org/git/pkg-pulseaudio/paman.git
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..48d30c9
--- /dev/null
+++ b/debian/patches/0001-Correct-invalid-category-entry-in-desktop-file.patch
@@ -0,0 +1,24 @@
+From ca5ca06cc7f3b14603b5c7998239db4b247dd30f Mon Sep 17 00:00:00 2001
+From: CJ van den Berg <cj at vdbonline.com>
+Date: Tue, 13 Nov 2007 10:04:30 +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/paman.desktop | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/paman.desktop b/src/paman.desktop
+index 8151a67..7978926 100644
+--- a/src/paman.desktop
++++ b/src/paman.desktop
+@@ -6,4 +6,4 @@ Exec=paman
+ Icon=audio-card
+ 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..0435add
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-Correct-invalid-category-entry-in-desktop-file.patch
diff --git a/debian/rules b/debian/rules
index 31a8d7b..8ce0337 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/paman.1.txt
a2x -d manpage -f manpage $(CURDIR)/debian/paman.1.txt
@@ -9,3 +10,15 @@ common-build-arch:: $(CURDIR)/debian/paman.1.txt
clean::
rm -f $(CURDIR)/debian/paman.1.xml
rm -f $(CURDIR)/debian/paman.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
commit e5f6d7776d7b60fee2a6f9145334659e916bf32e
Author: CJ van den Berg <cj at vdbonline.com>
Date: Tue Nov 13 09:58:07 2007 +0100
Move menu item to Applications section now that Apps is obsolete
diff --git a/debian/changelog b/debian/changelog
index c920acc..aa04e9c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,9 @@ paman (0.9.4-1) UNRELEASED; urgency=low
* debian/copyright: Remove LGPL license. paman is now fully GPL.
* debian/patches: Remove use_stock_gnome_icons patch. No longer required.
* debian/control: Add XS-Vcs-* tags.
+ * debian/menu: Move to Applications section now that Apps is obsolete.
- -- CJ van den Berg <cj at vdbonline.com> Tue, 13 Nov 2007 09:37:07 +0100
+ -- CJ van den Berg <cj at vdbonline.com> Tue, 13 Nov 2007 09:56:46 +0100
paman (0.9.3-2) unstable; urgency=low
diff --git a/debian/menu b/debian/menu
index 8ea76b0..43959e9 100644
--- a/debian/menu
+++ b/debian/menu
@@ -1,2 +1,2 @@
-?package(paman):needs="X11" section="Apps/Sound"\
+?package(paman):needs="X11" section="Applications/Sound"\
title="paman" command="/usr/bin/paman"
commit de265cdeb26b655aa2956b6daa579a740bb3fd4a
Author: CJ van den Berg <cj at vdbonline.com>
Date: Tue Nov 13 09:39:00 2007 +0100
Clean-up changelog
diff --git a/debian/changelog b/debian/changelog
index 087fe4a..c920acc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,11 @@
paman (0.9.4-1) UNRELEASED; urgency=low
* New upstream version.
- * Remove LGPL license. paman is now fully GPL.
- * Drop use_stock_gnome_icons patch. No longer required.
- * Add XS-Vcs-* tags.
+ * debian/copyright: Remove LGPL license. paman is now fully GPL.
+ * debian/patches: Remove use_stock_gnome_icons patch. No longer required.
+ * debian/control: Add XS-Vcs-* tags.
- -- CJ van den Berg <cj at vdbonline.com> Tue, 13 Nov 2007 09:36:21 +0100
+ -- CJ van den Berg <cj at vdbonline.com> Tue, 13 Nov 2007 09:37:07 +0100
paman (0.9.3-2) unstable; urgency=low
commit 066d287806994ce66a3ddee506553da415c9d1b7
Author: CJ van den Berg <cj at vdbonline.com>
Date: Tue Nov 13 09:37:02 2007 +0100
Add XS-Vcs-* tags
diff --git a/debian/changelog b/debian/changelog
index 4bc74b3..087fe4a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,9 @@ paman (0.9.4-1) UNRELEASED; urgency=low
* New upstream version.
* Remove LGPL license. paman is now fully GPL.
* Drop use_stock_gnome_icons patch. No longer required.
+ * Add XS-Vcs-* tags.
- -- CJ van den Berg <cj at vdbonline.com> Wed, 31 Oct 2007 00:51:44 +0100
+ -- CJ van den Berg <cj at vdbonline.com> Tue, 13 Nov 2007 09:36:21 +0100
paman (0.9.3-2) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 31738f2..651599d 100644
--- a/debian/control
+++ b/debian/control
@@ -5,6 +5,8 @@ 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
Standards-Version: 3.7.2
+XS-Vcs-Git: git://git.debian.org/git/pkg-pulseaudio/paman.git
+XS-Vcs-Browser: http://git.debian.org/?p=pkg-pulseaudio/paman.git
Package: paman
Architecture: any
--
paman packaging
More information about the Pkg-pulseaudio-devel
mailing list