Package: xmon Severity: serious Tags: patch Hello,
xmon is still using debmake, which is deprecated. Attached is a patch to use debhelper instead. -- Julien Danjou // <[EMAIL PROTECTED]> http://julien.danjou.info // 9A0D 5FD9 EB42 22F6 8974 C95C A462 B51E C2FE E5CD // Ferns will rule the world.
diff -u xmon-1.5.6/xmon.man xmon-1.5.6/xmon.man
--- xmon-1.5.6/xmon.man
+++ xmon-1.5.6/xmon.man
@@ -1,4 +1,4 @@
-.TH xmon 1 "30 March 1996" "X Version 11"
+.TH xmon 1x "30 March 1996" "X Version 11"
.SH NAME
xmon \- interactive X protocol monitor
.SH SYNOPSIS
reverted:
--- xmon-1.5.6/debian/README.debian
+++ xmon-1.5.6.orig/debian/README.debian
@@ -1,10 +0,0 @@
-xmon for DEBIAN
-----------------------
-
-Don't forget to add an authentication cookie for your pseudo server
-before starting it:
-
-$ xauth add localhost:42 . `mcookie`
-$ xmonui | xmond -port 42
-
-Frederic Lepied <[EMAIL PROTECTED]>, Sun Oct 17 09:02:34 1999
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 (>> 4.0.0), libxaw7-dev, xutils
Package: xmon
Architecture: any
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,10 @@
+xmon (1.5.6-1.4) unstable; urgency=high
+
+ * Switch to debhelper
+ * Bump standards version
+
+ -- Julien Danjou <[EMAIL PROTECTED]> Fri, 19 May 2006 11:42:19 +0200
+
xmon (1.5.6-1.3) unstable; urgency=low
* Change priority to optional to match the archive overrides file;
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,77 @@
-# Made with the aid of debmake, by Christoph Lameter,
-# based on the sample debian/rules file for GNU hello by Ian Jackson.
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
-package=xmon
+CFLAGS = -Wall -g
-build:
- $(checkdir)
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+ CFLAGS += -O0
+else
+ CFLAGS += -O2
+endif
+
+configure: configure-stamp
+configure-stamp:
+ dh_testdir
+ # Add here commands to configure the package.
+
+ touch configure-stamp
+
+
+build: build-stamp
+
+build-stamp: configure-stamp
+ dh_testdir
+
+ # Add here commands to compile the package.
xmkmf -a
- make
- touch build
+ $(MAKE)
+
+ touch build-stamp
clean:
- $(checkdir)
- -make clean
+ dh_testdir
+ dh_testroot
+ rm -f build-stamp configure-stamp
+
+ # Add here commands to clean up after the build process.
+ -$(MAKE) clean
-rm -f build Makefile
-rm -f `find . -name "*~"`
- -rm -rf debian/tmp debian/files* core debian/substvars
+ -rm -rf core
+
+ dh_clean
-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/X11R6/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`"
+install: build
+ dh_testdir
+ dh_testroot
+ dh_clean -k
+ dh_installdirs
+
+ # Add here commands to install the package into debian/xmon.
+ $(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
+# dh_install
+ dh_installman
+ 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 configure
only in patch2:
unchanged:
--- xmon-1.5.6.orig/debian/README.Debian
+++ xmon-1.5.6/debian/README.Debian
@@ -0,0 +1,10 @@
+xmon for DEBIAN
+----------------------
+
+Don't forget to add an authentication cookie for your pseudo server
+before starting it:
+
+$ xauth add localhost:42 . `mcookie`
+$ xmonui | xmond -port 42
+
+Frederic Lepied <[EMAIL PROTECTED]>, Sun Oct 17 09:02:34 1999
only in patch2:
unchanged:
--- xmon-1.5.6.orig/debian/compat
+++ xmon-1.5.6/debian/compat
@@ -0,0 +1 @@
+4
only in patch2:
unchanged:
--- xmon-1.5.6.orig/debian/dirs
+++ xmon-1.5.6/debian/dirs
@@ -0,0 +1 @@
+usr/bin
only in patch2:
unchanged:
--- xmon-1.5.6.orig/debian/docs
+++ xmon-1.5.6/debian/docs
@@ -0,0 +1 @@
+README
signature.asc
Description: Digital signature
