Hi,

Fixed a couple of extra details, so attached is a new diff for 
my multimon 1.0-4.1 NMU.
diff -u multimon-1.0/debian/control multimon-1.0/debian/control
--- multimon-1.0/debian/control
+++ multimon-1.0/debian/control
@@ -2,7 +2,7 @@
 Section: hamradio
 Priority: optional
 Maintainer: A. Maitland Bottoms <[EMAIL PROTECTED]>
-Build-Depends: debhelper, libx11-dev, x-dev
+Build-Depends: debhelper, libx11-dev, x11proto-core-dev
 Standards-Version: 3.6.2.0
 
 Package: multimon
diff -u multimon-1.0/debian/changelog multimon-1.0/debian/changelog
--- multimon-1.0/debian/changelog
+++ multimon-1.0/debian/changelog
@@ -1,3 +1,14 @@
+multimon (1.0-4.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Update build depend from x-dev to x11proto-core-dev.
+  * Replace -m486 with -march=i486 in CGLAGS to get it building with GCC 4.3.
+    Patch by Evgeni Golov. (Closes: #474873)
+  * Move compat version to debian/compat.
+  * Make clean target do not ignore all errors.
+
+ -- Ana Beatriz Guerrero Lopez <[EMAIL PROTECTED]>  Wed, 23 Apr 2008 20:07:45 +0200
+
 multimon (1.0-4) unstable; urgency=low
 
   * Update standards version, use non-native package format
diff -u multimon-1.0/debian/rules multimon-1.0/debian/rules
--- multimon-1.0/debian/rules
+++ multimon-1.0/debian/rules
@@ -5,9 +5,6 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-# This is the debhelper compatability version to use.
-export DH_COMPAT=4
-
 build: build-stamp
 build-stamp:
 	dh_testdir
@@ -22,7 +19,7 @@
 	rm -f build-stamp
 
 	# Add here commands to clean up after the build process.
-	-$(MAKE) clean
+	[ ! -f Makefile ] || $(MAKE) clean
 	rm -rf bin*
 	dh_clean
 
diff -u multimon-1.0/Makefile multimon-1.0/Makefile
--- multimon-1.0/Makefile
+++ multimon-1.0/Makefile
@@ -17,7 +17,7 @@
 CFLAGS		+=-O3
 endif
 ifeq ($(ARCHITECTURE),i386)
-CFLAGS		+=  -m486 -falign-loops=2 -falign-jumps=2 \
+CFLAGS		+=  -march=i486 -falign-loops=2 -falign-jumps=2 \
 		  -falign-functions=2 -DARCH_I386
 endif
 LDFLAGSX	=-lX11 -L/usr/X11R6/lib
only in patch2:
unchanged:
--- multimon-1.0.orig/debian/compat
+++ multimon-1.0/debian/compat
@@ -0,0 +1 @@
+4

Reply via email to