[Pkg-wmaker-commits] [wmmixer] 24/24: Import Debian changes 1.7+20120605-1
Doug Torrance
dtorrance-guest at moszumanska.debian.org
Sun Aug 27 13:12:54 UTC 2017
This is an automated email from the git hooks/post-receive script.
dtorrance-guest pushed a commit to branch master
in repository wmmixer.
commit 8d0e60106db364c3d4e6e83d8174b73dba100955
Merge: 221eb4f 29814d1
Author: Rodolfo García Peñas (kix) <kix at debian.org>
Date: Sun Jul 21 18:03:00 2013 +0200
Import Debian changes 1.7+20120605-1
wmmixer (1.7+20120605-1) unstable; urgency=low
* New upstream release (from git).
- Updates the FSF address only, no code changes.
* debian/control
- Updated maintainer email address from kix at kix.es to kix at debian.org.
- Bump Standards-Version to 3.9.4.
- Debhelper compatibility bumped to 9.
- Added Vcs-Git and Vcs-Browser fields.
* debian/copyright
- Removed the string "Upstream-Contact:" in the second upstream contact
name, to avoid lintian warnings.
* New patch debian/patches/03_Makefile_hardening.patch to include the Debian
Hardening flags in the compiler process.
COPYING | 42 +++++++++++++++---------------
README | 2 +-
debian/changelog | 17 ++++++++++++
debian/compat | 2 +-
debian/control | 8 +++---
debian/copyright | 2 +-
debian/patches/03_Makefile_hardening.patch | 38 +++++++++++++++++++++++++++
debian/patches/series | 1 +
debian/rules | 1 -
9 files changed, 85 insertions(+), 28 deletions(-)
diff --cc debian/changelog
index dd1b65e,0000000..0f23ffa
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,305 -1,0 +1,322 @@@
++wmmixer (1.7+20120605-1) unstable; urgency=low
++
++ * New upstream release (from git).
++ - Updates the FSF address only, no code changes.
++ * debian/control
++ - Updated maintainer email address from kix at kix.es to kix at debian.org.
++ - Bump Standards-Version to 3.9.4.
++ - Debhelper compatibility bumped to 9.
++ - Added Vcs-Git and Vcs-Browser fields.
++ * debian/copyright
++ - Removed the string "Upstream-Contact:" in the second upstream contact
++ name, to avoid lintian warnings.
++ * New patch debian/patches/03_Makefile_hardening.patch to include the Debian
++ Hardening flags in the compiler process.
++
++ -- Rodolfo García Peñas (kix) <kix at debian.org> Sun, 21 Jul 2013 18:03:00 +0200
++
+wmmixer (1.7-1) unstable; urgency=low
+
+ * New upstream version 1.7
+ - Fix FTBFS with ld --as-needed
+ Patch sent by Angel Abad <angelabad at ubuntu.com> [Closes: #640301]
+ * debian/copyright is now DEP-5
+ * debian/patches/* are now DEP-3
+
+ -- Rodolfo García Peñas (kix) <kix at kix.es> Mon, 19 Sep 2011 15:29:32 +0200
+
+wmmixer (1.6-1) unstable; urgency=low
+
+ * New upstream version 1.6
+ * Four Debian patches are now in the upstream. Deleted form debian/patches
+ - 01_restore_pristine_code.patch
+ - 02_multiple_config_files.patch
+ - 03_hurd_support.patch
+ - 04_xclass_support.patch
+ * Debian debian/patches renamed
+ - 05_debian_paths.patch to 01_debian_paths.patch
+ - 06_Makefile_optimization.patch to 02_Makefile_optimization.patch
+ * Better application info in control file
+
+ -- Rodolfo García Peñas (kix) <kix at kix.es> Wed, 13 Jul 2011 12:08:43 +0200
+
+wmmixer (1.5-12) unstable; urgency=low
+
+ * Support multiple config files and X Classes [Closes: #454286]
+ * Debian standards version moved to 3.9.2 (from 3.8.0) and compatibility to 7
+ * deleted README.source
+ * dpatch removed
+ * Hurd support
+ * Switch to dpkg-source 3.0 (quilt) format
+ * Package adoption. New Maintainer [Closes: #490739]
+
+ -- Rodolfo García Peñas (kix) <kix at kix.es> Sun, 8 Apr 2011 23:38:05 +0200
+
+wmmixer (1.5-11) unstable; urgency=low
+
+ * QA upload.
+ * debian/control
+ - set QA Group as maintainer
+ - added depends on oss-compat; Closes: #503846
+ - bump Standards-Version to 3.8.0
+ + added debian/README.source
+
+ -- Sandro Tosi <morph at debian.org> Wed, 29 Oct 2008 14:03:45 +0100
+
+wmmixer (1.5-10) unstable; urgency=low
+
+ * debian/control
+ - bump Standard-Version to 3.7.3
+ * debian/copyright
+ - upstream authors, copyright and license indented with 4 spaces
+
+ -- Sandro Tosi <matrixhasu at gmail.com> Sun, 06 Jan 2008 01:23:22 +0100
+
+wmmixer (1.5-9) unstable; urgency=low
+
+ * Adopting package (Closes: #427083)
+ * debian/control
+ - set myself as new maintainer
+ - little reformat of short and long descriptions
+ - added dependency against dpatch
+ * debian/copyright
+ - set myself as new maintainer
+ - added upstream author
+ - added copyright owners information
+ - added license information
+ - added license file location on a debian system
+ * debian/menu
+ - updated menu section
+ * debian/rules
+ - very little fixes installed filenames formattation
+ - integrated dpatch
+ * debian/patches/01_restore_pristine_code.dpatch
+ - added to remove upstream code changes
+ * {mixctl.h,exception.h,xhandler.cc,mixctl.cc,README}
+ - restored to upstream version
+
+ -- Sandro Tosi <matrixhasu at gmail.com> Mon, 08 Oct 2007 21:38:57 +0200
+
+wmmixer (1.5-8) unstable; urgency=medium
+
+ * QA upload.
+ * Acknowledge NMU. Closes: #174899.
+ * xhandler.cc: Initialize `icon_list_'. Thanks to Florent Bayle for
+ the patch. Closes: #429509.
+ * Remove no longer necessary build dependency on x-dev.
+ * Switch to debhelper 5.
+ * debian/rules:
+ - Add support for DEB_BUILD_OPTIONS=noopt.
+ - Remove support for DEB_BUILD_OPTIONS=debug.
+ - Let dh_strip handle DEB_BUILD_OPTION=nostrip.
+ * Conforms to Standards version 3.7.2.
+
+ -- Matej Vela <vela at debian.org> Mon, 18 Jun 2007 21:24:01 +0200
+
+wmmixer (1.5-7) unstable; urgency=low
+
+ * Orphan package, set maintainer to Debian QA Group
+
+ -- Gordon Fraser <gordon at debian.org> Fri, 01 Jun 2007 21:09:47 +0200
+
+wmmixer (1.5-6.1) unstable; urgency=low
+
+ * Porter NMU.
+ * Added support for GNU/kFreeBSD (Closes: #332992).
+
+ -- Aurelien Jarno <aurel32 at debian.org> Sun, 10 Dec 2006 21:45:54 +0100
+
+wmmixer (1.5-6) unstable; urgency=low
+
+ * Fix build dependencies (Closes: #346893)
+
+ -- Gordon Fraser <gordon at debian.org> Sun, 15 Jan 2006 19:20:10 +0100
+
+wmmixer (1.5-5) unstable; urgency=low
+
+ * Rebuild for g++ transition
+
+ -- Gordon Fraser <gordon at debian.org> Mon, 3 Oct 2005 14:30:09 +0200
+
+wmmixer (1.5-4) unstable; urgency=low
+
+ * Added missing dot to package description (Closes: #174899)
+
+ -- <gordon at debian.org> Thu, 29 Jul 2004 08:38:02 +0200
+
+wmmixer (1.5-3) unstable; urgency=low
+
+ * gcc-3.x updates to fix FTBFS (Closes: #218942)
+ (Thanks, Frank Lichtenheld)
+
+ -- Gordon Fraser <gordon at debian.org> Tue, 11 Nov 2003 07:51:21 +0100
+
+wmmixer (1.5-2) unstable; urgency=low
+
+ * Fix documentation error (Closes: #151385)
+
+ -- Gordon Fraser <gordon at debian.org> Sat, 29 Jun 2002 19:16:55 +0200
+
+wmmixer (1.5-1) unstable; urgency=low
+
+ * New upstream version
+
+ -- Gordon Fraser <gordon at debian.org> Tue, 25 Jun 2002 22:14:11 +0200
+
+wmmixer (1.4-1) unstable; urgency=low
+
+ * New upstream version
+
+ -- Gordon Fraser <gordon at debian.org> Sat, 8 Jun 2002 18:13:17 +0200
+
+wmmixer (1.3-3) unstable; urgency=low
+
+ * Fix build failure on ia64 (Closes: #148454)
+
+ -- Gordon Fraser <gordon at debian.org> Wed, 29 May 2002 11:29:51 +0200
+
+wmmixer (1.3-2) unstable; urgency=low
+
+ * Fix segfault on reading configuration file (Closes: #148245)
+ * Support DEB_BUILD_OPTIONS
+
+ -- Gordon Fraser <gordon at debian.org> Mon, 27 May 2002 09:28:24 +0200
+
+wmmixer (1.3-1) unstable; urgency=low
+
+ * New upstream version
+ * Fix build failure on hppa (Closes: #148196)
+
+ -- Gordon Fraser <gordon at debian.org> Sun, 26 May 2002 13:18:59 +0200
+
+wmmixer (1.2-1) unstable; urgency=low
+
+ * New upstream version
+
+ -- Gordon Fraser <gordon at debian.org> Sat, 25 May 2002 15:01:15 +0200
+
+wmmixer (1.1-4) unstable; urgency=low
+
+ * Fix version string
+ * Improve mousewheel behaviour for changing both channels
+
+ -- Gordon Fraser <gordon at debian.org> Sun, 14 Apr 2002 15:52:40 +0200
+
+wmmixer (1.1-3) unstable; urgency=low
+
+ * Added ioctl to check for changes before doing updates
+ This reduces CPU load a _lot_
+ * Really give compiler CXXFLAGS
+ * Get rid of compiler warnings
+
+ -- Gordon Fraser <gordon at debian.org> Fri, 12 Apr 2002 09:13:37 +0200
+
+wmmixer (1.1-2) unstable; urgency=low
+
+ * Correct Makefile to use C++ compiler instead of C compiler
+ (Closes: #141696)
+
+ -- Gordon Fraser <gordon at debian.org> Mon, 8 Apr 2002 09:00:48 +0200
+
+wmmixer (1.1-1) unstable; urgency=low
+
+ * New maintainer
+ * New upstream release, new upstream author - me
+ * Add manpage (Closes: #93477)
+ * Add wheelmouse support (Closes: #47984)
+ * Move executable to /usr/bin (Closes: #122022)
+ * Update menu entry (Closes: #82330)
+ * Update X handling, now works with KDE Dock App Bar (Closes: #108529)
+ * It builds now (new Makefile, without imake), change Build-Depends
+
+ -- Gordon Fraser <gordon at debian.org> Tue, 2 Apr 2002 19:36:36 +0200
+
+wmmixer (1.0beta1-6.1) unstable; urgency=low
+
+ * NMU
+ * Add Build-Depends: xutils. Closes: #105305
+
+ -- LaMont Jones <lamont at smallone.fc.hp.com> Sat, 14 Jul 2001 23:16:14 -0600
+
+wmmixer (1.0beta1-6) unstable; urgency=low
+
+ * Can now handle as many channels as your sound card can.
+ * cleaned up menu file, added a non-docked entry
+ * Closes: #52908
+
+ -- Sean 'Shaleh' Perry <shaleh at debian.org> Fri, 6 Oct 2000 10:46:24 -0700
+
+wmmixer (1.0beta1-5) unstable; urgency=low
+
+ * New maintainer
+
+ -- Sean E. Perry <shaleh at debian.org> Fri, 3 Sep 1999 14:30:29 -0700
+
+wmmixer (1.0beta1-4) unstable; urgency=low
+
+ * New maintainer
+
+ -- Neale Pickett <neale at debian.org> Thu, 25 Feb 1999 14:30:29 -0700
+
+wmmixer (1.0beta1-3) frozen unstable; urgency=low
+
+ * debian/rules: added dh_installexamples home.wmmixer (closes: bug#25482)
+ * recompiled with lastest g++
+ * Added frozen to the target distributions...
+
+ -- Marcelo E. Magallon <mmagallo at debian.org> Fri, 4 Dec 1998 13:58:26 -0600
+
+wmmixer (1.0beta1-2) unstable; urgency=low
+
+ * debian/rules: added dh_installexamples home.wmmixer (closes: bug#25482)
+ * recompiled with lastest g++
+
+ -- Marcelo E. Magallon <mmagallo at debian.org> Fri, 4 Dec 1998 12:36:31 -0600
+
+wmmixer (1.0beta1-1) unstable; urgency=low
+
+ * New upstream version
+ * Added CC=c++ to debian/rules (why does it work ok with wmmount but not
+ with this one?)
+ * debian/rules: changed cp wmmixer ... to install -s -m 0755 wmmixer ...
+ * debian/control: upgraded Standards Version to 2.4.1
+ * debian/control: Suggests: wmaker | afterstep
+ * debian/rules: nuke -DX_LOCALE after making Makefile
+ * Added copyright information to debian/rules
+
+ -- Marcelo E. Magallon <mmagallo at debian.org> Sun, 4 Oct 1998 20:42:22 -0600
+
+wmmixer (0.8-1) frozen unstable; urgency=low
+
+ * New upstream version
+ * WRT version 0.2 this: fixes bug relating to manual window positioning;
+ reduces CPU load; fixes bug relating to cards with no volume channel;
+ has better checking of supported channels; is GPLed.
+
+ -- Marcelo E. Magallon <mmagallo at debian.org> Sat, 9 May 1998 21:33:48 -0600
+
+wmmixer (0.7-1) unstable; urgency=low
+
+ * New upstream version. It's GPL'ed now! Moving into main
+ * Applied patch that handles Expose events
+
+ -- Marcelo E. Magallon <mmagallo at debian.org> Sat, 2 May 1998 13:37:54 -0600
+
+wmmixer (0.6-1) unstable; urgency=low
+
+ * New upstream version
+
+ -- Marcelo E. Magallon <mmagallo at debian.org> Wed, 8 Apr 1998 21:20:33 -0600
+
+wmmixer (0.2-2) frozen unstable; urgency=low
+
+ * Moving to non-free due to copyright
+
+ -- Marcelo E. Magallon <mmagallo at debian.org> Sat, 21 Mar 1998 15:29:04 -0600
+
+wmmixer (0.2-1) unstable; urgency=low
+
+ * Initial release
+
+ -- Marcelo E. Magallon <mmagallo at debian.org> Sun, 5 Mar 1998 23:01:10 -0600
+
diff --cc debian/compat
index 7f8f011,0000000..ec63514
mode 100644,000000..100644
--- a/debian/compat
+++ b/debian/compat
@@@ -1,1 -1,0 +1,1 @@@
- 7
++9
diff --cc debian/control
index 4aa5c19,0000000..f4948a3
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,25 -1,0 +1,27 @@@
+Source: wmmixer
+Section: x11
+Priority: optional
- Maintainer: Rodolfo García Peñas (kix) <kix at kix.es>
- Build-Depends: debhelper (>= 7), libx11-dev, libxext-dev, libxpm-dev
- Standards-Version: 3.9.2
++Maintainer: Rodolfo García Peñas (kix) <kix at debian.org>
++Build-Depends: debhelper (>= 9), libx11-dev, libxext-dev, libxpm-dev
++Standards-Version: 3.9.4
+Homepage: http://www.dockapps.org/
++Vcs-Git: git://repo.or.cz/dockapps.git
++Vcs-Browser: http://repo.or.cz/r/dockapps.git
+
+Package: wmmixer
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, oss-compat
+Suggests: wmaker | afterstep
+Description: mixer application designed for WindowMaker
+ wmmixer displays the mixer status of your computer in a small icon.
+ Most common channels are identified with an appropriate icon. Control
+ include a stereo (mono where appropriate) volume control and a recording
+ source toggle button.
+ .
+ It is possible to change between the different channels using two small
+ buttons (previous channel, next channel) and to change the volume of the
+ channel.
+ .
+ There's nothing in the program that makes it require WindowMaker, except maybe
+ the NeXTStep look and the fact that it properly docks. It can be used with
+ other window managers without problems.
diff --cc debian/copyright
index f575e05,0000000..56e0ef5
mode 100644,000000..100644
--- a/debian/copyright
+++ b/debian/copyright
@@@ -1,53 -1,0 +1,53 @@@
+Format: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?view=co&pathrev=174
+Upstream-Name: wmmixer
+Upstream-Contact: Sam Hawker <shawkie at geocities.com>
- Upstream-Contact: Gordon Fraser <gordon at freakzone.net>
++ Gordon Fraser <gordon at freakzone.net>
+Source: http://repo.or.cz/w/dockapps.git
+
+Files: *
+Copyright: 1998, Sam Hawker <shawkie at geocities.com>
+ 2002, Gordon Fraser <gordon at debian.org>
+License: GPL-2+
+
+Files: debian/*
+Copyright: 1998, Marcelo E. Magallon <mmagallo at debian.org>
+ 1999, Neale Pickett <neale at debian.org>
+ 1999, Sean E. Perry <shaleh at debian.org>
+ 2000, Sean 'Shaleh' Perry <shaleh at debian.org>
+ 2001, LaMont Jones <lamont at smallone.fc.hp.com>
+ 2002, Gordon Fraser <gordon at debian.org>
+ 2003, Gordon Fraser <gordon at debian.org>
+ 2004, Gordon Fraser <gordon at debian.org>
+ 2005, Gordon Fraser <gordon at debian.org>
+ 2006, Gordon Fraser <gordon at debian.org>
+ 2006, Aurelien Jarno <aurel32 at debian.org>
+ 2007, Gordon Fraser <gordon at debian.org>
+ 2007, Matej Vela <vela at debian.org>
+ 2007, Sandro Tosi <matrixhasu at gmail.com>
+ 2008, Sandro Tosi <morph at debian.org>
+ 2009, Sandro Tosi <morph at debian.org>
+ 2010, Sandro Tosi <morph at debian.org>
+ 2011, Rodolfo García Peñas (kix) <kix at kix.es>
+License: GPL-2+
+
+License: GPL-2+
+ This program 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 (at your option) any later
+ version.
+ .
+ This program 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 General Public
+ License along with this package; if not, write to the Free
+ Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ Boston, MA 02110-1301 USA
+ .
+ On Debian systems, the full text of the GNU General Public
+ License version 2 can be found in the file
+ `/usr/share/common-licenses/GPL-2'.
diff --cc debian/patches/03_Makefile_hardening.patch
index 0000000,0000000..ae9624d
new file mode 100644
--- /dev/null
+++ b/debian/patches/03_Makefile_hardening.patch
@@@ -1,0 -1,0 +1,38 @@@
++Description: This patch renames the CXXFLAGS variable to CPPFLAGS and include extra "+" in CPPFLAGS and LDFLAGS to allow include the Debian Hardening compiler flags.
++Author: Rodolfo García Peñas (kix) <kix at debian.org>
++Last-Update: 2013-07-21
++--- a/Makefile
+++++ b/Makefile
++@@ -6,19 +6,19 @@
++ mandir = ${prefix}/share/man
++
++ CXX = g++
++-CXXFLAGS = -Wall -g
+++CPPFLAGS += -Wall -g
++
++ ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
++- CXXFLAGS += -O0
+++ CPPFLAGS += -O0
++ else
++- CXXFLAGS += -O2
+++ CPPFLAGS += -O2
++ endif
++
++ EXTRA_LIBS = -L/usr/X11R6/lib -lX11 -lXpm -lXext
++
++
++ LD = g++
++-LDFLAGS = -o $(EXECUTABLE) $(CXXFLAGS)
+++LDFLAGS += -o $(EXECUTABLE) $(CPPFLAGS)
++
++ EXECUTABLE = wmmixer
++ OBJS = xhandler.o mixctl.o wmmixer.o exception.o
++@@ -28,7 +28,7 @@
++ INSTALL_PROGRAM = $(INSTALL) -D -p -o root -g root -m 755
++
++ .cc.o:
++- $(CXX) $(CXXFLAGS) -c -o $@ $<
+++ $(CXX) $(CPPFLAGS) -c -o $@ $<
++
++ $(EXECUTABLE): $(OBJS)
++ $(LD) $(LDFLAGS) $(OBJS) $(EXTRA_LIBDIRS) $(EXTRA_LIBS)
diff --cc debian/patches/series
index dcb888c,0000000..f3c4337
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,2 -1,0 +1,3 @@@
+01_debian_paths.patch
+02_Makefile_optimization.patch
++03_Makefile_hardening.patch
diff --cc debian/rules
index 7945bd1,0000000..f82c467
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,6 -1,0 +1,5 @@@
+#!/usr/bin/make -f
+# export DH_VERBOSE=1
+
+%:
+ dh $@
-
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wmaker/wmmixer.git
More information about the Pkg-wmaker-commits
mailing list