[Pkg-wmaker-commits] [wmsysmon] 05/37: Imported Debian patch 0.7.6-4.1

Doug Torrance dtorrance-guest at moszumanska.debian.org
Tue Aug 25 03:09:45 UTC 2015


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

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

commit 6c804e6ffa54ed1ed62cc43371d2ae093dc10853
Merge: cd875e9 2dbcbf4
Author: Norbert Tretkowski <nobse at debian.org>
Date:   Sat Feb 16 22:04:51 2002 +0100

    Imported Debian patch 0.7.6-4.1

 BUGS                                               |  13 -
 CHANGES                                            |  10 -
 ChangeLog                                          |  80 ++
 FAQ                                                |   7 +
 README                                             | 107 +--
 debian/changelog                                   |  59 +-
 debian/control                                     |  15 +-
 debian/copyright                                   |  15 +-
 debian/dirs                                        |   4 +-
 debian/docs                                        |   3 +-
 debian/menu                                        |   2 +
 debian/rules                                       |  29 +-
 meminfotest/Makefile                               |  10 +
 meminfotest/README                                 |  21 +
 meminfotest/test.c                                 |  18 +
 profiles/profile-0.6.0                             |  15 +
 profiles/profile-0.7.5                             |  22 +
 profiles/profile-0.7.6                             |  22 +
 src/Makefile                                       |  30 +
 src/Makefile-profile                               |  29 +
 src/wmgeneral.c                                    | 436 ++++++++++
 {wmgeneral => src}/wmgeneral.h                     |  11 +-
 .../wmsysmon-master-alpha.xpm                      | 227 ++---
 .../wmsysmon-master-i386.xpm                       |  27 +-
 src/wmsysmon.1                                     |  66 ++
 src/wmsysmon.c                                     | 949 +++++++++++++++++++++
 wmgeneral/list.c                                   | 169 ----
 wmgeneral/list.h                                   |  59 --
 wmgeneral/misc.c                                   | 164 ----
 wmgeneral/misc.h                                   |   9 -
 wmgeneral/wmgeneral.c                              | 481 -----------
 wmsysmon/Makefile                                  |  28 -
 wmsysmon/wmsysmon.c                                | 742 ----------------
 33 files changed, 1976 insertions(+), 1903 deletions(-)

