From ddce82aa1eb427f0fc4c2c30b531cafb6ff3bd0f Mon Sep 17 00:00:00 2001 From: Jonathan McCrohan Date: Wed, 7 Mar 2012 22:29:17 +0000 Subject: Clean up dh_make mess. Getting there.... --- debian/changelog | 4 +-- debian/control | 2 +- debian/copyright | 39 ++++++++++++++++-------- debian/manpage.1.ex | 19 ++++-------- debian/patches/01-nyancat-make-install.patch | 44 ++++++++++++++++++++++++++++ debian/patches/series | 1 + 6 files changed, 80 insertions(+), 29 deletions(-) create mode 100644 debian/patches/01-nyancat-make-install.patch create mode 100644 debian/patches/series diff --git a/debian/changelog b/debian/changelog index 9c0095a..0787786 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,5 @@ -nyancat (0.1-1) unstable; urgency=low +nyancat (0.1~git20120222-1) unstable; urgency=low - * Initial release (Closes: #nnnn) + * Initial release (Closes: #661565) -- Jonathan McCrohan Tue, 21 Feb 2012 12:10:45 +0000 diff --git a/debian/control b/debian/control index 8854d65..f06f111 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: games Priority: optional Maintainer: Jonathan McCrohan Build-Depends: debhelper (>= 8.0.0) -Standards-Version: 3.9.2 +Standards-Version: 3.9.3 Homepage: https://github.com/klange/nyancat Package: nyancat diff --git a/debian/copyright b/debian/copyright index b472f88..b494750 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,18 +1,36 @@ Format: http://dep.debian.net/deps/dep5 Upstream-Name: nyancat -Source: +Source: http://miku.acm.uiuc.edu/ Files: * -Copyright: - -License: - - +Copyright: 2011-2012 Kevin Lange + 2011 Peter Hazenberg + 2011 Aaron Peschel +License: NCSA + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to + deal with the Software without restriction, including without limitation the + rights to use, copy, modify, merge, publish, distribute, sublicense, and/or + sell copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + 1. Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimers. + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimers in the + documentation and/or other materials provided with the distribution. + 3. Neither the names of the Association for Computing Machinery, Kevin + Lange, nor the names of its contributors may be used to endorse + or promote products derived from this Software without specific prior + written permission. . - + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + CONTRIBUTORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS + WITH THE SOFTWARE. -# If you want to use GPL v2 or later for the /debian/* files use -# the following clauses, or change it to suit. Delete these two lines Files: debian/* Copyright: 2012 Jonathan McCrohan License: GPL-2+ @@ -31,6 +49,3 @@ License: GPL-2+ . On Debian systems, the complete text of the GNU General Public License version 2 can be found in "/usr/share/common-licenses/GPL-2". - -# Please also look if there are files or directories which have a -# different copyright/license attached and list them here. diff --git a/debian/manpage.1.ex b/debian/manpage.1.ex index ed420ea..5b99082 100644 --- a/debian/manpage.1.ex +++ b/debian/manpage.1.ex @@ -1,10 +1,4 @@ -.\" Hey, EMACS: -*- nroff -*- -.\" First parameter, NAME, should be all caps -.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection -.\" other parameters are allowed: see man(7), man(1) -.TH NYANCAT SECTION "February 21, 2012" -.\" Please adjust this date whenever revising the manpage. -.\" +.TH NYANCAT SECTION "March, 2012" .\" Some roff macros, for reference: .\" .nh disable hyphenation .\" .hy enable hyphenation @@ -16,7 +10,7 @@ .\" .sp insert n+1 empty lines .\" for manpage-specific macros, see man(7) .SH NAME -nyancat \- program to do something +nyancat \- terminal-based Pop Tart Cat animation .SH SYNOPSIS .B nyancat .RI [ options ] " files" ... @@ -30,9 +24,6 @@ and .B bar commands. .PP -.\" TeX users may be more comfortable with the \fB\fP and -.\" \fI\fP escape sequences to invode bold face and italics, -.\" respectively. \fBnyancat\fP is a program that... .SH OPTIONS These programs follow the usual GNU command line syntax, with long @@ -40,8 +31,8 @@ options starting with two dashes (`-'). A summary of options is included below. For a complete description, see the Info files. .TP -.B \-h, \-\-help -Show summary of options. +.B \-t, +Enable telnet mode. .TP .B \-v, \-\-version Show version of program. @@ -53,7 +44,7 @@ The programs are documented fully by .IR "The Rise and Fall of a Fooish Bar" , available via the Info system. .SH AUTHOR -nyancat was written by . +nyancat was written by Kevin Lange. .PP This manual page was written by Jonathan McCrohan , for the Debian project (and may be used by others). diff --git a/debian/patches/01-nyancat-make-install.patch b/debian/patches/01-nyancat-make-install.patch new file mode 100644 index 0000000..6697860 --- /dev/null +++ b/debian/patches/01-nyancat-make-install.patch @@ -0,0 +1,44 @@ +diff --git Makefile Makefile +index 9ac517f..862f69b 100644 +--- Makefile ++++ Makefile +@@ -3,33 +3,12 @@ version = 0.1 + tarname = $(package) + distdir = $(tarname)-$(version) + +-all clean check nyancat: +- cd src && $(MAKE) $@ +- +-dist: $(distdir).tar.gz +- +-$(distdir).tar.gz: $(distdir) +- tar chof - $(distdir) | gzip -9 -c > $@ +- rm -rf $(distdir) ++SRCDIR = src + +-$(distdir): FORCE +- mkdir -p $(distdir)/src +- cp Makefile $(distdir) +- cp src/Makefile $(distdir)/src +- cp src/nyancat.c $(distdir)/src +- cp src/animation.h $(distdir)/src +- cp src/telnet.h $(distdir)/src +- +-FORCE: +- -rm $(distdir).tar.gz >/dev/null 2>&1 +- -rm -rf $(distdir) >/dev/null 2>&1 ++all clean check nyancat: ++ cd $(SRCDIR) && $(MAKE) $@ + +-distcheck: $(distdir).tar.gz +- gzip -cd $(distdir).tar.gz | tar xvf - +- cd $(distdir) && $(MAKE) all +- cd $(distdir) && $(MAKE) check +- cd $(distdir) && $(MAKE) clean +- rm -rf $(distdir) +- @echo "*** Package $(distdir).tar.gz is ready for distribution." ++install : ++ install -m 0755 $(SRCDIR)/nyancat /usr/bin/nyancat + +-.PHONY: FORCE all clean check dist distcheck ++.PHONY: all clean check install diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..b90ab15 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +01-nyancat-make-install.patch -- cgit v1.2.3