From 5a2c591749873d93e72d6c1e9443516c4115a86b Mon Sep 17 00:00:00 2001 From: Jonathan McCrohan Date: Tue, 17 Apr 2012 13:34:22 +0100 Subject: Update 01-nyancat-debhelper.patch description --- debian/changelog | 2 +- debian/patches/01-nyancat-debhelper.patch | 15 +++++++++++++++ debian/patches/01-nyancat-make-install.patch | 20 -------------------- debian/patches/series | 2 +- 4 files changed, 17 insertions(+), 22 deletions(-) create mode 100644 debian/patches/01-nyancat-debhelper.patch delete mode 100644 debian/patches/01-nyancat-make-install.patch diff --git a/debian/changelog b/debian/changelog index 090a9b8..13bc8e4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,4 +2,4 @@ nyancat (0.1+git20120401.5a88b86-1) unstable; urgency=low * Initial release (Closes: #661565) - -- Jonathan McCrohan Sun, 08 Apr 2012 15:00:42 +0100 + -- Jonathan McCrohan Tue, 17 Apr 2012 13:32:46 +0100 diff --git a/debian/patches/01-nyancat-debhelper.patch b/debian/patches/01-nyancat-debhelper.patch new file mode 100644 index 0000000..e23f98a --- /dev/null +++ b/debian/patches/01-nyancat-debhelper.patch @@ -0,0 +1,15 @@ +Description: Add $(DESTDIR) to install path + Debhelper doesn't like hardcoded install paths. +Author: Jonathan McCrohan +Date: Tue, 17 Apr 2012 13:32:20 +0100 +--- +--- nyancat-0.1+git20120401.5a88b86.orig/Makefile ++++ nyancat-0.1+git20120401.5a88b86/Makefile +@@ -33,6 +33,6 @@ distcheck: $(distdir).tar.gz + @echo "*** Package $(distdir).tar.gz is ready for distribution." + + install: all +- install src/nyancat /usr/bin/${package} ++ install -Dm 0755 src/nyancat $(DESTDIR)/usr/bin/${package} + + .PHONY: FORCE all clean check dist distcheck install diff --git a/debian/patches/01-nyancat-make-install.patch b/debian/patches/01-nyancat-make-install.patch deleted file mode 100644 index 54c4a55..0000000 --- a/debian/patches/01-nyancat-make-install.patch +++ /dev/null @@ -1,20 +0,0 @@ -Description: Add $(DESTDIR) to install path - Required for debhelper dh_install - . - nyancat (0.1+git20120401.5a88b86-1) unstable; urgency=low - . - * Initial release (Closes: #661565) -Author: Jonathan McCrohan -Bug-Debian: http://bugs.debian.org/661565 - ---- ---- nyancat-0.1+git20120401.5a88b86.orig/Makefile -+++ nyancat-0.1+git20120401.5a88b86/Makefile -@@ -33,6 +33,6 @@ distcheck: $(distdir).tar.gz - @echo "*** Package $(distdir).tar.gz is ready for distribution." - - install: all -- install src/nyancat /usr/bin/${package} -+ install -Dm 0755 src/nyancat $(DESTDIR)/usr/bin/${package} - - .PHONY: FORCE all clean check dist distcheck install diff --git a/debian/patches/series b/debian/patches/series index b90ab15..b60c10c 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1 @@ -01-nyancat-make-install.patch +01-nyancat-debhelper.patch -- cgit v1.2.3