Tidied up Debian packaging and modified to fit new distribution layout.

jimmyish · Apr 4, 2006 · 840f105 · 840f105
1 parent 81a0df7
commit 840f105
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 20 deletions.
diff --git a/changelog b/changelog
@@ -1,3 +1,12 @@
+linuxserver-firewall (1.0-1) unstable; urgency=low
+
+  * New upstream release
+    - All fancy and svn'd now!
+  * Changed init handling. Starts S39 in runlevel S.
+  * Tidied packaging
+
+ -- Matt Brown <debian@mattb.net.nz>  Tue,  4 Apr 2006 14:16:59 +1200
+
 linuxserver-firewall (0.65) unstable; urgency=low
 
   * Add man page (thanks to John McPherson)

diff --git a/control b/control
@@ -3,7 +3,7 @@ Section: net
 Priority: optional
 Maintainer: Craig Box <debian@itpartners.co.nz>
 Build-Depends: debhelper (>> 3.0.0)
-Standards-Version: 3.5.2
+Standards-Version: 3.6.2
 
 Package: linuxserver-firewall
 Architecture: all

diff --git a/docs b/docs
@@ -1,2 +1,2 @@
 QUICKSTART
-CHANGELOG
+ChangeLog
diff --git a/linuxserver-firewall.manpages b/linuxserver-firewall.manpages
@@ -1,2 +1,2 @@
-linuxserver-firewall.8
-firewall.8
+doc/linuxserver-firewall.8
+doc/firewall.8
diff --git a/rules b/rules
@@ -5,11 +5,6 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-# This is the debhelper compatibility version to use.
-export DH_COMPAT=3
-
-
-
 ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
 	CFLAGS += -g
 endif
@@ -32,7 +27,6 @@ build-stamp: configure-stamp
 
 	# Add here commands to compile the package.
 	$(MAKE)
-	#/usr/bin/docbook-to-man debian/linuxserver-firewall.sgml > linuxserver-firewall.1
 
 	touch build-stamp
 
@@ -53,34 +47,26 @@ install: build
 	dh_installdirs
 
 	# Add here commands to install the package into debian/linuxserver-firewall.
-	$(MAKE) install DESTDIR=$(CURDIR)/debian/linuxserver-firewall BINDIR=$(DESTDIR)/usr/sbin SHAREDIR=$(DESTDIR)/usr/share CONFDIR=$(DESTDIR)/etc
+	$(MAKE) install DESTDIR=$(CURDIR)/debian/linuxserver-firewall BINDIR=/usr/sbin SHARDIR=/usr/share ETCDIR=/etc
 
 
 # Build architecture-independent files here.
 binary-indep: build install
 	dh_testdir
 	dh_testroot
-#	dh_installdebconf	
 	dh_installdocs
 	dh_installexamples
 	dh_installmenu
-#	dh_installlogrotate
-#	dh_installemacsen
-#	dh_installpam
-#	dh_installmime
-	dh_installinit
+	dh_installinit -- start 39 S . stop 36 0 6 .
 	dh_installcron
 	dh_installman
 	dh_installinfo
-#	dh_undocumented
 	dh_installchangelogs 
 	dh_link
 	dh_strip
 	dh_compress
 	dh_fixperms
-#	dh_makeshlibs
 	dh_installdeb
-#	dh_perl
 	dh_shlibdeps
 	dh_gencontrol
 	dh_md5sums