diff options
| author | Luke Kanies <luke@madstop.com> | 2008-02-25 18:28:26 -0500 |
|---|---|---|
| committer | Luke Kanies <luke@madstop.com> | 2008-02-25 18:28:26 -0500 |
| commit | 9d2f45df3d951ef59a44a7fb81a38586f04884b4 (patch) | |
| tree | 0c97adcca32ba9ad2e20b2457f3db0c4b91f8376 /debian/rules | |
| parent | 0afea69c06742eff1e8d8bd7df13c9c0e4c397c0 (diff) | |
| parent | 04892ee723d1a687c83eb6c99b5c6a6c76bbcbc9 (diff) | |
| download | puppet-9d2f45df3d951ef59a44a7fb81a38586f04884b4.tar.gz puppet-9d2f45df3d951ef59a44a7fb81a38586f04884b4.tar.xz puppet-9d2f45df3d951ef59a44a7fb81a38586f04884b4.zip | |
Merge branch '0.24.x'
Diffstat (limited to 'debian/rules')
| -rwxr-xr-x[-rw-r--r--] | debian/rules | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/debian/rules b/debian/rules index 69bf3a4af..ecabcbad0 100644..100755 --- a/debian/rules +++ b/debian/rules @@ -66,10 +66,10 @@ install: build $(INSTALL) -m0644 debian/puppet.conf $(pkgconfdir)/puppet.conf # Vim auto-syntax-highlighting stuff - $(INSTALL) -m0644 ext/vim/puppet.vim \ - $(CURDIR)/debian/puppet/usr/share/vim/vim70/syntax/puppet.vim - $(INSTALL) -m0644 ext/vim/filetype.vim \ - $(CURDIR)/debian/puppet/usr/share/vim/addons/ftdetect/puppet.vim + $(INSTALL) -m0644 ext/vim/syntax/puppet.vim \ + $(CURDIR)/debian/puppet/usr/share/vim/vim71/syntax/ + $(INSTALL) -m0644 ext/vim/ftdetect/puppet.vim \ + $(CURDIR)/debian/puppet/usr/share/vim/addons/ftdetect/ # Emacs keeping up with the Joneses $(INSTALL) -m0644 ext/emacs/puppet-mode-init.el \ @@ -100,7 +100,8 @@ binary-indep: build install dh_movefiles -i dh_installchangelogs -i CHANGELOG dh_installdocs -i - dh_installinit -i + dh_installinit -ppuppetmaster + dh_installinit -ppuppet -- defaults 21 dh_installlogrotate -i dh_compress -i dh_fixperms -i |