install bash completion and UFW firewall config

saltstack · Dec 4, 2012 · fdbbb72 · fdbbb72
1 parent 7cb608f
commit fdbbb72
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 5 deletions.
diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,10 @@
+salt (0.10.6b) unstable; urgency=low
+
+  * use shared logrotate, upstart, and systemd scripts
+  * add bash_completion and ufw support files
+
+ -- Sean Channel <pentabular@gmail.com>  Mon, 3 Dec 2012 11:14:35 -0700
+
 salt (0.10.5-1) unstable; urgency=low
 
   * [f735ab9] Filter pyc files
@@ -65,7 +72,7 @@ salt (0.10.2) precise; urgency=low
   * Non-maintainer upload.
   * New upstream version
 
- -- Dave Rawks <drawks@mint>  Wed, 01 Aug 2012 13:34:10 -0700
+ -- Dave Rawks <drawks@pandora.org>  Wed, 01 Aug 2012 13:34:10 -0700
 
 salt (0.10.1-3) unstable; urgency=low
 

diff --git a/debian/rules b/debian/rules
@@ -7,9 +7,6 @@ include /usr/share/python/python.mk
 PKGFILES := pkg/*.service pkg/*.upstart pkg/*.logrotate
 
 %:
-	dh $@ --with python2
-
-override_dh_auto_build:
 	cp $(PKGFILES) debian
-	dh_auto_build
 	make -C doc html
+	dh $@ --with python2
diff --git a/debian/salt-common.install b/debian/salt-common.install
@@ -1 +1,3 @@
 usr/lib/python2*/dist-packages/salt/
+pkg/salt.ufw /etc/ufw/applications.d/
+pkg/salt.bash /etc/bash_completion.d/
diff --git a/pkg/salt_bash_completion → pkg/salt.bash b/pkg/salt_bash_completion → pkg/salt.bash
diff --git a/pkg/salt-master.ufw → pkg/salt.ufw b/pkg/salt-master.ufw → pkg/salt.ufw