On Sun, 16 Apr 2006 at 16:48:43 +0100, Simon McVittie wrote:
> The attached patch
Sorry, no patch was attached. It's attached to *this* message.
diff -ur xtrlock-2.0/debian/rules xtrlock-2.0-noimake/debian/rules
--- xtrlock-2.0/debian/rules 2002-09-01 05:42:32.000000000 +0100
+++ xtrlock-2.0-noimake/debian/rules 2006-04-16 14:01:19.000000000 +0100
@@ -11,8 +11,7 @@
build:
$(checkdir)
- xmkmf
- $(MAKE) CFLAGS="$(CFLAGS)" CDEBUGFLAGS="" xtrlock
+ $(MAKE) -f Makefile.noimake CFLAGS="$(CFLAGS)" CDEBUGFLAGS="" xtrlock
touch build
clean:
@@ -26,14 +25,14 @@
binary-arch: checkroot build
-rm -rf debian/tmp
- install -m 755 -d debian/tmp/usr/X11R6/bin debian/tmp/usr/X11R6/man/man1
+ install -m 755 -d debian/tmp/usr/bin debian/tmp/usr/share/man/man1
install -m 755 -d debian/tmp/usr/share/doc/xtrlock debian/tmp/DEBIAN
install -m 755 -d debian/tmp/usr/lib/menu
# has to be setgid shadow to support shadow passwords. --marekm
- install -m 755 xtrlock debian/tmp/usr/X11R6/bin/xtrlock
- $(STRIP) debian/tmp/usr/X11R6/bin/xtrlock
- install -m 644 xtrlock.man debian/tmp/usr/X11R6/man/man1/xtrlock.1x
- gzip -9v debian/tmp/usr/X11R6/man/man1/xtrlock.1x
+ install -m 755 xtrlock debian/tmp/usr/bin/xtrlock
+ $(STRIP) debian/tmp/usr/bin/xtrlock
+ install -m 644 xtrlock.man debian/tmp/usr/share/man/man1/xtrlock.1x
+ gzip -9v debian/tmp/usr/share/man/man1/xtrlock.1x
install -m 644 debian/changelog debian/tmp/usr/share/doc/xtrlock
install -m 644 debian/README.Debian debian/tmp/usr/share/doc/xtrlock
gzip -9v debian/tmp/usr/share/doc/xtrlock/*
@@ -42,12 +41,12 @@
install -m 644 debian/menu debian/tmp/usr/lib/menu/xtrlock
install -m 755 debian/postinst debian/postrm debian/tmp/DEBIAN
cp debian/control debian/tmp/DEBIAN/control
- dpkg-shlibdeps debian/tmp/usr/X11R6/bin/xtrlock
+ dpkg-shlibdeps debian/tmp/usr/bin/xtrlock
dpkg-gencontrol -isp
chown -R root.root debian/tmp
- chown root.shadow debian/tmp/usr/X11R6/bin/xtrlock
+ chown root.shadow debian/tmp/usr/bin/xtrlock
chmod -R g-w debian/tmp
- chmod 2755 debian/tmp/usr/X11R6/bin/xtrlock
+ chmod 2755 debian/tmp/usr/bin/xtrlock
dpkg --build debian/tmp ..
binary: binary-indep binary-arch
diff -ur xtrlock-2.0/Makefile.noimake xtrlock-2.0-noimake/Makefile.noimake
--- xtrlock-2.0/Makefile.noimake 1995-11-07 14:51:48.000000000 +0000
+++ xtrlock-2.0-noimake/Makefile.noimake 2006-04-16 14:07:09.000000000
+0100
@@ -13,7 +13,7 @@
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
-LDLIBS=-lX11
+LDLIBS=-lX11 -lcrypt
CC=gcc
CFLAGS=-Wall
INSTALL=install
@@ -23,7 +23,7 @@
xtrlock.o: xtrlock.c lock.bitmap mask.bitmap patchlevel.h
install: xtrlock
- $(INSTALL) -c -m 755 xtrlock /usr/bin/X11
+ $(INSTALL) -c -m 755 xtrlock /usr/bin/xtrlock
install.man:
- $(INSTALL) -c -m 644 xtrlock.man /usr/man/man1/xtrlock.1x
+ $(INSTALL) -c -m 644 xtrlock.man /usr/share/man/man1/xtrlock.1x
