1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90
|
diff -ruN mrtgutils-0.2/Makefile mrtgutils-0.2.1/Makefile
--- mrtgutils-0.2/Makefile Mon Mar 5 03:02:17 2001
+++ mrtgutils-0.2.1/Makefile Sat Apr 14 21:20:09 2001
@@ -3,8 +3,12 @@
VERSION = 0.1
COBJS = uptime.o util.o
-TARGETS = mrtg-load mrtg-ip-acct mrtg-apache mrtg-sensors
-MANPAGES = mrtg-load.1 mrtg-ip-acct.1 mrtg-apache.1 mrtg-sensors.1
+TARGETS = mrtg-load mrtg-ip-acct mrtg-apache
+MANPAGES = mrtg-load.1 mrtg-ip-acct.1 mrtg-apache.1
+ifeq ($(WITH_SENSORS),1)
+TARGETS += mrtg-sensors
+MANPAGES += mrtg-sensors.1
+endif
%.o: %.c
$(CC) $(CFLAGS) -c $<
diff -ruN mrtgutils-0.2/debian/changelog mrtgutils-0.2.1/debian/changelog
--- mrtgutils-0.2/debian/changelog Mon Mar 5 03:09:32 2001
+++ mrtgutils-0.2.1/debian/changelog Sat Apr 14 21:30:25 2001
@@ -1,3 +1,12 @@
+mrtgutils (0.2.1) unstable; urgency=low
+
+ * NMU
+ * debian/rules, Makefile: Use sensors only on i386 (closes: bug#88627)
+ * debian/rules: add support for debug thingie in DEB_* enviroment
+ variables.
+
+ -- Marcelo E. Magallon <mmagallo@debian.org> Sat, 14 Apr 2001 21:30:17 +0200
+
mrtgutils (0.2) unstable; urgency=low
* oops, left out the mrtg-sensors man page...
diff -ruN mrtgutils-0.2/debian/control mrtgutils-0.2.1/debian/control
--- mrtgutils-0.2/debian/control Sun Mar 4 08:16:41 2001
+++ mrtgutils-0.2.1/debian/control Sat Apr 14 21:23:00 2001
@@ -1,12 +1,14 @@
Source: mrtgutils
Section: net
Priority: optional
-Build-Depends: debhelper, libsensors-dev
+Build-Depends: debhelper, libsensors-dev [i386]
Maintainer: Randolph Chung <tausq@debian.org>
-Standards-Version: 3.0.1.1
+Standards-Version: 3.1.0
Package: mrtgutils
Architecture: any
+Priority: optional
+Section: net
Depends: ${shlibs:Depends}
Suggests: lm-sensors, mrtg
Description: Utilities to generate statistics for mrtg
diff -ruN mrtgutils-0.2/debian/rules mrtgutils-0.2.1/debian/rules
--- mrtgutils-0.2/debian/rules Sun Jan 30 06:24:45 2000
+++ mrtgutils-0.2.1/debian/rules Sat Apr 14 21:38:27 2001
@@ -10,12 +10,23 @@
# This is the debhelper compatability version to use.
export DH_COMPAT=1
+CFLAGS = -O2 -Wall
+ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
+CFLAGS += -g
+endif
+
+ifeq ($(DEB_HOST_ARCH), i386)
+WITH_SENSORS=1
+else
+WITH_SENSORS=0
+endif
+
build: build-stamp
build-stamp:
dh_testdir
# Add here commands to compile the package.
- $(MAKE)
+ $(MAKE) WITH_SENSORS=$(WITH_SENSORS) CFLAGS="$(CFLAGS)"
touch build-stamp
@@ -25,7 +36,7 @@
rm -f build-stamp install-stamp
# Add here commands to clean up after the build process.
- -$(MAKE) clean
+ -$(MAKE) clean WITH_SENSORS=1
dh_clean
|