Merge lp:~kirkland/hockeypuck/packaging into lp:~hockeypuck/hockeypuck/trunk

[Dustin Kirkland ]

=== modified file 'debian/install'
--- debian/install	2012-12-11 02:58:17 +0000
+++ debian/install	2013-01-09 21:32:21 +0000
@@ -1,9 +1,4 @@
 gopath/bin/hockeypuck-mgo /usr/bin/
 gopath/bin/hockeypuck-load /usr/bin/
-instroot/etc/hockeypuck/hockeypuck.conf /etc/hockeypuck
-instroot/etc/init/hockeypuck-mgo.conf /etc/init
-instroot/usr/share/man/man1/hockeypuck-mgo.1 /usr/share/man/man1
-instroot/usr/share/man/man1/hockeypuck-load.1 /usr/share/man/man1
-instroot/var/lib/hockeypuck/www/css /var/lib/hockeypuck/www
-instroot/var/lib/hockeypuck/www/templates /var/lib/hockeypuck/www
-instroot/var/lib/hockeypuck/www/fonts/Arvo /var/lib/hockeypuck/www/fonts
+instroot/etc/hockeypuck /etc/
+instroot/var/lib/hockeypuck/www /var/lib/hockeypuck/

=== added file 'debian/manpages'
--- debian/manpages	1970-01-01 00:00:00 +0000
+++ debian/manpages	2013-01-09 21:32:21 +0000
@@ -0,0 +1,2 @@
+instroot/usr/share/man/man1/hockeypuck-mgo.1
+instroot/usr/share/man/man1/hockeypuck-load.1

=== modified file 'debian/rules'
--- debian/rules	2012-11-27 04:20:15 +0000
+++ debian/rules	2013-01-09 21:32:21 +0000
@@ -1,13 +1,4 @@
 #!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
 
 %:
-	dh $@ 
+	dh $@

=== renamed file 'instroot/etc/init/hockeypuck-mgo.conf' => 'debian/upstart'
=== removed directory 'instroot/etc/init'