[Pkg-pulseaudio-devel] [SCM] paman packaging branch, master, updated. debian/0.9.3-2-6-g30a2f94
neurocyte-guest at users.alioth.debian.org
neurocyte-guest at users.alioth.debian.org
Tue Oct 30 23:53:42 UTC 2007
The branch, master has been updated
via 30a2f945b7d0eb2c1362e8330fb973bb791d1706 (commit)
via 1dfd401e25164ff7509a0b9ce6d06e6a8c4eed8c (commit)
via 7154430efbb78674da6db08457988b2ac961ef17 (commit)
via 4447c73e8505ee04af43e73e7dcfff31fd292b21 (commit)
via fda8b3f996e44630aa851a46cccd308eba5fa61d (commit)
from 21bf0e1e5911e0f8c89885c9386128bd1a23263c (commit)
- Shortlog ------------------------------------------------------------
30a2f94 Update changelog
1dfd401 Drop use_stock_gnome_icons.patch. No longer required
7154430 Remove LGPL license. paman is now fully GPL.
4447c73 Merge branch 'upstream'
Summary of changes:
ChangeLog | 452 ++
LICENSE | 27 +-
Makefile.am | 13 +-
Makefile.in | 39 +-
README | 125 +-
aclocal.m4 | 5 +-
configure | 541 +-
configure.ac | 4 +-
debian/changelog | 7 +-
debian/control | 2 +-
debian/copyright | 24 -
debian/patches/series | 2 -
debian/patches/use_stock_gnome_icons.patch | 235 -
debian/rules | 1 -
doc/README | 125 +-
doc/README.html | 19 +-
doc/README.html.in | 13 +-
src/ClientWindow.cc | 6 +-
src/ClientWindow.hh | 6 +-
src/MainWindow.cc | 6 +-
src/MainWindow.hh | 6 +-
src/ModuleWindow.cc | 6 +-
src/ModuleWindow.hh | 6 +-
src/SampleWindow.cc | 6 +-
src/SampleWindow.hh | 6 +-
src/ServerInfoManager.cc | 6 +-
src/ServerInfoManager.hh | 6 +-
src/SinkInputWindow.cc | 6 +-
src/SinkInputWindow.hh | 6 +-
src/SinkWindow.cc | 6 +-
src/SinkWindow.hh | 6 +-
src/SourceOutputWindow.cc | 6 +-
src/SourceOutputWindow.hh | 6 +-
src/SourceWindow.cc | 6 +-
src/SourceWindow.hh | 6 +-
src/StatWindow.cc | 6 +-
src/StatWindow.hh | 6 +-
src/paman.cc | 6 +-
src/paman.glade |12147 ++++++++++------------------
src/paman.hh | 6 +-
40 files changed, 5312 insertions(+), 8601 deletions(-)
-----------------------------------------------------------------------
Details of changes:
commit 30a2f945b7d0eb2c1362e8330fb973bb791d1706
Author: CJ van den Berg <cj at vdbonline.com>
Date: Tue Oct 30 21:14:35 2007 +0100
Update changelog
diff --git a/debian/changelog b/debian/changelog
index 70324e1..d000d74 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
-paman (0.9.3-3) UNRELEASED; urgency=low
+paman (0.9.4-1) UNRELEASED; urgency=low
- * NOT RELEASED YET
+ * New upstream version.
+ * Remove LGPL license. paman is now fully GPL.
- -- Sjoerd Simons <sjoerd at debian.org> Sun, 09 Sep 2007 14:12:02 +0200
+ -- CJ van den Berg <cj at vdbonline.com> Tue, 30 Oct 2007 21:12:07 +0100
paman (0.9.3-2) unstable; urgency=low
commit 1dfd401e25164ff7509a0b9ce6d06e6a8c4eed8c
Author: CJ van den Berg <cj at vdbonline.com>
Date: Tue Oct 30 21:34:52 2007 +0100
Drop use_stock_gnome_icons.patch. No longer required
diff --git a/debian/control b/debian/control
index 724a21d..31738f2 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, quilt, autotools-dev, libpulse-dev,
+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
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 62952ee..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-# This series applies on GIT commit 47b53c7a90d8db33dd17c967ed14fd043143c862
-use_stock_gnome_icons.patch
diff --git a/debian/patches/use_stock_gnome_icons.patch b/debian/patches/use_stock_gnome_icons.patch
deleted file mode 100644
index bfcfe11..0000000
--- a/debian/patches/use_stock_gnome_icons.patch
+++ /dev/null
@@ -1,235 +0,0 @@
-Use stock GNOME icons (instead of Tango icons)
-
-From: CJ van den Berg <cj at vdbonline.com>
-
-
----
-
- src/paman.desktop | 2 +-
- src/paman.glade | 46 +++++++++++++++++++++++-----------------------
- 2 files changed, 24 insertions(+), 24 deletions(-)
-
-diff --git a/src/paman.desktop b/src/paman.desktop
-index 8151a67..51bc6a7 100644
---- a/src/paman.desktop
-+++ b/src/paman.desktop
-@@ -3,7 +3,7 @@ Encoding=UTF-8
- Name=PulseAudio Manager
- Comment=Manager your PulseAudio sound server.
- Exec=paman
--Icon=audio-card
-+Icon=gnome-audio
- StartupNotify=true
- Type=Application
- Categories=Application;AudioVideo;Audio;
-diff --git a/src/paman.glade b/src/paman.glade
-index c299a17..a4752ba 100644
---- a/src/paman.glade
-+++ b/src/paman.glade
-@@ -13,7 +13,7 @@
- <property name="default_height">500</property>
- <property name="resizable">True</property>
- <property name="destroy_with_parent">False</property>
-- <property name="icon_name">audio-card</property>
-+ <property name="icon_name">gnome-audio</property>
- <property name="decorated">True</property>
- <property name="skip_taskbar_hint">False</property>
- <property name="skip_pager_hint">False</property>
-@@ -45,7 +45,7 @@
- <widget class="GtkImage" id="image15">
- <property name="visible">True</property>
- <property name="icon_size">6</property>
-- <property name="icon_name">audio-card</property>
-+ <property name="icon_name">gnome-audio</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
-@@ -1906,7 +1906,7 @@
- <property name="modal">False</property>
- <property name="resizable">False</property>
- <property name="destroy_with_parent">False</property>
-- <property name="icon_name">audio-card</property>
-+ <property name="icon_name">gnome-audio</property>
- <property name="decorated">True</property>
- <property name="skip_taskbar_hint">False</property>
- <property name="skip_pager_hint">False</property>
-@@ -2566,7 +2566,7 @@
- <widget class="GtkImage" id="image16">
- <property name="visible">True</property>
- <property name="icon_size">4</property>
-- <property name="icon_name">go-jump</property>
-+ <property name="stock">gtk-jump-to</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
-@@ -2645,7 +2645,7 @@
- <widget class="GtkImage" id="image17">
- <property name="visible">True</property>
- <property name="icon_size">4</property>
-- <property name="icon_name">go-jump</property>
-+ <property name="stock">gtk-jump-to</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
-@@ -2724,7 +2724,7 @@
- <widget class="GtkImage" id="image18">
- <property name="visible">True</property>
- <property name="icon_size">4</property>
-- <property name="icon_name">audio-input-microphone</property>
-+ <property name="icon_name">stock_mic</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
-@@ -2852,7 +2852,7 @@
- <property name="modal">False</property>
- <property name="resizable">False</property>
- <property name="destroy_with_parent">False</property>
-- <property name="icon_name">audio-card</property>
-+ <property name="icon_name">gnome-audio</property>
- <property name="decorated">True</property>
- <property name="skip_taskbar_hint">False</property>
- <property name="skip_pager_hint">False</property>
-@@ -3513,7 +3513,7 @@
- <widget class="GtkImage" id="image31">
- <property name="visible">True</property>
- <property name="icon_size">4</property>
-- <property name="icon_name">go-jump</property>
-+ <property name="stock">gtk-jump-to</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
-@@ -3592,7 +3592,7 @@
- <widget class="GtkImage" id="image29">
- <property name="visible">True</property>
- <property name="icon_size">4</property>
-- <property name="icon_name">go-jump</property>
-+ <property name="stock">gtk-jump-to</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
-@@ -3671,7 +3671,7 @@
- <widget class="GtkImage" id="image30">
- <property name="visible">True</property>
- <property name="icon_size">4</property>
-- <property name="icon_name">audio-input-microphone</property>
-+ <property name="icon_name">stock_mic</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
-@@ -3799,7 +3799,7 @@
- <property name="modal">False</property>
- <property name="resizable">False</property>
- <property name="destroy_with_parent">False</property>
-- <property name="icon_name">audio-card</property>
-+ <property name="icon_name">gnome-audio</property>
- <property name="decorated">True</property>
- <property name="skip_taskbar_hint">False</property>
- <property name="skip_pager_hint">False</property>
-@@ -4186,7 +4186,7 @@
- <property name="modal">False</property>
- <property name="resizable">False</property>
- <property name="destroy_with_parent">False</property>
-- <property name="icon_name">audio-card</property>
-+ <property name="icon_name">gnome-audio</property>
- <property name="decorated">True</property>
- <property name="skip_taskbar_hint">False</property>
- <property name="skip_pager_hint">False</property>
-@@ -4495,7 +4495,7 @@
- <widget class="GtkImage" id="image27">
- <property name="visible">True</property>
- <property name="icon_size">4</property>
-- <property name="icon_name">go-jump</property>
-+ <property name="stock">gtk-jump-to</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
-@@ -4701,7 +4701,7 @@
- <property name="modal">False</property>
- <property name="resizable">False</property>
- <property name="destroy_with_parent">False</property>
-- <property name="icon_name">audio-card</property>
-+ <property name="icon_name">gnome-audio</property>
- <property name="decorated">True</property>
- <property name="skip_taskbar_hint">False</property>
- <property name="skip_pager_hint">False</property>
-@@ -5421,7 +5421,7 @@
- <widget class="GtkImage" id="image23">
- <property name="visible">True</property>
- <property name="icon_size">4</property>
-- <property name="icon_name">go-jump</property>
-+ <property name="stock">gtk-jump-to</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
-@@ -5500,7 +5500,7 @@
- <widget class="GtkImage" id="image24">
- <property name="visible">True</property>
- <property name="icon_size">4</property>
-- <property name="icon_name">go-jump</property>
-+ <property name="stock">gtk-jump-to</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
-@@ -5579,7 +5579,7 @@
- <widget class="GtkImage" id="image25">
- <property name="visible">True</property>
- <property name="icon_size">4</property>
-- <property name="icon_name">go-jump</property>
-+ <property name="stock">gtk-jump-to</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
-@@ -5786,7 +5786,7 @@
- <property name="modal">False</property>
- <property name="resizable">False</property>
- <property name="destroy_with_parent">False</property>
-- <property name="icon_name">audio-card</property>
-+ <property name="icon_name">gnome-audio</property>
- <property name="decorated">True</property>
- <property name="skip_taskbar_hint">False</property>
- <property name="skip_pager_hint">False</property>
-@@ -6382,7 +6382,7 @@
- <widget class="GtkImage" id="image19">
- <property name="visible">True</property>
- <property name="icon_size">4</property>
-- <property name="icon_name">go-jump</property>
-+ <property name="stock">gtk-jump-to</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
-@@ -6461,7 +6461,7 @@
- <widget class="GtkImage" id="image20">
- <property name="visible">True</property>
- <property name="icon_size">4</property>
-- <property name="icon_name">go-jump</property>
-+ <property name="stock">gtk-jump-to</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
-@@ -6540,7 +6540,7 @@
- <widget class="GtkImage" id="image21">
- <property name="visible">True</property>
- <property name="icon_size">4</property>
-- <property name="icon_name">go-jump</property>
-+ <property name="stock">gtk-jump-to</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
-@@ -6746,7 +6746,7 @@
- <property name="modal">False</property>
- <property name="resizable">False</property>
- <property name="destroy_with_parent">False</property>
-- <property name="icon_name">audio-card</property>
-+ <property name="icon_name">gnome-audio</property>
- <property name="decorated">True</property>
- <property name="skip_taskbar_hint">False</property>
- <property name="skip_pager_hint">False</property>
-@@ -7187,7 +7187,7 @@
- <property name="modal">False</property>
- <property name="resizable">False</property>
- <property name="destroy_with_parent">False</property>
-- <property name="icon_name">audio-card</property>
-+ <property name="icon_name">gnome-audio</property>
- <property name="decorated">True</property>
- <property name="skip_taskbar_hint">False</property>
- <property name="skip_pager_hint">False</property>
diff --git a/debian/rules b/debian/rules
index c9e0b52..31a8d7b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,7 +2,6 @@
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
commit 7154430efbb78674da6db08457988b2ac961ef17
Author: CJ van den Berg <cj at vdbonline.com>
Date: Tue Oct 30 21:10:46 2007 +0100
Remove LGPL license. paman is now fully GPL.
diff --git a/debian/copyright b/debian/copyright
index de4f9fc..0be9b1e 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -9,29 +9,6 @@ Copyright: 2004-2006 Lennart Poettering
License:
- C++ source files and headers are currently licensed under the LGPL, but
- this is expected to change to the GPL soon:
-
- paman is free software; you can redistribute it and/or modify
- it under the terms of the GNU Lesser General Public License as published
- by the Free Software Foundation; either version 2 of the License,
- or (at your option) any later version.
-
- paman is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public License
- along with paman; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301,
- USA.
-
-On Debian systems, the complete text of the GNU Lesser General
-Public License can be found in `/usr/share/common-licenses/LGPL'.
-
- The rest of paman is licensed under the GPL:
-
This package is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
@@ -50,4 +27,3 @@ Public License can be found in `/usr/share/common-licenses/LGPL'.
On Debian systems, the complete text of the GNU General
Public License can be found in `/usr/share/common-licenses/GPL'.
- This makes the resulting paman package GPL.
commit 4447c73e8505ee04af43e73e7dcfff31fd292b21
Merge: 21bf0e1e5911e0f8c89885c9386128bd1a23263c fda8b3f996e44630aa851a46cccd308eba5fa61d
Author: CJ van den Berg <cj at vdbonline.com>
Date: Tue Oct 30 20:58:48 2007 +0100
Merge branch 'upstream'
--
paman packaging
More information about the Pkg-pulseaudio-devel
mailing list