diff options
| author | Jonathan McCrohan <jmccrohan@gmail.com> | 2013-03-10 00:05:39 +0000 |
|---|---|---|
| committer | Jonathan McCrohan <jmccrohan@gmail.com> | 2013-03-14 22:17:37 +0000 |
| commit | 30ea534e61594cbe41651e8110aa5ead2e947ed6 (patch) | |
| tree | 1105e1b25aecdd072e8fb9b02a4291a86ba713e6 /debian | |
| parent | af6bfbc44713ed2c19a81aac88bb0e3eb9d8aa20 (diff) | |
| parent | 43097ebfc2bc9bc0f721f5f80dc1aede1f7e10d7 (diff) | |
| download | nyancat-30ea534e61594cbe41651e8110aa5ead2e947ed6.tar.gz | |
Merge branch 'master' of git://github.com/klange/nyancat
Conflicts:
Makefile
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/patches/01-nyancat-debhelper.patch | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/debian/patches/01-nyancat-debhelper.patch b/debian/patches/01-nyancat-debhelper.patch index e23f98a..4f3b38d 100644 --- a/debian/patches/01-nyancat-debhelper.patch +++ b/debian/patches/01-nyancat-debhelper.patch @@ -1,15 +1,21 @@ -Description: Add $(DESTDIR) to install path - Debhelper doesn't like hardcoded install paths. +Description: Makefile fixes + Add $(DESTDIR) to install path. Debhelper doesn't like hardcoded + install paths. + . + Debhelper already installs the manpage for us. No need for second + install in Makefile. Author: Jonathan McCrohan <jmccrohan@gmail.com> Date: Tue, 17 Apr 2012 13:32:20 +0100 +Last-Update: 2013-03-12 --- --- nyancat-0.1+git20120401.5a88b86.orig/Makefile +++ nyancat-0.1+git20120401.5a88b86/Makefile -@@ -33,6 +33,6 @@ distcheck: $(distdir).tar.gz +@@ -33,7 +33,6 @@ distcheck: $(distdir).tar.gz @echo "*** Package $(distdir).tar.gz is ready for distribution." install: all - install src/nyancat /usr/bin/${package} +- gzip -9 -c < nyancat.1 > /usr/share/man/man1/nyancat.1.gz + install -Dm 0755 src/nyancat $(DESTDIR)/usr/bin/${package} .PHONY: FORCE all clean check dist distcheck install |