[Pkg-wmaker-commits] [wmsysmon] 10/37: Imported Debian patch 0.7.7-5
Doug Torrance
dtorrance-guest at moszumanska.debian.org
Tue Aug 25 03:09:46 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 b952688ee16b93aec3497b50f3e63a2248464b14
Author: Luca Bedogni <me at lucabedogni.it>
Date: Fri Mar 16 13:45:10 2007 +0100
Imported Debian patch 0.7.7-5
---
src/Makefile => Makefile | 11 ++++----
debian/changelog | 12 +++++++++
debian/compat | 1 +
debian/control | 14 +++++-----
debian/copyright | 37 ++++++++++++++++++-------
debian/dirs | 2 --
debian/docs | 1 -
debian/patches/00list | 3 +++
debian/patches/01-break.dpatch | 16 +++++++++++
debian/patches/02-output.dpatch | 21 +++++++++++++++
debian/patches/03-src_makefile.dpatch | 18 +++++++++++++
debian/rules | 51 ++++++++++-------------------------
debian/wmsysmon.1 | 50 ++++++++++++++++++++++++----------
src/Makefile | 2 +-
src/wmsysmon.c | 1 -
15 files changed, 162 insertions(+), 78 deletions(-)
diff --git a/src/Makefile b/Makefile
similarity index 67%
copy from src/Makefile
copy to Makefile
index 334f701..2498ee4 100644
--- a/src/Makefile
+++ b/Makefile
@@ -5,9 +5,9 @@ LDFLAGS += -lXpm -lXext -lX11 -lm -s
#CFLAGS = -g #-DMONDEBUG
CFLAGS += -Wall -O3 -m486 -fomit-frame-pointer -I/usr/X11R6/include #-DHI_INTS #undefine HI_INTS if your x86 SMP or alpha
-BIN = wmsysmon
-OBJS = wmgeneral.o \
- wmsysmon.o
+BIN = src/wmsysmon
+OBJS = src/wmgeneral.o \
+ src/wmsysmon.o
$(BIN): $(OBJS)
$(CC) -o $(BIN) $(OBJS) $(LIBDIR) $(LDFLAGS)
@@ -17,5 +17,6 @@ all: wmsysmon
clean:
rm -f $(OBJS) $(BIN)
-install:
- install -g root -o root $(BIN) ../debian/tmp/usr/bin
+install: $(BIN)
+ mkdir -p $(DESTDIR)/usr/bin
+ install -g root -o root $(BIN) $(DESTDIR)/usr/bin
diff --git a/debian/changelog b/debian/changelog
index b39fa10..60507a6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+wmsysmon (0.7.7-5) unstable; urgency=low
+
+ * New Maintainer (Closes: #390871)
+ * Modified copyright for making it more explicative.
+ * Added a Makefile and modified the existing one.
+ * Added a patch (01-break.dpatch) instead of modifing upstream code as previous version did.
+ * Added another patch (02-output.dpatch) for fixing a typo (Closes: #75036)
+ * Modified manpage.
+ * Changed priority from extra to optional.
+
+ -- Luca Bedogni <me at lucabedogni.it> Fri, 16 Mar 2007 13:45:10 +0100
+
wmsysmon (0.7.7-4) unstable; urgency=low
* Orphaning package. (closes: #390871)
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 0000000..7ed6ff8
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+5
diff --git a/debian/control b/debian/control
index c328b6b..b216978 100644
--- a/debian/control
+++ b/debian/control
@@ -1,13 +1,13 @@
Source: wmsysmon
Section: x11
-Priority: extra
-Maintainer: Debian QA Group <packages at qa.debian.org>
-Build-Depends: debhelper, libx11-dev, libxext-dev, libxpm-dev
-Standards-Version: 3.6.0
+Priority: optional
+Maintainer: Luca Bedogni <me at lucabedogni.it>
+Build-Depends: debhelper (>= 5), libx11-dev, libxext-dev, libxpm-dev, dpatch
+Standards-Version: 3.7.2
Package: wmsysmon
Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc: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.
+ wmsysmon is a dockable application for WindowMaker (and possibly Afterstep).
+ It monitors Memory, Swap, Disk IO, uptime and interrupts.
diff --git a/debian/copyright b/debian/copyright
index 883737d..722af05 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,16 +1,33 @@
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 ftp://gnugeneration.com/pub/Linux/wmsysmon.
+It was downloaded from <ftp://gnugeneration.com/pub/Linux/wmsysmon>.
-Upstream Authors: Dave Clark (clarkd at skynet.ca)
- Vito Caputo (swivel at gnugeneration.com)
+Upstream Authors: Dave Clark <clarkd at skynet.ca>
+ Vito Caputo <swivel at gnugeneration.com>
-Copyright:
+License:
-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.
+ Copyright (C) 1998-1999 Dave Clark <clarkd at skynet.ca>
+ Copyright (C) 2000 Vito Caputo <swivel at gnugeneration.com>
+
+ 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+On Debian systems, the complete text of the GNU General Public License
+can be found in /usr/share/common-licenses/GPL file.
+
+The Debian packaging is (C) 1999-2007, Brian E. Ermovick <talon at debian.org>,
+(C) 2007 Luca Bedogni <me at lucabedogni.it> and is licensed under the GPL, see
+`/usr/share/common-licenses/GPL'.
diff --git a/debian/dirs b/debian/dirs
deleted file mode 100644
index 98d1583..0000000
--- a/debian/dirs
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/bin
-usr/share/man/man1
diff --git a/debian/docs b/debian/docs
deleted file mode 100644
index e845566..0000000
--- a/debian/docs
+++ /dev/null
@@ -1 +0,0 @@
-README
diff --git a/debian/patches/00list b/debian/patches/00list
new file mode 100644
index 0000000..5c72282
--- /dev/null
+++ b/debian/patches/00list
@@ -0,0 +1,3 @@
+01-break.dpatch
+02-output.dpatch
+03-src_makefile.dpatch
diff --git a/debian/patches/01-break.dpatch b/debian/patches/01-break.dpatch
new file mode 100644
index 0000000..688dde1
--- /dev/null
+++ b/debian/patches/01-break.dpatch
@@ -0,0 +1,16 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01-break.dpatch by Luca Bedogni <me at lucabedogni.it>
+##
+## DP: Add a break to wmsysmon.c at the end of a switch statement.
+
+ at DPATCH@
+
+--- wmsysmon-0.7.7/src/wmsysmon.c 2007-03-16 23:26:00.000000000 +0100
++++ wmsysmon-0.7.7/src/wmsysmon.c 2007-03-14 01:01:41.000000000 +0100
+@@ -288,6 +288,7 @@
+ #ifdef MONDEBUG
+ printf("got: %i\n", Event.type);
+ #endif
++ break;
+ }
+ }
diff --git a/debian/patches/02-output.dpatch b/debian/patches/02-output.dpatch
new file mode 100644
index 0000000..2dfdcc9
--- /dev/null
+++ b/debian/patches/02-output.dpatch
@@ -0,0 +1,21 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01-output.dpatch by Luca Bedogni <me at lucabedogni.it>
+##
+## DP: Corrects a typo in wmsysmon output.
+
+ at DPATCH@
+
+--- wmsysmon-0.7.7/src/wmsysmon.c 2007-03-16 23:26:00.000000000 +0100
++++ wmsysmon-0.7.7/src/wmsysmon.c 2007-03-16 23:27:17.000000000 +0100
+@@ -851,10 +851,10 @@
+ #ifdef HI_INTS
+ "| 01234567 UV | <--- 0-N are hardware interrupts 0-23\n"
+ "| 89ABCDEF WX | <--- U,V are Page IN/OUT, W,X are Swap IN/OUT\n"
+- "| GHIJKLMN YZ |\n"
++ "| GHIJKLMN YZ | <--- Y,Z are Swap IN/OUT\n"
+ #else
+ "| 01234567 WX | <--- 0-F are hardware interrupts 0-15\n"
+- "| 89ABCDEF YZ | <--- W,X are Page IN/OUT, W,X are Swap IN/OUT\n"
++ "| 89ABCDEF YZ | <--- W,X are Page IN/OUT, Y,Z are Swap IN/OUT\n"
+ #endif
+ "-------------------\n");
diff --git a/debian/patches/03-src_makefile.dpatch b/debian/patches/03-src_makefile.dpatch
new file mode 100644
index 0000000..ec575f6
--- /dev/null
+++ b/debian/patches/03-src_makefile.dpatch
@@ -0,0 +1,18 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 02-src_makefile.dpatch by Luca Bedogni <me at lucabedogni.it>
+##
+## DP: Change Makefile to fit debian policy
+
+ at DPATCH@
+
+--- wmsysmon-0.7.7/src/Makefile 2001-12-24 08:01:43.000000000 +0100
++++ wmsysmon-0.7.7/src/Makefile 2007-03-14 00:43:12.000000000 +0100
+@@ -17,5 +17,6 @@
+ clean:
+ rm -f $(OBJS) $(BIN)
+
+-install:
+- install -g root -o root $(BIN) /usr/local/bin
++install: $(BIN)
++ mkdir -p $(DESTDIR)/usr/bin
++ install -g root -o root $(BIN) $(DESTDIR)/usr/bin
diff --git a/debian/rules b/debian/rules
index fa6b19c..c7502e9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,13 +1,8 @@
#!/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
+include /usr/share/dpatch/dpatch.make
CFLAGS = -Wall -O2
-INSTALL = install
ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
CFLAGS += -g
endif
@@ -15,35 +10,28 @@ ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
INSTALL += -s
endif
+build: patch-stamp
-build: build-stamp
-build-stamp:
- dh_testdir
-
- # Add here commands to compile the package.
- cd `pwd`/src && $(MAKE) CFLAGS="$(CFLAGS)"
-
- touch build-stamp
-
-clean:
+clean: unpatch
dh_testdir
dh_testroot
- rm -f build-stamp install-stamp
+ rm -f build-stamp
# Add here commands to clean up after the build process.
- cd `pwd`/src && $(MAKE) clean
+ -$(MAKE) clean
+
+ dpatch deapply-all
dh_clean
-install: install-stamp
-install-stamp: build-stamp
+install: build
dh_testdir
dh_testroot
dh_clean -k
dh_installdirs
# Add here commands to install the package into debian/tmp.
- cd `pwd`/src && $(MAKE) DESTDIR=`pwd`/../debian/tmp prefix=/usr install
+ $(MAKE) DESTDIR=$(CURDIR)/debian/wmsysmon install
touch install-stamp
@@ -53,32 +41,21 @@ binary-indep: build install
# Build architecture-dependent files here.
binary-arch: build install
-# dh_testversion
dh_testdir
dh_testroot
- dh_installdocs
-# dh_installexamples
- dh_installmenu
-# dh_installemacsen
-# dh_installinit
-# dh_installcron
- dh_installmanpages
-# dh_undocumented wmsysmon.1
dh_installchangelogs ChangeLog
-# dh_link
+ dh_installdocs
+ dh_installman debian/wmsysmon.1
+ dh_link
dh_strip
+ dh_installmenu
dh_compress
dh_fixperms
-# 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
+.PHONY: build clean binary-indep binary-arch binary install
diff --git a/debian/wmsysmon.1 b/debian/wmsysmon.1
index 71bca34..90dd9b6 100644
--- a/debian/wmsysmon.1
+++ b/debian/wmsysmon.1
@@ -1,25 +1,47 @@
-.TH wmsysmon 1 "2001-04-09" Debian "System Monitor Dockable Application"
+.TH wmsysmon 1 "2001-04-09" Debian "System Monitor Dockable Application"
.SH NAME
wmsysmon \- Windowmaker dock-app for monitoring your system.
.SH SYNOPSIS
-Windowmaker dock-app for monitoring your system.
+wmsysmon
+[ \fB-display\fP <display name> ]
+[ \fB-geometry\fP +Xpos+Ypos ]
+[ \fB-r\fP update rate in ms ]
+[ \fB-l\fP blinky lights for interrupts ]
+[ \fB-h\fP print help screen ]
+[ \fB-v\fP print version number ]
.SH DESCRIPTION
-wmsysmon is a dockable application for Windowmaker (and possibly Afterstep). It monitors Memory, Swap, Disk IO, uptime and
-interrupts.
+.B wmsysmon
+is a dockable application for Windowmaker (and possibly Afterstep). It monitors Memory, Swap, Disk IO, uptime and interrupts.
-.SH ENVIRONMENT
-Requires:
-.RS
-.I libc6 (>= 2.2.2-2)
- GNU C Library: Shared libraries and Timezone data
+.SH OPTIONS
+.TP
+.BI \-display <display name>
+Sets the display where wmsysmon will appear.
+.TP
+.BI \-geometry +Xpos+Ypos
+Set the position for wmsysmon.
+.TP
+.BI \-r updateRate
+Sets the update rate for wmsysmon.
+.TP
+.B \-l
+Set blinky lights on.
+.TP
+.B \-h
+Show the help screen.
+.TP
+.B \-v
+Print wmsysmon's version number.
-.I xlibs (>= 4.0.1-11)
- X Window System client libraries
-.RE
+.SH SEE ALSO
+.BR Website
+<ftp://gnugeneration.com/pub/Linux/wmsysmon>
.SH AUTHOR
-Norbert Tretkowski is responsible for this Debian package.
-.SH "SEE ALSO"
+wmsysmon was written by Dave Clark <clarkd at skynet.ca> and Vito Caputo
+<swivel at gnugeneration.com>.
+This manual page was written by Luca Bedogni <me at lucabedogni.it>, for the
+Debian project (but may be used by others).
diff --git a/src/Makefile b/src/Makefile
index 334f701..c167d22 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -18,4 +18,4 @@ clean:
rm -f $(OBJS) $(BIN)
install:
- install -g root -o root $(BIN) ../debian/tmp/usr/bin
+ install -g root -o root $(BIN) /usr/local/bin
diff --git a/src/wmsysmon.c b/src/wmsysmon.c
index d2c040c..b780ead 100644
--- a/src/wmsysmon.c
+++ b/src/wmsysmon.c
@@ -288,7 +288,6 @@ void wmsysmon_routine(int argc, char **argv)
#ifdef MONDEBUG
printf("got: %i\n", Event.type);
#endif
- break;
}
}
--
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