[Pkg-wmaker-commits] [wmsysmon] 11/37: Imported Debian patch 0.7.7-6

[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 9a0b6295354ab05abd0f66a991336fddbe2492a4
Author: Luca Bedogni <me at lucabedogni.it>
Date:   Wed Mar 21 22:46:25 2007 +0100

    Imported Debian patch 0.7.7-6
---
 Makefile                              | 2 +-
 debian/changelog                      | 7 +++++++
 debian/copyright                      | 5 ++---
 debian/menu                           | 2 +-
 debian/patches/03-src_makefile.dpatch | 9 +++++++++
 debian/rules                          | 1 -
 6 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index 2498ee4..09f3323 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@ CC = gcc
 LIBDIR += -L/usr/X11R6/lib
 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
+CFLAGS += -Wall -O3 -fomit-frame-pointer -I/usr/X11R6/include #-DHI_INTS #undefine HI_INTS if your x86 SMP or alpha
 
 BIN = src/wmsysmon
 OBJS =	src/wmgeneral.o \
diff --git a/debian/changelog b/debian/changelog
index 60507a6..8f41887 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+wmsysmon (0.7.7-6) unstable; urgency=low
+
+  * Removed a gcc flag (-m486) for a correct build on all architectures
+    (Closes: #415669)
+
+ -- Luca Bedogni <me at lucabedogni.it>  Wed, 21 Mar 2007 22:46:25 +0100
+
 wmsysmon (0.7.7-5) unstable; urgency=low
 
   * New Maintainer (Closes: #390871)
diff --git a/debian/copyright b/debian/copyright
index 722af05..763069d 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,10 +1,9 @@
 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 http://www.gnugeneration.com/software/wmsysmon.html.
 
 Upstream Authors: Dave Clark <clarkd at skynet.ca>
-		  Vito Caputo <swivel at gnugeneration.com>
+          Vito Caputo <swivel at gnugeneration.com>
 
 License:
 
diff --git a/debian/menu b/debian/menu
index a259871..db5b0d4 100644
--- a/debian/menu
+++ b/debian/menu
@@ -1,2 +1,2 @@
-?package(wmsysmon):needs=X11 section=Apps/System \
+?package(wmsysmon):needs="X11" section="Apps/System" \
   title="wmsysmon" command="/usr/bin/wmsysmon"
diff --git a/debian/patches/03-src_makefile.dpatch b/debian/patches/03-src_makefile.dpatch
index ec575f6..af79d47 100644
--- a/debian/patches/03-src_makefile.dpatch
+++ b/debian/patches/03-src_makefile.dpatch
@@ -7,6 +7,15 @@
 
 --- 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
+@@ -3,7 +3,7 @@
+ LIBDIR += -L/usr/X11R6/lib
+ 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
++CFLAGS += -Wall -O3 -fomit-frame-pointer -I/usr/X11R6/include #-DHI_INTS #undefine HI_INTS if your x86 SMP or alpha
+ 
+ BIN = wmsysmon
+ OBJS =	wmgeneral.o \
 @@ -17,5 +17,6 @@
  clean:
  	rm -f $(OBJS) $(BIN)
diff --git a/debian/rules b/debian/rules
index c7502e9..ca6aeff 100755
--- a/debian/rules
+++ b/debian/rules
@@ -46,7 +46,6 @@ binary-arch: build install
 	dh_installchangelogs ChangeLog
 	dh_installdocs
 	dh_installman debian/wmsysmon.1
-	dh_link
 	dh_strip
 	dh_installmenu
 	dh_compress

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