Source: xtrlock Version: 2.8 Tags: patch User: [email protected] Usertags: rebootstrap Control: block 873764 by -1
We want to remove xmkmf from Debian (see #873764), because it is unmaintained and breaks cross compilation. The attached patch reimplements the simple build system in debian/rules to remove the dependency on xmkmf. Please consider applying it. Helmut
diff --minimal -Nru xtrlock-2.8/debian/changelog xtrlock-2.8+nmu1/debian/changelog --- xtrlock-2.8/debian/changelog 2016-05-21 20:08:12.000000000 +0200 +++ xtrlock-2.8+nmu1/debian/changelog 2018-06-29 06:22:10.000000000 +0200 @@ -1,3 +1,10 @@ +xtrlock (2.8+nmu1) UNRELEASED; urgency=medium + + * Non-maintainer upload. + * Stop using xmkmf. (Closes: #-1) + + -- Helmut Grohne <[email protected]> Fri, 29 Jun 2018 06:22:10 +0200 + xtrlock (2.8) unstable; urgency=low * patch from Simon Tatham to add a -f option [fork, and return success diff --minimal -Nru xtrlock-2.8/debian/control xtrlock-2.8+nmu1/debian/control --- xtrlock-2.8/debian/control 2014-01-07 15:26:09.000000000 +0100 +++ xtrlock-2.8+nmu1/debian/control 2018-06-29 06:21:18.000000000 +0200 @@ -2,7 +2,7 @@ Maintainer: Matthew Vernon <[email protected]> Section: x11 Priority: optional -Build-Depends: libx11-dev, x11proto-core-dev, xutils-dev, dpkg-dev (>= 1.16.1~) +Build-Depends: libx11-dev, x11proto-core-dev, dpkg-dev (>= 1.16.1~) Standards-Version: 3.9.1 Package: xtrlock diff --minimal -Nru xtrlock-2.8/debian/rules xtrlock-2.8+nmu1/debian/rules --- xtrlock-2.8/debian/rules 2015-03-07 23:34:07.000000000 +0100 +++ xtrlock-2.8+nmu1/debian/rules 2018-06-29 06:21:04.000000000 +0200 @@ -2,10 +2,12 @@ # debian/rules file for xtrlock-2.0 # Based upon the sample debian.rules file by Ian Jackson. +include /usr/share/dpkg/architecture.mk +-include /usr/share/dpkg/buildtools.mk + package=xtrlock -arch=$(shell dpkg --print-architecture) -STRIP=strip +STRIP=$(DEB_HOST_GNU_TYPE)-strip DPKG_EXPORT_BUILDFLAGS = 1 export DEB_BUILD_MAINT_OPTIONS = hardening=+all @@ -15,8 +17,7 @@ build: $(checkdir) - xmkmf - $(MAKE) CFLAGS="$(CFLAGS)" CDEBUGFLAGS="" LOCAL_LDFLAGS="$(LDFLAGS)" xtrlock + $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) xtrlock.c -o xtrlock -lcrypt -lX11 touch build clean:
