[paprefs] 01/02: Updated debian/control and debian/copyright, merged upstream patch
Martin-Éric Racine
q-funk-guest at moszumanska.debian.org
Fri May 15 13:34:18 UTC 2015
This is an automated email from the git hooks/post-receive script.
q-funk-guest pushed a commit to branch master
in repository paprefs.
commit de79b03adae677ef8a9e76e1a9c8a1d19668969a
Author: Martin-Éric Racine <martin-eric.racine at iki.fi>
Date: Fri May 15 16:24:23 2015 +0300
Updated debian/control and debian/copyright, merged upstream patch
---
debian/changelog | 14 ++
debian/control | 38 ++--
debian/copyright | 215 ++++++---------------
.../0003-doc-Drop-0pointer.de-references.patch | 52 +++++
debian/patches/series | 1 +
5 files changed, 152 insertions(+), 168 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 8190320..53463b2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+paprefs (0.9.10-2) unstable; urgency=medium
+
+ [ Martin-Éric Racine ]
+ * debian/control:
+ = Updated Vcs-Git and Vcs-Browser.
+ + Added Balint Reczey and Felipe Sateler to Uploaders.
+ - Removed myself from Uploaders.
+ * debian/copyright:
+ = Cleaned up our DEP-5 implementation as per Lintian instructions.
+ * Merged patch from upstream Git:
+ 0003-doc-Drop-0pointer.de-references.patch
+
+ -- Martin-Éric Racine <martin-eric.racine at iki.fi> Fri, 15 May 2015 16:22:41 +0300
+
paprefs (0.9.10-1) unstable; urgency=low
[ Martin-Éric Racine ]
diff --git a/debian/control b/debian/control
index d3097d4..fee4316 100644
--- a/debian/control
+++ b/debian/control
@@ -2,27 +2,33 @@ Source: paprefs
Section: sound
Priority: optional
Maintainer: Pulseaudio maintenance team <pkg-pulseaudio-devel at lists.alioth.debian.org>
-Uploaders: Sjoerd Simons <sjoerd at debian.org>,
- Martin-Éric Racine <martin-eric.racine at iki.fi>
-Build-Depends: debhelper (>= 9), autotools-dev, dh-autoreconf,
- libpulse-dev (>= 0.9.15),
- libgtkmm-2.4-dev,
- libglademm-2.4-dev,
- libgconfmm-2.6-dev,
- lynx,
- asciidoc,
- xmlto,
- intltool,
- libdbus-glib-1-dev
+Uploaders: Balint Reczey <rbalint at debian.org>,
+ Felipe Sateler <fsateler at debian.org>,
+ Sjoerd Simons <sjoerd at debian.org>
+Build-Depends: asciidoc,
+ autotools-dev,
+ debhelper (>= 9),
+ dh-autoreconf,
+ intltool,
+ libdbus-glib-1-dev,
+ libgconfmm-2.6-dev,
+ libglademm-2.4-dev,
+ libgtkmm-2.4-dev,
+ libpulse-dev (>= 0.9.15),
+ lynx,
+ xmlto
Standards-Version: 3.9.3
-Vcs-Git: git://git.debian.org/git/pkg-pulseaudio/paprefs.git
-Vcs-Browser: http://git.debian.org/?p=pkg-pulseaudio/paprefs.git
+Vcs-Git: git://anonscm.debian.org/pkg-pulseaudio/paprefs.git
+Vcs-Browser: https://alioth.debian.org/anonscm/git/pkg-pulseaudio/paprefs.git
Homepage: http://freedesktop.org/software/pulseaudio/paprefs/
Package: paprefs
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, pulseaudio-module-gconf,
- pulseaudio-module-zeroconf, gnome-icon-theme
+Depends: gnome-icon-theme,
+ pulseaudio-module-gconf,
+ pulseaudio-module-zeroconf,
+ ${misc:Depends},
+ ${shlibs:Depends}
Description: PulseAudio Preferences
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
diff --git a/debian/copyright b/debian/copyright
index 8d56ad0..cc0db9b 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,212 +1,123 @@
-This package was debianized by CJ van den Berg <cj at vdbonline.com> on
-Thu, 27 Aug 2006 20:14:44 +0200.
-
-It was downloaded from http://0pointer.de/lennart/projects/paprefs/
-
-Upstream Author: Lennart Poettering <mzcnihpbageby at 0pointer.de>
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Source: http://0pointer.de/lennart/projects/paprefs/
Files: *
-Copyright:
- Copyright (C) 2006-2008 Lennart Poettering
+Copyright: © 2006-2008 Lennart Poettering
License: GPL-2+
On Debian systems, the complete text of the GPL-2 can be found in
/usr/share/common-licenses/GPL-2
-File: po/as.po
-Copyright:
- Copyright (C) 2009 Amitakhya Phukan <aphukan at fedoraproject.org>
+Files: po/as.po
+Copyright: © 2009 Amitakhya Phukan <aphukan at fedoraproject.org>
License: GPL-2+
- On Debian systems, the complete text of the GPL-2 can be found in
- /usr/share/common-licenses/GPL-2
-File: po/ca.po
-Copyright:
- Copyright (C) 2008 Xavier Queralt Mateu <xqueralt at gmail.com>
+Files: po/ca.po
+Copyright: © 2008 Xavier Queralt Mateu <xqueralt at gmail.com>
License: GPL-2+
- On Debian systems, the complete text of the GPL-2 can be found in
- /usr/share/common-licenses/GPL-2
-File: po/cs.po
-Copyright:
- Copyright (C) 2008 Ondrej Šulek <feonsu at gmail.com>
- Copyright (C) 2008 Petr Kovar <pknbe at volny.cz>
+Files: po/cs.po
+Copyright: © 2008 Ondrej Šulek <feonsu at gmail.com>
+ © 2008 Petr Kovar <pknbe at volny.cz>
License: GPL-2+
- On Debian systems, the complete text of the GPL-2 can be found in
- /usr/share/common-licenses/GPL-2
-File: po/da.po
-Copyright:
- Copyright (C) 2009 Kris Thomsen <lakristho at gmail.com>
+Files: po/da.po
+Copyright: © 2009 Kris Thomsen <lakristho at gmail.com>
License: GPL-2+
- On Debian systems, the complete text of the GPL-2 can be found in
- /usr/share/common-licenses/GPL-2
-File: po/el.po
-Copyright:
- Copyright (C) 2008 Dimitris Glezos <dimitris at glezos.com>
+Files: po/el.po
+Copyright: © 2008 Dimitris Glezos <dimitris at glezos.com>
License: GPL-2+
- On Debian systems, the complete text of the GPL-2 can be found in
- /usr/share/common-licenses/GPL-2
-File: po/es.po
-Copyright:
- Copyright (C) 2009 Gladys Guerrero Lozano <gguerrer at redhat.com>
+Files: po/es.po
+Copyright: © 2009 Gladys Guerrero Lozano <gguerrer at redhat.com>
License: GPL-2+
- On Debian systems, the complete text of the GPL-2 can be found in
- /usr/share/common-licenses/GPL-2
-File: po/fi.po
-Copyright:
- Copyright (C) 2008 Timo Jyrinki <timo.jyrinki at iki.fi>
+Files: po/fi.po
+Copyright: © 2008 Timo Jyrinki <timo.jyrinki at iki.fi>
License: GPL-2+
- On Debian systems, the complete text of the GPL-2 can be found in
- /usr/share/common-licenses/GPL-2
-File: po/fr.po
-Copyright:
- Copyright (C) 2008 Robert-André Mauchin <zebob.m at pengzone.org>
+Files: po/fr.po
+Copyright: © 2008 Robert-André Mauchin <zebob.m at pengzone.org>
License: GPL-2+
- On Debian systems, the complete text of the GPL-2 can be found in
- /usr/share/common-licenses/GPL-2
-File: po/gu.po
-Copyright:
- Copyright (C) 2009 Sweta Kothari <swkothar at redhat.com>
+Files: po/gu.po
+Copyright: © 2009 Sweta Kothari <swkothar at redhat.com>
License: GPL-2+
- On Debian systems, the complete text of the GPL-2 can be found in
- /usr/share/common-licenses/GPL-2
-File: po/hu.po
-Copyright:
- Copyright (C) 2008 Gabor Kelemen <kelemeng at gnome.hu>
+Files: po/hu.po
+Copyright: © 2008 Gabor Kelemen <kelemeng at gnome.hu>
License: GPL-2+
- On Debian systems, the complete text of the GPL-2 can be found in
- /usr/share/common-licenses/GPL-2
-File: po/it.po
-Copyright:
- Copyright (C) 2009 Milo Casagrande <milo at ubuntu.com>
+Files: po/it.po
+Copyright: © 2009 Milo Casagrande <milo at ubuntu.com>
License: GPL-2+
- On Debian systems, the complete text of the GPL-2 can be found in
- /usr/share/common-licenses/GPL-2
-File: po/kn.po
-Copyright:
- Copyright (C) 2009 Shankar Prasad <svenkate at redhat.com>
+Files: po/kn.po
+Copyright: © 2009 Shankar Prasad <svenkate at redhat.com>
License: GPL-2+
- On Debian systems, the complete text of the GPL-2 can be found in
- /usr/share/common-licenses/GPL-2
-File: po/mr.po
-Copyright:
- Copyright (C) 2009 Sandeep Shedmake <sandeep.shedmake at gmail.com>
+Files: po/mr.po
+Copyright: © 2009 Sandeep Shedmake <sandeep.shedmake at gmail.com>
License: GPL-2+
- On Debian systems, the complete text of the GPL-2 can be found in
- /usr/share/common-licenses/GPL-2
-File: po/ms.po
-Copyright:
- Copyright (C) 2009. Mahrazi Mohd Kamal <mahrazi at gmail.com>
-License: GPL-2
- On Debian systems, the complete text of the GPL-2 can be found in
- /usr/share/common-licenses/GPL-2
+Files: po/ms.po
+Copyright: © 2009 Mahrazi Mohd Kamal <mahrazi at gmail.com>
+License: GPL-2+
-File: po/nl.po
-Copyright:
- Copyright (C) 2009 Geert Warrink <geert.warrink at onsnet.nu>
+Files: po/nl.po
+Copyright: © 2009 Geert Warrink <geert.warrink at onsnet.nu>
License: GPL-2+
- On Debian systems, the complete text of the GPL-2 can be found in
- /usr/share/common-licenses/GPL-2
-File: po/or.po
-Copyright:
- Copyright (C) 2009 Manoj Kumar Giri <mgiri at redhat.com>
+Files: po/or.po
+Copyright: © 2009 Manoj Kumar Giri <mgiri at redhat.com>
License: GPL-2+
- On Debian systems, the complete text of the GPL-2 can be found in
- /usr/share/common-licenses/GPL-2
-File: po/pa.po
-Copyright:
- Copyright (C) 2008 Amanpreet Singh Alam <aalam at users.sf.net>
+Files: po/pa.po
+Copyright: © 2008 Amanpreet Singh Alam <aalam at users.sf.net>
License: GPL-2+
- On Debian systems, the complete text of the GPL-2 can be found in
- /usr/share/common-licenses/GPL-2
-File: po/pl.po
-Copyright:
- Copyright (C) 2008 Piotr Drąg <piotrdrag at gmail.com>
+Files: po/pl.po
+Copyright: © 2008 Piotr Drąg <piotrdrag at gmail.com>
License: GPL-2+
- On Debian systems, the complete text of the GPL-2 can be found in
- /usr/share/common-licenses/GPL-2
-File: po/pt_BR.po
-Copyright:
- Copyright (C) 2008 Nadilson dos Santos de Santana <nadilson at projetofedora.org>
- Copyright (C) 2008 Igor Pires Soares <igor at projetofedora.org>
- Copyright (C) 2008 Taylon Silmer <taylonsilva at gmail.com>
+Files: po/pt_BR.po
+Copyright: © 2008 Nadilson dos Santos de Santana <nadilson at projetofedora.org>
+ © 2008 Igor Pires Soares <igor at projetofedora.org>
+ © 2008 Taylon Silmer <taylonsilva at gmail.com>
License: GPL-2+
- On Debian systems, the complete text of the GPL-2 can be found in
- /usr/share/common-licenses/GPL-2
-File: po/sk.po
-Copyright:
- Copyright (C) 2008 Ondrej Šulek <feonsu at gmail.com>
+Files: po/sk.po
+Copyright: © 2008 Ondrej Šulek <feonsu at gmail.com>
License: GPL-2+
- On Debian systems, the complete text of the GPL-2 can be found in
- /usr/share/common-licenses/GPL-2
-File: po/sr.po
-Copyright:
- Copyright (C) 2008 Ferenc Pravda <pravda013 at gmail.com>
+Files: po/sr.po
+Copyright: © 2008 Ferenc Pravda <pravda013 at gmail.com>
License: GPL-2+
- On Debian systems, the complete text of the GPL-2 can be found in
- /usr/share/common-licenses/GPL-2
-File: po/sr at latin.po
-Copyright:
- Copyright (C) 2008 Ferenc Pravda <pravda013 at gmail.com>
+Files: po/sr at latin.po
+Copyright: © 2008 Ferenc Pravda <pravda013 at gmail.com>
License: GPL-2+
- On Debian systems, the complete text of the GPL-2 can be found in
- /usr/share/common-licenses/GPL-2
-File: po/sv.po
-Copyright:
- Copyright (C) 2008 Daniel Nylander <po at danielnylander.se>
+Files: po/sv.po
+Copyright: © 2008 Daniel Nylander <po at danielnylander.se>
License: GPL-2+
- On Debian systems, the complete text of the GPL-2 can be found in
- /usr/share/common-licenses/GPL-2
-File: po/ta.po
-Copyright:
- Copyright (C) 2009 I. Felix <ifelix at redhat.com>
+Files: po/ta.po
+Copyright: © 2009 I. Felix <ifelix at redhat.com>
License: GPL-2+
- On Debian systems, the complete text of the GPL-2 can be found in
- /usr/share/common-licenses/GPL-2
-File: po/te.po
-Copyright:
- Copyright (C) 2009 Krishna Babu K <kkrothap at redhat.com>
+Files: po/te.po
+Copyright: © 2009 Krishna Babu K <kkrothap at redhat.com>
License: GPL-2+
- On Debian systems, the complete text of the GPL-2 can be found in
- /usr/share/common-licenses/GPL-2
-File: po/th.po
-Copyright:
- Copyright (C) 2009 Manatsawin Hanmongkolchai <manatsawin at gmail.com>
+Files: po/th.po
+Copyright: © 2009 Manatsawin Hanmongkolchai <manatsawin at gmail.com>
License: GPL-2+
- On Debian systems, the complete text of the GPL-2 can be found in
- /usr/share/common-licenses/GPL-2
-File: po/tr.po
-Copyright:
- Copyright (C) 2008 Necmettin Begiter <necmettin.begiter at gmail.com>
+Files: po/tr.po
+Copyright: © 2008 Necmettin Begiter <necmettin.begiter at gmail.com>
License: GPL-2+
- On Debian systems, the complete text of the GPL-2 can be found in
- /usr/share/common-licenses/GPL-2
-File: po/zh_CN.po
-Copyright:
- Copyright (C) 2009 Leah Liu <lliu at redhat.com>
+Files: po/zh_CN.po
+Copyright: © 2009 Leah Liu <lliu at redhat.com>
License: GPL-2+
- On Debian systems, the complete text of the GPL-2 can be found in
- /usr/share/common-licenses/GPL-2
diff --git a/debian/patches/0003-doc-Drop-0pointer.de-references.patch b/debian/patches/0003-doc-Drop-0pointer.de-references.patch
new file mode 100644
index 0000000..2827fc3
--- /dev/null
+++ b/debian/patches/0003-doc-Drop-0pointer.de-references.patch
@@ -0,0 +1,52 @@
+From 6b50202f3f11bc5c016e41b8f0c529860a6baabb Mon Sep 17 00:00:00 2001
+From: Arun Raghavan <arun.raghavan at collabora.co.uk>
+Date: Tue, 15 May 2012 14:13:08 +0530
+Subject: [PATCH 3/3] doc: Drop 0pointer.de references
+
+---
+ configure.ac | 2 +-
+ doc/README.html.in | 7 +++----
+ 2 files changed, 4 insertions(+), 5 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 69eea2f..3df69d1 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -19,7 +19,7 @@
+ # along with paprefs. If not, see <http://www.gnu.org/licenses/>.
+
+ AC_PREREQ(2.57)
+-AC_INIT([paprefs],[0.9.10],[mzcncersf (at) 0pointer (dot) de])
++AC_INIT([paprefs],[0.9.10],[pulseaudio-discuss (at) lists (dot) freedesktop (dot) org])
+ AC_CONFIG_SRCDIR([src/paprefs.cc])
+ AC_CONFIG_HEADERS([config.h])
+ AM_INIT_AUTOMAKE([foreign 1.11 -Wall dist-xz tar-ustar])
+diff --git a/doc/README.html.in b/doc/README.html.in
+index 50d8676..9bc800f 100644
+--- a/doc/README.html.in
++++ b/doc/README.html.in
+@@ -60,8 +60,7 @@ href="@PACKAGE_URL at paprefs-0.9.5.tar.gz">Version 0.9.5</a> released; initial rel
+
+ <p>PulseAudio Preferences (<tt>paprefs</tt>) is a simple GTK
+ based configuration dialog for the <a
+-href="http://0pointer.de/lennart/projects/pulseaudio/">PulseAudio
+-sound server</a>.</p>
++href="http://pulseaudio.org/">PulseAudio sound server</a>.</p>
+
+ <p>Please note that this program can only configure local servers, and
+ requires that a special module <tt>module-gconf</tt> is loaded in the
+@@ -114,9 +113,9 @@ compilation and <tt>make install</tt> (as root) for installation of
+
+ <p>The current release is <a href="@PACKAGE_URL at paprefs-@PACKAGE_VERSION at .tar.gz">@PACKAGE_VERSION@</a></p>
+
+-<p>Get <tt>paprefs</tt>'s development sources from the <a href="http://git-scm.org/">GIT</a> <a href="git://git.0pointer.de/paprefs">repository</a> (<a href="http://git.0pointer.de/?p=paprefs.git">gitweb</a>): </p>
++<p>Get <tt>paprefs</tt>'s development sources from the <a href="http://git-scm.org/">GIT</a> <a href="git://anongit.freedesktop.org/pulseaudio/paprefs">repository</a> (<a href="http://cgit.freedesktop.org/pulseaudio/paprefs">web interface</a>): </p>
+
+-<pre>git clone git://git.0pointer.de/paprefs</pre>
++<pre>git clone git://anongit.freedesktop.org/pulseaudio/paprefs</pre>
+
+ <hr/>
+ <address class="grey">Lennart Poettering <@PACKAGE_BUGREPORT@>, September 2009</address>
+--
+2.1.4
+
diff --git a/debian/patches/series b/debian/patches/series
index 2b39ee3..94bc712 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
0001_make_PA_version_agnostic.patch
0002_multiarch_support.patch
+0003-doc-Drop-0pointer.de-references.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-pulseaudio/paprefs.git
More information about the pkg-pulseaudio-devel
mailing list