19 files changed, 251 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 38840ab..bd6ca1c 100644
--- a/Makefile
+++ b/Makefile
@@ -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
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 0000000..aadf5e9
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,56 @@
+nyancat (1.2.1-1) unstable; urgency=low
+
+  * New upstream release
+    - Fix hyphen-used-as-minus-sign errors in manpage. Thanks to Jakub Wilk
+      for reporting.
+  * Remove debian/nyancat.1
+    - Nyancat manpage has been pushed upstream
+
+ -- Jonathan McCrohan <jmccrohan@gmail.com>  Thu, 04 Jul 2013 00:57:22 +0100
+
+nyancat (1.2-1) unstable; urgency=low
+
+  * New upstream release
+    - Remove support for toaruos
+    - Rename animation.h to animation.c
+  * Upload to unstable
+  * Switch from git snapshots to upstream tarball releases
+    - Add debian/watch, remove old watchfile lintian override
+  * Bump Standards-Version to 3.9.4
+    - No changes required
+
+ -- Jonathan McCrohan <jmccrohan@gmail.com>  Mon, 01 Jul 2013 23:05:20 +0100
+
+nyancat (1.1+git20130307.43097eb-1) experimental; urgency=low
+
+  * New upstream snapshot
+    - Add support for the Suckless terminal
+    - Changed color palette to 256 color mode
+    - Fix potential bug in option processing code
+    - Add CHANGELOG file
+  * Update 01-nyancat-debhelper.patch to reflect upstream Makefile changes
+
+ -- Jonathan McCrohan <jmccrohan@gmail.com>  Thu, 14 Mar 2013 22:20:45 +0000
+
+nyancat (1.0+git20120523.99dc310-1) unstable; urgency=low
+
+  * New upstream snapshot
+    - Fixes buildflags being incorrectly passed
+    - Pushed nyancat manpage upstream; Removed Debian copy
+  * Switch to debhelper v9
+  * Use reconf-inetd to provide nyancat-server configs
+    - Provide nyancat-server as symlink to nyancat
+    - Add versioned dependency on nyancat
+    - Remove now redundant nyancat-server manpage and postrm
+    - Update package description to reflect this switch
+    - Update postinst to aid transition to reconf-inetd
+    - Add IPv6 support
+
+ -- Jonathan McCrohan <jmccrohan@gmail.com>  Tue, 05 Jun 2012 02:40:11 +0100
+
+nyancat (0.1+git20120401.5a88b86-1) unstable; urgency=low
+
+  * Initial release (Closes: #661565)
+   - Many thanks to Jakub Wilk for sponsoring this package. 
+
+ -- Jonathan McCrohan <jmccrohan@gmail.com>  Thu, 19 Apr 2012 23:01:49 +0100
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 0000000..ec63514
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+9
diff --git a/debian/control b/debian/control
new file mode 100644
index 0000000..e7686cd
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,28 @@
+Source: nyancat
+Section: misc
+Priority: extra
+Maintainer: Jonathan McCrohan <jmccrohan@gmail.com>
+Build-Depends: debhelper (>= 9)
+Standards-Version: 3.9.4
+Homepage: https://github.com/klange/nyancat
+
+Package: nyancat
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: Animated terminal Nyancat
+ nyancat is a program to display an animated poptart cat in your terminal.
+ .
+ This is a standalone program only. To serve nyancat to many users, the
+ nyancat-server package is required.
+
+Package: nyancat-server
+Architecture: all
+Depends: nyancat (>= ${source:Version}), openbsd-inetd | inet-superserver, reconf-inetd, ${misc:Depends}
+Conflicts: telnetd
+Description: Animated terminal Nyancat server configurations
+ nyancat-server contains the configuations required to quickly set up a nyancat
+ server. This allows the animated poptart cat to be served to many users via
+ telnet.
+ .
+ Installing this package will automatically configure and activate a nyancat
+ telnet server.
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 0000000..1394bb5
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,51 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: nyancat
+Source: https://github.com/klange/nyancat
+
+Files: *
+Copyright: 2011-2012 Kevin Lange <k@dakko.us>
+           2011 Peter Hazenberg <peter@haas-en-berg.nl>
+           2011 Aaron Peschel <aaron.peschel@gmail.com>
+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. 
+
+Files: debian/*
+Copyright: 2012 Jonathan McCrohan <jmccrohan@gmail.com>
+License: GPL-2+
+ This package is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+ .
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
diff --git a/debian/docs b/debian/docs
new file mode 100644
index 0000000..b43bf86
--- /dev/null
+++ b/debian/docs
@@ -0,0 +1 @@
+README.md
diff --git a/debian/get-git-source.sh b/debian/get-git-source.sh
new file mode 100755
index 0000000..db95d74
--- /dev/null
+++ b/debian/get-git-source.sh
@@ -0,0 +1,25 @@
+#!/bin/sh
+
+BASE_REL=$(dpkg-parsechangelog 2>/dev/null | sed -ne 's/Version: \([0-9.]\+\)+\?.*/\1/p')
+OLDDIR=${PWD}
+GOS_DIR=${OLDDIR}/get-orig-source
+GIT_COMMIT='git log --no-color -1 --oneline | cut -d" " -f1'
+GIT_DATE='git log --no-color -1 --date=iso | sed -ne "s/Date:\s\+\(.*\).*/\1/p" | cut -d" " -f1 | tr -d "-"'
+
+if [ -z ${BASE_REL} ]; then
+	echo 'Please run this script from the sources root directory.'
+	exit 1
+fi
+
+
+rm -rf ${GOS_DIR}
+mkdir ${GOS_DIR} && cd ${GOS_DIR}
+git clone git://github.com/klange/nyancat.git
+cd nyancat/
+NYANCAT_GIT_COMMIT=$(eval "${GIT_COMMIT}")
+NYANCAT_GIT_DATE=$(eval "${GIT_DATE}")
+cd .. && tar cf \
+	${OLDDIR}/nyancat_${BASE_REL}+git${NYANCAT_GIT_DATE}.${NYANCAT_GIT_COMMIT}.orig.tar \
+	nyancat --exclude-vcs && gzip -9fn \
+	${OLDDIR}/nyancat_${BASE_REL}+git${NYANCAT_GIT_DATE}.${NYANCAT_GIT_COMMIT}.orig.tar
+rm -rf ${GOS_DIR}
diff --git a/debian/nyancat-server.install b/debian/nyancat-server.install
new file mode 100644
index 0000000..afd8833
--- /dev/null
+++ b/debian/nyancat-server.install
@@ -0,0 +1,2 @@
+debian/reconf-inetd/nyancat-server.tcp usr/share/reconf-inetd/
+debian/reconf-inetd/nyancat-server.tcp6 usr/share/reconf-inetd/
diff --git a/debian/nyancat-server.links b/debian/nyancat-server.links
new file mode 100644
index 0000000..f4b78e2
--- /dev/null
+++ b/debian/nyancat-server.links
@@ -0,0 +1,2 @@
+usr/bin/nyancat usr/bin/nyancat-server
+/usr/share/man/man1/nyancat.1.gz /usr/share/man/man1/nyancat-server.1.gz
diff --git a/debian/nyancat-server.postinst b/debian/nyancat-server.postinst
new file mode 100644
index 0000000..757eea5
--- /dev/null
+++ b/debian/nyancat-server.postinst
@@ -0,0 +1,28 @@
+#!/bin/sh
+
+set -e
+
+OLD_NYANCAT_ENTRY="telnet		stream	tcp	nowait	nobody	/usr/bin/nyancat	nyancat -t"
+RELEASE="1.0+git20120523.99dc310-1"
+
+case "$1" in
+	configure)
+		# if upgrading from previous non reconf-inetd version
+		if dpkg --compare-versions "$2" lt-nl "$RELEASE"; then
+			# remove previous update-inetd entry if unmodified
+			if fgrep -qx "#<off># $OLD_NYANCAT_ENTRY" /etc/inetd.conf || \
+				fgrep -qx "$OLD_NYANCAT_ENTRY" /etc/inetd.conf; then
+					if [ -x /usr/sbin/update-inetd ]; then
+						# remove nyancat reconf-inetd entries
+						update-inetd --multi --pattern nyancat --remove telnet || true
+						if [ -x /usr/sbin/reconf-inetd ]; then
+							# add the nyancat-server entries back again
+							reconf-inetd || true
+						fi
+					fi
+				fi
+		fi
+	;;
+esac
+
+#DEBHELPER#
diff --git a/debian/nyancat.install b/debian/nyancat.install
new file mode 100644
index 0000000..11fd9e1
--- /dev/null
+++ b/debian/nyancat.install
@@ -0,0 +1 @@
+usr/bin/nyancat
diff --git a/debian/nyancat.manpages b/debian/nyancat.manpages
new file mode 100644
index 0000000..3ca437e
--- /dev/null
+++ b/debian/nyancat.manpages
@@ -0,0 +1 @@
+nyancat.1
diff --git a/debian/patches/01-nyancat-debhelper.patch b/debian/patches/01-nyancat-debhelper.patch
new file mode 100644
index 0000000..4f3b38d
--- /dev/null
+++ b/debian/patches/01-nyancat-debhelper.patch
@@ -0,0 +1,21 @@
+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,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
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..b60c10c
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+01-nyancat-debhelper.patch
diff --git a/debian/reconf-inetd/nyancat-server.tcp b/debian/reconf-inetd/nyancat-server.tcp
new file mode 100644
index 0000000..df12cc2
--- /dev/null
+++ b/debian/reconf-inetd/nyancat-server.tcp
@@ -0,0 +1,9 @@
+service telnet
+{
+	socket_type = stream
+	protocol = tcp
+	wait = no
+	user = nobody
+	server = /usr/bin/nyancat-server
+	server_args = nyancat -t
+}
diff --git a/debian/reconf-inetd/nyancat-server.tcp6 b/debian/reconf-inetd/nyancat-server.tcp6
new file mode 100644
index 0000000..a7285b5
--- /dev/null
+++ b/debian/reconf-inetd/nyancat-server.tcp6
@@ -0,0 +1,9 @@
+service telnet
+{
+	socket_type = stream
+	protocol = tcp6
+	wait = no
+	user = nobody
+	server = /usr/bin/nyancat-server
+	server_args = nyancat -t
+}
diff --git a/debian/rules b/debian/rules
new file mode 100755
index 0000000..4c053b9
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,11 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+get-orig-source:
+	debian/get-git-source.sh
+
+%:
+	dh $@ 
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 0000000..f4e5dac
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,2 @@
+version=3
+https://github.com/klange/nyancat/tags .*/(\d[\d\.]+)\.tar\.gz