[Pkg-wmaker-commits] [wmmon] 11/12: Import Debian changes 1.1+20131205-1

Doug Torrance dtorrance-guest at moszumanska.debian.org
Sat Aug 12 22:44:03 UTC 2017


This is an automated email from the git hooks/post-receive script.

dtorrance-guest pushed a commit to branch master
in repository wmmon.

commit 926497ee5816c13b0a8201fe1c99ce9201317d43
Merge: 9d73e90 28ca262
Author: Rodolfo García Peñas (kix) <kix at debian.org>
Date:   Fri Dec 6 20:27:13 2013 +0100

    Import Debian changes 1.1+20131205-1
    
    wmmon (1.1+20131205-1) unstable; urgency=low
    
      * New upstream version.
      * Bumped Debian Policy to 3.9.5.
      * debian/compat is now version 9.
      * debian/control: Build depends, debhelper version >= 9.
      * New patch debian/patches/01-cppflags.patch
        * This flag includes de CPPFLAGS in Makefile, to allow hardening.

 COPYING                          |  42 ++--
 debian/changelog                 |  11 ++
 debian/compat                    |   2 +-
 debian/control                   |   6 +-
 debian/patches/01-cppflags.patch |  14 ++
 debian/patches/series            |   1 +
 wmgeneral/list.c                 |   4 +-
 wmgeneral/list.h                 |   4 +-
 wmgeneral/misc.c                 |   2 +-
 wmmon/wmmon.1                    |   2 +-
 wmmon/wmmon.c                    | 403 +++++++++++++++++----------------------
 11 files changed, 227 insertions(+), 264 deletions(-)

