Merge branch 'joeyconfig'

2014-08-19 19:06:30 -04:00 · 2014-08-19 19:06:30 -04:00 · 94b7c9d298
parent 0ad5b6e410 81544b37a8
commit 94b7c9d298
3 changed files with 1 additions and 3 deletions
--- a/debian/manpages
+++ b/debian/manpages
@ -1 +0,0 @@
-propellor.1
--- a/debian/rules
+++ b/debian/rules
@ -11,7 +11,7 @@ override_dh_auto_build:
 override_dh_installdocs:
 	dh_installdocs doc/README.mdwn
 override_dh_installman:
-	dh_installman debian/propellor.1
+	dh_installman propellor.1

 # Not intended for use by anyone except the author.
 announcedir:
--- a/propellor.cabal
+++ b/propellor.cabal
@ -25,7 +25,6 @@ Extra-Source-Files:
  debian/control
  debian/copyright
  debian/rules
-  debian/manpages
 Synopsis: property-based host configuration management in haskell
 Description:
 Propellor enures that the system it's run in satisfies a list of