[Pkg-wmaker-commits] [wmsysmon] 12/37: Imported Debian patch 0.7.7-7

[Doug Torrance]

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

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

commit f8ab792f0f55259561e53941d65715b81fa3af7d
Author: Luca Bedogni <me at lucabedogni.it>
Date:   Thu Aug 16 16:09:43 2007 +0200

    Imported Debian patch 0.7.7-7
---
 debian/changelog                        |  9 +++++++++
 debian/menu                             |  4 ++--
 debian/patches/00list                   |  1 +
 debian/patches/04-makefile-strip.dpatch | 18 ++++++++++++++++++
 debian/rules                            |  2 +-
 debian/watch                            |  4 ++++
 6 files changed, 35 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8f41887..7cf501f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+wmsysmon (0.7.7-7) unstable; urgency=low
+
+  * Added the watch file
+  * Deleted automatic strip (Closes: #438276)
+  * Modified debian/menu to move application in Apps/System/Monitoring 
+  * Modified debian/changelog for not ignoring errors on make clean.
+
+ -- Luca Bedogni <me at lucabedogni.it>  Thu, 16 Aug 2007 16:09:43 +0200
+
 wmsysmon (0.7.7-6) unstable; urgency=low
 
   * Removed a gcc flag (-m486) for a correct build on all architectures
diff --git a/debian/menu b/debian/menu
index db5b0d4..235d2df 100644
--- a/debian/menu
+++ b/debian/menu
@@ -1,2 +1,2 @@
-?package(wmsysmon):needs="X11" section="Apps/System" \
-  title="wmsysmon" command="/usr/bin/wmsysmon"
+?package(wmsysmon): needs="X11" section="Applications/System/Monitoring" \
+title="wmsysmon" command="/usr/bin/wmsysmon"
diff --git a/debian/patches/00list b/debian/patches/00list
index 5c72282..900b2b4 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -1,3 +1,4 @@
 01-break.dpatch
 02-output.dpatch
 03-src_makefile.dpatch
+04-makefile-strip.dpatch
diff --git a/debian/patches/04-makefile-strip.dpatch b/debian/patches/04-makefile-strip.dpatch
new file mode 100644
index 0000000..290edf9
--- /dev/null
+++ b/debian/patches/04-makefile-strip.dpatch
@@ -0,0 +1,18 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 04-makefile-strip.dpatch by Luca Bedogni <me at lucabedogni.it>
+##
+## DP: Delete automatic stripping of binary
+
+ at DPATCH@
+
+--- wmsysmon-0.7.7/Makefile	2007-08-16 16:15:32.000000000 +0200
++++ wmsysmon-0.7.7/Makefile	2007-08-16 16:14:27.000000000 +0200
+@@ -1,7 +1,7 @@
+ CC = gcc
+ 
+ LIBDIR += -L/usr/X11R6/lib
+-LDFLAGS += -lXpm -lXext -lX11 -lm -s
++LDFLAGS += -lXpm -lXext -lX11 -lm
+ #CFLAGS = -g #-DMONDEBUG
+ CFLAGS += -Wall -O3 -fomit-frame-pointer -I/usr/X11R6/include #-DHI_INTS #undefine HI_INTS if your x86 SMP or alpha
+ 
diff --git a/debian/rules b/debian/rules
index ca6aeff..62ca277 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,7 +18,7 @@ clean: unpatch
 	rm -f build-stamp
 
 	# Add here commands to clean up after the build process.
-	-$(MAKE) clean
+	[ ! -f Makefile ] || $(MAKE) clean
 
 	dpatch deapply-all
 
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 0000000..9ed56c6
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,4 @@
+version=3
+
+# Uncomment to find new files on sourceforge, for debscripts >= 2.9
+http://gnugeneration.com/software/wmsysmon/wmsysmon-(.*)\.tar.gz

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