diff --cc debian/changelog
index 94a363b,0000000..1c1f4da
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,20 -1,0 +1,69 @@@
++wmsysmon (0.7.6-4.1) unstable; urgency=low
++
++  * Corrected spelling error in description (closes: #124563).
++  * Corrected Build-Depends.
++
++ -- Norbert Tretkowski <nobse at debian.org>  Sat, 16 Feb 2002 22:04:51 +0100
++
++wmsysmon (0.7.6-4) unstable; urgency=low
++
++  * Manpage added.
++
++ -- Norbert Tretkowski <nobse at debian.org>  Sun, 15 Apr 2001 16:09:21 +0100
++
++wmsysmon (0.7.6-3) unstable; urgency=low
++
++  * Corrected Build-Depends (closes: #92685).
++
++ -- Norbert Tretkowski <nobse at debian.org>  Sat,  7 Apr 2001 18:31:44 +0100
++
++wmsysmon (0.7.6-2) unstable; urgency=low
++
++  * Linked against xlib6g 3.3.6, not 4.0.1 (closes: #74792, #74808).
++
++ -- Norbert Tretkowski <nobse at nobse.de>  Tue, 31 Oct 2000 21:35:41 +0200
++
++wmsysmon (0.7.6-1) unstable; urgency=low
++
++  * Adopted package (closes: #68140).
++  * Linked against libxpm4 (closes: #67951).
++  * Updated to Standards-Version 3.1.1.
++
++ -- Norbert Tretkowski <nobse at nobse.de>  Thu, 14 Oct 2000 15:41:34 +0200
++
++wmsysmon (0.7.6-0.1) unstable; urgency=low
++
++  * Non-Maintainer Upload. This package needs a maintainer!
++  * New upstream release.
++  * Rebuilt with a newer libxpm, the package gets the correct depends on
++    libxpm4 now (closes: #67951).
++  * Compiled with glibc 2.1.94.
++  * src/Makefile: added some variables to fix the default, hardcoded
++    installation paths. The binary now installs in /usr/bin.
++  * Many changes in the debian/ dir for the new release:
++    + added a menu entry.
++    + rules: added support for DEB_BUILD_OPTIONS debug and nostrip, fixed
++      CFLAGS.
++    + copyright: updated license location, changed download URL and added
++      the new upstream maintainer.
++    + docs: added FAQ, removed BUGS.
++    + control: added Build-Depends, updated description and upped
++      Standards-Version to 3.0.1.
++
++ -- Jordi Mallach <jordi at debian.org>  Sat, 30 Sep 2000 05:19:57 +0200
++
 +wmsysmon (0.2-2) unstable; urgency=low
 +
 +  *  Modified Initial Release.
 +
 +  *  Recompiled to take advantage of talon at debian.org.  Added to
 +     version number simply for those who beta-tested my original
 +     (pre-maintainer) 0.2-1
 +
 + -- Brian E. Ermovick <talon at debian.org>  Mon,  1 Feb 1999 02:00:00 -0600
 +
 +wmsysmon (0.2-1) unstable; urgency=low
 +
 +  * Initial Release.
 +
 + -- Brian E. Ermovick <talon at debian.org>  Mon,  1 Feb 1999 01:58:40 -0600
- 
- Local variables:
- mode: debian-changelog
- add-log-mailing-address: "talon at debian.org"
- End:
diff --cc debian/control
index 1bf66bd,0000000..31f6214
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,14 -1,0 +1,13 @@@
 +Source: wmsysmon
 +Section: x11
- Priority: optional
- Maintainer: Brian E. Ermovick <talon at debian.org>
- Standards-Version: 2.4.0.0
++Priority: extra
++Maintainer: Norbert Tretkowski <nobse at debian.org>
++Build-Depends: debhelper, xlibs-dev
++Standards-Version: 3.1.1
 +
 +Package: wmsysmon
 +Architecture: any
 +Depends: ${shlibs:Depends}
- Description: Windowmaker dock-app for monitoring your system.
-  wmsysmon is a dockable application for Windowmaker (and possibly
-  Afterstep).  It monitors Memory, Swap, Disk IO, uptime and interrupts.
-  .
-  Read /usr/doc/wmsysmon/README to see how it's laid out.
++Description: WindowMaker dock-app for monitoring your system.
++ wmsysmon is a dockable application for WindowMaker (and possibly
++ Afterstep). It monitors Memory, Swap, Disk IO, uptime and interrupts.
diff --cc debian/copyright
index 2504538,0000000..883737d
mode 100644,000000..100644
--- a/debian/copyright
+++ b/debian/copyright
@@@ -1,13 -1,0 +1,16 @@@
 +This package was debianized by Brian E. Ermovick talon at debian.org on
 +Mon,  1 Feb 1999 01:58:40 -0600.
 +
- It was downloaded from  http://www.neotokyo.org/illusion
++It was downloaded from ftp://gnugeneration.com/pub/Linux/wmsysmon.
 +
- Upstream Author(s):  Dave Clark (clarkd at skynet.ca)
++Upstream Authors:  Dave Clark (clarkd at skynet.ca)
++		   Vito Caputo (swivel at gnugeneration.com)
 +
 +Copyright:
 +
- wmsysmon is copyright (c) 1998/99 by Dave Clark
- 
- wmsysmon is licensed through the GNU General Public License.
- ( /usr/doc/copyright/GPL )
++wmsysmon is copyright (c) 1998/99 by Dave Clark and
++(c) 2000 by Vito Caputo.
++You are free to distribute this software under the terms of
++the GNU General Public License.
++On Debian GNU/Linux systems, the complete text of the GNU General
++Public License can be found in /usr/share/common-licenses/GPL file.
diff --cc debian/dirs
index 9b50bc9,0000000..98d1583
mode 100644,000000..100644
--- a/debian/dirs
+++ b/debian/dirs
@@@ -1,2 -1,0 +1,2 @@@
- usr/X11R6/bin
- usr/X11R6/man
++usr/bin
++usr/share/man/man1
diff --cc debian/docs
index 5450636,0000000..45b0503
mode 100644,000000..100644
--- a/debian/docs
+++ b/debian/docs
@@@ -1,1 -1,0 +1,2 @@@
- BUGS CHANGES README 
++FAQ
++README
diff --cc debian/menu
index 0000000,0000000..a259871
new file mode 100644
--- /dev/null
+++ b/debian/menu
@@@ -1,0 -1,0 +1,2 @@@
++?package(wmsysmon):needs=X11 section=Apps/System \
++  title="wmsysmon" command="/usr/bin/wmsysmon"
diff --cc debian/rules
index e15382e,0000000..fa6b19c
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,75 -1,0 +1,84 @@@
 +#!/usr/bin/make -f
 +# Made with the aid of dh_make, by Craig Small
 +# Sample debian/rules that uses debhelper. GNU copyright 1997 by Joey Hess.
 +# Some lines taken from debmake, by Cristoph Lameter.
 +
 +# Uncomment this to turn on verbose mode.
 +#export DH_VERBOSE=1
 +
++CFLAGS  = -Wall -O2
++INSTALL = install
++ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
++  CFLAGS += -g
++endif
++ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
++  INSTALL += -s
++endif
++
++
 +build: build-stamp
 +build-stamp:
 +	dh_testdir
 +
- 	
 +	# Add here commands to compile the package.
- 	cd `pwd`/wmsysmon && $(MAKE) 
++	cd `pwd`/src && $(MAKE) CFLAGS="$(CFLAGS)"
 +
 +	touch build-stamp
 +
 +clean:
 +	dh_testdir
 +	dh_testroot
 +	rm -f build-stamp install-stamp
 +
 +	# Add here commands to clean up after the build process.
- 	cd `pwd`/wmsysmon && $(MAKE) clean
++	cd `pwd`/src && $(MAKE) clean
 +
 +	dh_clean
 +
 +install: install-stamp
 +install-stamp: build-stamp
 +	dh_testdir
 +	dh_testroot
 +	dh_clean -k
 +	dh_installdirs
 +
 +	# Add here commands to install the package into debian/tmp.
- 	cd `pwd`/wmsysmon && $(MAKE) install DESTDIR=`pwd`/../debian/tmp
++	cd `pwd`/src && $(MAKE) DESTDIR=`pwd`/../debian/tmp prefix=/usr install
 +
 +	touch install-stamp
 +
 +# 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_testversion
 +	dh_testdir
 +	dh_testroot
 +	dh_installdocs
- 	dh_installexamples
++#	dh_installexamples
 +	dh_installmenu
 +#	dh_installemacsen
 +#	dh_installinit
- 	dh_installcron
++#	dh_installcron
 +	dh_installmanpages
- 	dh_undocumented wmsysmon.1x
- 	dh_installchangelogs CHANGES 
- 	dh_link
++#	dh_undocumented wmsysmon.1
++	dh_installchangelogs ChangeLog
++#	dh_link
 +	dh_strip
 +	dh_compress
 +	dh_fixperms
- 	dh_suidregister
++#	dh_suidregister
 +	dh_installdeb
 +	dh_shlibdeps
 +	dh_gencontrol
 +#	dh_makeshlibs
 +	dh_md5sums
 +	dh_builddeb
 +
 +source diff:                                                                  
 +	@echo >&2 'source and diff are obsolete - use dpkg-source -b'; false
 +
 +binary: binary-indep binary-arch
 +.PHONY: build clean binary-indep binary-arch binary
diff --cc src/Makefile
index 0000000,b629a5e..c323480
mode 000000,100644..100644
--- a/src/Makefile
+++ b/src/Makefile
@@@ -1,0 -1,21 +1,30 @@@
+ CC = gcc
+ 
++# Added for Debian GNU/Linux
++DESTDIR =
++prefix = /usr/local
++bindir = ${prefix}/bin
++mandir = ${prefix}/share/man/man1
++
++INSTALL = install -c
+ LIBDIR += -L/usr/X11R6/lib
+ LDFLAGS += -lXpm -lXext -lX11 -lm -s
+ #CFLAGS = -g #-DMONDEBUG
+ CFLAGS += -O3 -m486 -fomit-frame-pointer -I/usr/X11R6/include #-DHI_INTS #undefine HI_INTS if your x86 SMP or alpha
+ 
+ BIN = wmsysmon
++MANPAGE = wmsysmon.1
+ OBJS =	wmgeneral.o \
+ 	wmsysmon.o
+ 
+ $(BIN): $(OBJS)
+ 	$(CC) -o $(BIN) $(OBJS) $(LIBDIR) $(LDFLAGS)
+ 
+ all: wmsysmon
+ 
+ clean:
+ 	rm -f $(OBJS) $(BIN)
+ 
+ install:
 -	install -g root -o root $(BIN) /usr/local/bin
++	$(INSTALL) -g root -o root $(BIN) $(DESTDIR)$(bindir)
++	$(INSTALL) -g root -o root $(MANPAGE) $(DESTDIR)$(mandir)
diff --cc src/wmsysmon.1
index 0000000,0000000..c1892d4
new file mode 100644
--- /dev/null
+++ b/src/wmsysmon.1
@@@ -1,0 -1,0 +1,66 @@@
++
++
++
++wmsysmon(1)    System Monitor Dockable Application    wmsysmon(1)
++
++
++NNAAMMEE
++       wmsysmon  -  Windowmaker dock-app for monitoring your sys�
++       tem.
++
++
++SSYYNNOOPPSSIISS
++       Windowmaker dock-app for monitoring your system.
++
++
++DDEESSCCRRIIPPTTIIOONN
++       wmsysmon is a dockable application  for  Windowmaker  (and
++       possibly  Afterstep).  It  monitors Memory, Swap, Disk IO,
++       uptime and interrupts.
++
++
++EENNVVIIRROONNMMEENNTT
++       Requires:
++              _l_i_b_c_6 _(_>_= _2_._2_._2_-_2_)
++                     GNU C Library: Shared libraries and Timezone
++              data
++
++              _x_l_i_b_s _(_>_= _4_._0_._1_-_1_1_)
++                     X Window System client libraries
++
++
++AAUUTTHHOORR
++       Norbert Tretkowski is responsible for this Debian package.
++
++SSEEEE AALLSSOO
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++Debian                      2001-04-09                          1
++
++

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



More information about the Pkg-wmaker-commits mailing list