Hello,
I'm doing an NMU of xinput to fix #367843 and #368274; diff attached.
Thanks,
Matej
diff -u xinput-1.2/debian/changelog xinput-1.2/debian/changelog
--- xinput-1.2/debian/changelog
+++ xinput-1.2/debian/changelog
@@ -1,3 +1,13 @@
+xinput (1.2-5.3) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Replace debmake with debhelper. Closes: #368274.
+ * debian/rules: Remove reference to /usr/X11R6. Closes: #367843.
+ * debian/prerm: Remove /usr/doc compatibility code.
+ * Conforms to Standards version 3.7.2.
+
+ -- Matej Vela <[EMAIL PROTECTED]> Mon, 5 Jun 2006 10:10:46 +0200
+
xinput (1.2-5.2) unstable; urgency=high
* Non-maintainer upload.
diff -u xinput-1.2/debian/rules xinput-1.2/debian/rules
--- xinput-1.2/debian/rules
+++ xinput-1.2/debian/rules
@@ -2,62 +2,52 @@
-# Sample debian.rules file - for GNU Hello (1.3).
-# Copyright 1994,1995 by Ian Jackson.
-# I hereby give you perpetual unlimited permission to copy,
-# modify and relicense this file, provided that you do not remove
- # my name from the file itself. (I assert my moral right of
-# paternity under the Copyright, Designs and Patents Act 1988.)
-# This file may have to be extensively modified
-#
-# Modified to be a prototype for debmake by Christoph Lameter <[EMAIL
PROTECTED]>
+# This file is public domain software, originally written by Joey Hess.
-package=xinput
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+build: build-stamp
+build-stamp:
+ dh_testdir
-build:
- $(checkdir)
xmkmf -a
- make
+ $(MAKE)
- touch build
+ touch build-stamp
clean:
- $(checkdir)
- -make clean
- -rm -f build Makefile
- -rm `find . -name "*~" -o -name "*.orig"`
- -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 644 `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 ChangeLog 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
-
-source diff:
- @echo >&2 'source and diff are obsolete - use dpkg-source -b'; false
-
-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) DESTDIR=$(CURDIR)/debian/xinput install install.man
+
+# Build architecture-independent files here.
+binary-indep: build install
+
+# Build architecture-dependent files here.
+binary-arch: build install
+ dh_testdir
+ dh_testroot
+ dh_installchangelogs ChangeLog
+ 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
diff -u xinput-1.2/debian/control xinput-1.2/debian/control
--- xinput-1.2/debian/control
+++ xinput-1.2/debian/control
@@ -2,8 +2,8 @@
Section: x11
Priority: optional
Maintainer: Frederic Lepied <[EMAIL PROTECTED]>
-Standards-Version: 3.5.8
-Build-Depends: libx11-dev, libxi-dev, xutils, debmake
+Standards-Version: 3.7.2
+Build-Depends: debhelper (>= 5), libx11-dev, libxi-dev, xutils
Package: xinput
Architecture: any
reverted:
--- xinput-1.2/debian/prerm
+++ xinput-1.2.orig/debian/prerm
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-if [ \( "$1" = "upgrade" -o "$1" = "remove" \) -a -L /usr/doc/xinput ]; then
- rm -f /usr/doc/xinput
-fi
-
only in patch2:
unchanged:
--- xinput-1.2.orig/debian/compat
+++ xinput-1.2/debian/compat
@@ -0,0 +1 @@
+5
