[Pkg-wmaker-commits] [wmmon] 08/12: Import Debian changes 1.1-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 cadd9436ef84be8fa30706fb9a05ad75115d415d
Merge: 5c0f93f 15ec579
Author: Rodolfo García Peñas (kix) <kix at kix.es>
Date:   Fri Dec 16 18:03:35 2011 +0100

    Import Debian changes 1.1-1
    
    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.

 debian/changelog                            |  18 +
 debian/control                              |   5 +-
 debian/copyright                            |  83 ++--
 debian/dirs                                 |   1 -
 debian/patches/existing-changes.diff        | 720 ----------------------------
 debian/patches/series                       |   2 -
 debian/patches/smp-machine-improvement.diff | 304 ------------
 debian/rules                                |  91 +---
 debian/watch                                |   1 +
 debian/{examples => wmmon.examples}         |   0
 debian/wmmon.install                        |   1 +
 debian/{manpages => wmmon.manpages}         |   0
 debian/{menu => wmmon.menu}                 |   0
 wmgeneral/wmgeneral.c                       |  24 +-
 wmmon/Makefile                              |   4 +-
 wmmon/wmmon.1                               | 192 ++++++++
 wmmon/wmmon.c                               | 409 ++++++++++++----
 17 files changed, 604 insertions(+), 1251 deletions(-)

diff --cc debian/changelog
index 05e1e26,0000000..dc2537f
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,109 -1,0 +1,127 @@@
++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/control
index a2f3299,0000000..c9f9bf7
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,24 -1,0 +1,25 @@@
 +Source: wmmon
 +Section: x11
 +Priority: optional
- Maintainer: Debian QA Group <packages at qa.debian.org>
++Maintainer: Rodolfo García Peñas (kix) <kix at kix.es>
 +Standards-Version: 3.9.2
- Build-Depends: debhelper (>> 7), libx11-dev, libxpm-dev, libxext-dev
++Build-Depends: debhelper (>= 7.0.50~), 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/copyright
index 57dc063,0000000..3b39a55
mode 100644,000000..100644
--- a/debian/copyright
+++ b/debian/copyright
@@@ -1,28 -1,0 +1,55 @@@
- This package was debianized by Fredrik Hallenberg hallon at debian.org on
- Wed, 15 Jul 1998 18:18:37 +0200.
- 
- It was downloaded from http://www.xs4all.nl/~warp/files/wmmon-1.0b2.tar.gz
- 
- Upstream Copyright:
- 
-     Copyright (c) 1997, 1998 by Martijn Pieterse and Antoine Nulle
- 
-     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, 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 program; if not, contact:
- 
-     Free Software Foundation           Voice:  +1-617-542-5942
-     51 Franklin Street, Fifth Floor    Fax:    +1-617-542-2652
-     Boston, MA  02110-1301,  USA       gnu at gnu.org
- 
- On Debian GNU/Linux systems, the complete text of the GNU General
- Public License can be found in `/usr/share/common-licenses/GPL-2'.
++Format: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?view=co&pathrev=174
++Upstream-Name: wmMoonClock
++Upstream-Contact: Michael G. Henderson <mghenderson at lanl.gov>
++Source: http://repo.or.cz/w/dockapps.git
++
++Files: *
++Copyright: 1997, 1998 by Martijn Pieterse and Antoine Nulle
++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'.
++
++Files: debian/*
++Copyright: 1998-2002, Fredrik Hallenberg <hallon at debian.org> 
++           2003-2004, Simon Law <sfllaw at debian.org>
++           2001, Neil Williams <codehelp at debian.org>
++           2011, Rodolfo García Peñas (kix) <kix at kix.es>
++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/rules
index ef2ebb3,0000000..1f68795
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,96 -1,0 +1,15 @@@
 +#!/usr/bin/make -f
- #
- # debian/rules file for wmmon.
- # Copyright (C) 2003  Software in the Public Interest.
- #
- # 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 program; if not, write to the Free Software
- # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- # 
- # Based on the sample debian/rules that uses debhelper.
- # GNU copyright 1997 to 1999 by Joey Hess.
- 
- # Uncomment this to turn on verbose mode.
 +#export DH_VERBOSE=1
 +
- ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
- 	CFLAGS += -g
- endif
- ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
- 	INSTALL_PROGRAM += -s
- endif
- 
- build: build-stamp
++%:
++	dh $@
 +
- build-stamp:
++override_dh_auto_build:
 +	dh_testdir
- 
- 	# Add here commands to compile the package.
 +	cd wmmon; $(MAKE)
 +
- 	touch build-stamp
- 
- clean:
- 	dh_testdir
- 	dh_testroot
- 	rm -f build-stamp 
- 
- 	# Add here commands to clean up after the build process.
- 	-cd wmmon; $(MAKE) clean
- 
- 	dh_clean
- 
- install: build
++override_dh_clean:
 +	dh_testdir
 +	dh_testroot
++	cd wmmon; $(MAKE) clean
 +	dh_clean
- 	dh_installdirs
- 
- 	# Add here commands to install the package into debian/wmmon.
- 	install -m 755 wmmon/wmmon $(CURDIR)/debian/wmmon/usr/bin
- 
- # Build architecture-independent files here.
- binary-indep: build install
- # We have nothing to do by default.
- 
- # Build architecture-dependent files here.
- binary-arch: build install
- 	dh_testdir
- 	dh_testroot
- 	dh_installdebconf
- 	dh_installdocs
- 	dh_installexamples
- 	dh_installmenu
- #	dh_installlogrotate
- #	dh_installemacsen
- #	dh_installpam
- #	dh_installmime
- #	dh_installinit
- #	dh_installcron
- 	dh_installman
- #	dh_installinfo
- 	dh_installchangelogs CHANGES
- 	dh_link
- 	dh_strip
- 	dh_compress
- 	dh_fixperms
- #	dh_makeshlibs
- 	dh_installdeb
- #	dh_perl
- 	dh_shlibdeps
- 	dh_gencontrol
- 	dh_md5sums
- 	dh_builddeb
- 
- binary: binary-indep binary-arch
- .PHONY: build clean binary-indep binary-arch binary install 
diff --cc debian/watch
index 0000000,0000000..af6aea9
new file mode 100644
--- /dev/null
+++ b/debian/watch
@@@ -1,0 -1,0 +1,1 @@@
++# This application can be found at http://repo.or.cz/w/dockapps.git
diff --cc debian/wmmon.examples
index e9228bf,0000000..e9228bf
mode 100644,000000..100644
--- a/debian/wmmon.examples
+++ b/debian/wmmon.examples
diff --cc debian/wmmon.install
index 0000000,0000000..e34ec6c
new file mode 100644
--- /dev/null
+++ b/debian/wmmon.install
@@@ -1,0 -1,0 +1,1 @@@
++wmmon/wmmon usr/bin
diff --cc debian/wmmon.manpages
index 9b628f7,0000000..9b628f7
mode 100644,000000..100644
--- a/debian/wmmon.manpages
+++ b/debian/wmmon.manpages
diff --cc debian/wmmon.menu
index a8ae208,0000000..a8ae208
mode 100644,000000..100644
--- a/debian/wmmon.menu
+++ b/debian/wmmon.menu

-- 
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