Hello,
I'm doing an NMU of xmon to fix #368017; diff attached.
Thanks,
Matej
diff -u xmon-1.5.6/debian/changelog xmon-1.5.6/debian/changelog
--- xmon-1.5.6/debian/changelog
+++ xmon-1.5.6/debian/changelog
@@ -1,3 +1,14 @@
+xmon (1.5.6-1.5) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Use debhelper instead of debmake. Thanks to Julien Danjou for the
+ preliminary patch (I reversed several changes not really suited to an
+ NMU though). Closes: #368017.
+ * debian/rules: Add support for DEB_BUILD_OPTIONS=noopt.
+ * Conforms to Standards version 3.7.2.
+
+ -- Matej Vela <[EMAIL PROTECTED]> Sun, 28 May 2006 14:18:53 -0500
+
xmon (1.5.6-1.4) unstable; urgency=medium
* Non-maintainer upload.
diff -u xmon-1.5.6/debian/control xmon-1.5.6/debian/control
--- xmon-1.5.6/debian/control
+++ xmon-1.5.6/debian/control
@@ -2,8 +2,8 @@
Section: x11
Priority: optional
Maintainer: Filip Van Raemdonck <[EMAIL PROTECTED]>
-Standards-Version: 3.2.1.0
-Build-Depends: debmake, libxaw7-dev, xutils
+Standards-Version: 3.7.2
+Build-Depends: debhelper (>= 5), libxaw7-dev, xutils
Package: xmon
Architecture: any
diff -u xmon-1.5.6/debian/rules xmon-1.5.6/debian/rules
--- xmon-1.5.6/debian/rules
+++ xmon-1.5.6/debian/rules
@@ -2,51 +2,58 @@
-# Made with the aid of debmake, by Christoph Lameter,
-# based on the sample debian/rules file for GNU hello by Ian Jackson.
+# Sample debian/rules that uses debhelper.
+# This file is public domain software, originally written by Joey Hess.
-package=xmon
+CFLAGS = -Wall -g
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+ CFLAGS += -O0
+else
+ CFLAGS += -O2
+endif
+
+build: build-stamp
+build-stamp:
+ dh_testdir
-build:
- $(checkdir)
xmkmf -a
- make
- touch build
+ $(MAKE) CDEBUGFLAGS="$(CFLAGS)"
+
+ touch build-stamp
clean:
- $(checkdir)
- -make clean
- -rm -f build Makefile
- -rm -f `find . -name "*~"`
- -rm -rf debian/tmp debian/files* core debian/substvars
-
-binary-indep: checkroot build
- $(checkdir)
-# There are no architecture-independent files to be uploaded
-# generated by this package. If there were any they would be
-# made here.
-
-binary-arch: checkroot build
- $(checkdir)
- -rm -rf debian/tmp
- install -d debian/tmp
- make install install.man DESTDIR=`pwd`/debian/tmp
- chmod 0644 `pwd`/debian/tmp/usr/share/man/man*/*
-# Must have debmake installed for this to work. Otherwise please copy
-# /usr/bin/debstd into the debian directory and change debstd to debian/debstd
- debstd CHANGES README
- dpkg-gencontrol -isp
- chown -R root:root debian/tmp
- chmod -R go=rX debian/tmp
- dpkg --build debian/tmp ..
-
-define checkdir
- test -f debian/rules
-endef
-
-# Below here is fairly generic really
-
-binary: binary-indep binary-arch
-
-checkroot:
- $(checkdir)
- test root = "`whoami`"
+ dh_testdir
+ dh_testroot
+ rm -f build-stamp
+
+ [ ! -f Makefile ] || $(MAKE) distclean
+
+ dh_clean
+
+install: build
+ dh_testdir
+ dh_testroot
+ dh_clean -k
+ dh_installdirs
+
+ $(MAKE) install install.man DESTDIR=$(CURDIR)/debian/xmon
+
+# Build architecture-independent files here.
+binary-indep: build install
+# We have nothing to do by default.
+
+# Build architecture-dependent files here.
+binary-arch: build install
+ dh_testdir
+ dh_testroot
+ dh_installchangelogs CHANGES
+ dh_installdocs README
+ dh_link
+ dh_strip
+ dh_compress
+ dh_fixperms
+ dh_installdeb
+ dh_shlibdeps
+ dh_gencontrol
+ dh_md5sums
+ dh_builddeb
-.PHONY: binary binary-arch binary-indep clean checkroot
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install
only in patch2:
unchanged:
--- xmon-1.5.6.orig/debian/compat
+++ xmon-1.5.6/debian/compat
@@ -0,0 +1 @@
+5