diff --cc debian/changelog
index 7881478,0000000..119ca4d
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,136 -1,0 +1,147 @@@
++wmmon (1.1+20131205-1) unstable; urgency=low
++
++  * New upstream version. 
++  * Bumped Debian Policy to 3.9.5.
++  * debian/compat is now version 9.
++  * debian/control: Build depends, debhelper version >= 9.
++  * New patch debian/patches/01-cppflags.patch
++    * This flag includes de CPPFLAGS in Makefile, to allow hardening.
++
++ -- Rodolfo García Peñas (kix) <kix at debian.org>  Fri, 06 Dec 2013 20:27:13 +0100
++
 +wmmon (1.1+20120402-1) unstable; urgency=low
 +
 +  * New upstream version.
 +    * Fixes output from I/O graph. (Closes: #197446)
 +    * Load graph now displays when under high load. (Closes: #277902)
 +  * Bumped Debian Policy to 3.9.3.
 +
 + -- Rodolfo García Peñas (kix) <kix at kix.es>  Sun, 15 Apr 2012 19:22:45 +0200
 +
 +wmmon (1.1-1) unstable; urgency=low
 +
 +  * New maintainer. (Closes: #487134)
 +  * New upstream version.
 +    * This version includes the previous debian/patches.
 +    * Now, there are no debian/patches.
 +    * New upstream address: git://repo.or.cz/dockapps.git
 +      because the old is not available.
 +  * debian/copyright is now DEP-5.
 +  * Updated debian/rules.
 +    * Removed debian/dirs.
 +    * New file debian/wmmon.install.
 +    * Moved debian/examples to debian/wmmon.examples.
 +    * Moved debian/manpages to debian/wmmon.manpages.
 +    * Moved debian/menu to debian/wmmon.menu.
 +
 + -- Rodolfo García Peñas (kix) <kix at kix.es>  Fri, 16 Dec 2011 18:03:35 +0100
 +
 +wmmon (1.0b2-15) unstable; urgency=low
 +
 +  * QA upload.
 +  * Apply improvements for SMP machines management (Closes: #552225)
 +  * Update FSF address in copyright (lintian)
 +  * Move to 3.0 quilt and turn previous direct changes into a patch.
 +
 + -- Neil Williams <codehelp at debian.org>  Sat, 14 May 2011 18:41:35 +0100
 +
 +wmmon (1.0b2-14) unstable; urgency=medium
 +
 +  * Fixed build dependencies so we no longer depend on libxpm4-dev.
 +  * Quoted all strings in /usr/lib/menu/wmtime.
 +  * Add the ability to lock the mode, preventing cycling.  Thanks go to
 +    Chris Bechberger <bechberger at yahoo.com>.
 +
 + -- Simon Law <sfllaw at debian.org>  Tue, 10 Aug 2004 21:22:17 -0400
 +
 +wmmon (1.0b2-13) unstable; urgency=low
 +
 +  * Removed a memory leak that I introduced.  (Closes: Bug#223338)
 +
 + -- Simon Law <sfllaw at debian.org>  Tue, 09 Dec 2003 12:42:41 -0500
 +
 +wmmon (1.0b2-12) unstable; urgency=low
 +
 +  * Changed section to x11.
 +
 + -- Simon Law <sfllaw at debian.org>  Fri, 05 Dec 2003 11:17:21 -0500
 +
 +wmmon (1.0b2-11) unstable; urgency=low
 +
 +  * New maintainer.
 +  * Added a manual page.
 +  * Added the -geometry option.
 +  * Ensure that I/O mode works the same no matter how it is started.
 +    (Closes: Bug#94277)
 +  * Support new /proc/meminfo format in 2.6 kernels. (Closes: Bug#169160)
 +  * Fixed some buffer overflow problems.  (Closes: Bug#174949)
 +
 + -- Simon Law <sfllaw at debian.org>  Wed, 26 Nov 2003 23:47:47 -0500
 +
 +wmmon (1.0b2-10) unstable; urgency=low
 +
 +  * Fixed build depends (closes: #170133)
 +  * Applied patch from Simon Fowler <simon at himi.org> to fix /proc/meminfo
 +    parsing for linux 2.5.
 +
 + -- Fredrik Hallenberg <hallon at debian.org>  Fri, 22 Nov 2002 14:17:26 +0100
 +
 +wmmon (1.0b2-9) unstable; urgency=low
 +
 +  * Remove debug message (closes: #139408)
 +  * Applied patch from Frederik Schueler <fs at lowpingbastards.de>
 +    to fix /proc/stat parsing on linux 2.4 (closes: #144122)
 +
 + -- Fredrik Hallenberg <hallon at debian.org>  Tue, 23 Apr 2002 21:39:09 +0200
 +
 +wmmon (1.0b2-8) unstable; urgency=low
 +
 +  * Fixed menu path (closes: #129353)
 +
 + -- Fredrik Hallenberg <hallon at debian.org>  Thu, 17 Jan 2002 21:35:03 +0100
 +
 +wmmon (1.0b2-7) unstable; urgency=low
 +
 +  * Updated description (closes: #125496)
 +  * Don't install INSTALL (closes: #116940)
 +  * Changed section to utils
 +
 + -- Fredrik Hallenberg <hallon at debian.org>  Wed,  2 Jan 2002 23:19:06 +0100
 +
 +wmmon (1.0b2-6) unstable; urgency=low
 +
 +  * Updated menu with patch from Arthur Korn <arthur at korn.ch>
 +    (closes: #82315)
 +
 + -- Fredrik Hallenberg <hallon at debian.org>  Mon, 15 Jan 2001 07:56:10 +0100
 +
 +wmmon (1.0b2-5) unstable; urgency=low
 +
 +  * Build without xpm4.7 (closes: #77466)
 +
 + -- Fredrik Hallenberg <hallon at debian.org>  Sun, 19 Nov 2000 22:17:03 +0100
 +
 +wmmon (1.0b2-4) unstable; urgency=low
 +
 +  * Added menu entry (closes: #76969)
 +
 + -- Fredrik Hallenberg <hallon at debian.org>  Sat, 18 Nov 2000 21:14:56 +0100
 +
 +wmmon (1.0b2-3) unstable; urgency=low
 +
 +  * Rebuild to update libxmp dependency. (closes: #67990)
 +
 + -- Fredrik Hallenberg <hallon at debian.org>  Mon, 31 Jul 2000 07:25:09 +0200
 +
 +wmmon (1.0b2-2) unstable; urgency=low
 +
 +  * Patch from Salvador Pinto Abreu <spa at sc.uevora.pt>:
 +    Fixed behavior when APM causes the system to sleep/suspend.
 +
 + -- Fredrik Hallenberg <hallon at debian.org>  Sat, 17 Oct 1998 13:35:55 +0200
 +
 +wmmon (1.0b2-1) unstable; urgency=low
 +
 +  * Initial Release.
 +
 + -- Fredrik Hallenberg <hallon at debian.org>  Wed, 15 Jul 1998 18:18:37 +0200
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 2533cbe,0000000..d13b8b4
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,25 -1,0 +1,25 @@@
 +Source: wmmon
 +Section: x11
 +Priority: optional
- Maintainer: Rodolfo García Peñas (kix) <kix at kix.es>
- Standards-Version: 3.9.3
- Build-Depends: debhelper (>= 7.0.50~), libx11-dev, libxpm-dev, libxext-dev
++Maintainer: Rodolfo García Peñas (kix) <kix at debian.org>
++Standards-Version: 3.9.5
++Build-Depends: debhelper (>= 9), libx11-dev, libxpm-dev, libxext-dev
 +Homepage: http://repo.or.cz/w/dockapps.git
 +
 +Package: wmmon
 +Architecture: any
 +Depends: ${shlibs:Depends}, ${misc:Depends}
 +Description: Window Maker dockapp for monitoring system information
 + WMMon monitors the realtime CPU load as well as the average system load,
 + and gives you some nice additional features too. It is intended for
 + docking in Window Maker.
 + .
 + It currently provides:
 + .
 +   * a realtime CPU stress meter;
 +   * an auto-scaled average system load meter, like xload and wmavgload;
 +   * a realtime disk I/O stress meter;
 +   * auto-scaled disk I/O load meter;
 +   * realtime memory and swap usage meters;
 +   * a display for system uptime;
 +   * three user-defined commands to launch.
diff --cc debian/patches/01-cppflags.patch
index 0000000,0000000..49ff667
new file mode 100644
--- /dev/null
+++ b/debian/patches/01-cppflags.patch
@@@ -1,0 -1,0 +1,14 @@@
++Description: Include CPPFLAGS in Makefile to allow hardening
++Author: Rodolfo García Peñas (kix) <kix at debian.org>
++Last-Update: 2013-12-06
++--- a/wmmon/Makefile
+++++ b/wmmon/Makefile
++@@ -10,7 +10,7 @@
++ 
++ 
++ .c.o:
++-	$(CC) $(CFLAGS) -c -Wall $< -o $*.o
+++	$(CC) $(CFLAGS) $(CPPFLAGS) -c -Wall $< -o $*.o
++ 
++ wmmon: $(OBJS)
++ 	$(CC) $(LDFLAGS) -o wmmon $^ $(LIBDIR) $(LIBS)
diff --cc debian/patches/series
index 0000000,0000000..82cacde
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++01-cppflags.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wmaker/wmmon.git



More information about the Pkg-wmaker-commits mailing list