diff options
| -rw-r--r-- | debian/control | 32 | ||||
| -rw-r--r-- | debian/puppet-common.dirs | 4 | ||||
| -rw-r--r-- | debian/puppet-common.install | 2 | ||||
| -rw-r--r-- | debian/puppet-el.dirs | 1 | ||||
| -rw-r--r-- | debian/puppet.dirs | 6 | ||||
| -rw-r--r-- | debian/puppet.install | 2 | ||||
| -rw-r--r-- | debian/puppetmaster.dirs | 2 | ||||
| -rwxr-xr-x | debian/rules | 11 | ||||
| -rw-r--r-- | debian/vim-puppet.dirs | 3 |
9 files changed, 50 insertions, 13 deletions
diff --git a/debian/control b/debian/control index a62ed3f95..1454fcccd 100644 --- a/debian/control +++ b/debian/control @@ -46,3 +46,35 @@ Description: centralised configuration management control daemon . This package contains the manifest server, 'puppetmaster'. +Package: puppet-common +Architecture: all +Depends: ruby1.8, libxmlrpc-ruby, libopenssl-ruby, libshadow-ruby1.8, adduser +Conflicts: puppet (<< ${source:Version}), puppetmaster (<< ${source:Version}) +Description: common files for puppet and puppetmaster + Puppet lets you centrally manage every important aspect of your system + using a cross-platform specification language that manages all the + separate elements normally aggregated in different files, like users, + cron jobs, and hosts, along with obviously discrete elements like + packages, services, and files. + . + Puppet's simple declarative specification language provides powerful + classing abilities for drawing out the similarities between hosts while + allowing them to be as specific as necessary, and it handles dependency + and prerequisite relationships between objects clearly and explicitly. + . + This package contains the files common to the 'puppet' and + 'puppetmaster' packages. + +Package: vim-puppet +Architecture: all +Recommends: vim-addon-manager +Conflicts: puppet (<< ${source:Version}) +Description: Vim syntax highlighting for puppet manifests + The vim-puppet package provides filetype detection and syntax highlighting for + puppet manifests (files ending with ".pp"). + +Package: puppet-el +Architecture: all +Conflicts: puppet (<< ${source:Version}) +Description: Emacs syntax highlighting for puppet manifests + The puppet-el package provides syntax highlighting for puppet manifests diff --git a/debian/puppet-common.dirs b/debian/puppet-common.dirs new file mode 100644 index 000000000..e5ecea4a7 --- /dev/null +++ b/debian/puppet-common.dirs @@ -0,0 +1,4 @@ +etc/puppet/manifests +usr/lib/ruby/1.8 +var/lib/puppet +var/log/puppet diff --git a/debian/puppet-common.install b/debian/puppet-common.install new file mode 100644 index 000000000..0f081d6b9 --- /dev/null +++ b/debian/puppet-common.install @@ -0,0 +1,2 @@ +debian/puppet.conf etc/puppet +debian/tmp/usr/lib/ruby/1.8/* usr/lib/ruby/1.8 diff --git a/debian/puppet-el.dirs b/debian/puppet-el.dirs new file mode 100644 index 000000000..873d0c216 --- /dev/null +++ b/debian/puppet-el.dirs @@ -0,0 +1 @@ +usr/share/emacs/site-lisp diff --git a/debian/puppet.dirs b/debian/puppet.dirs index 3dec3240e..236670a2d 100644 --- a/debian/puppet.dirs +++ b/debian/puppet.dirs @@ -1,7 +1 @@ usr/sbin -usr/lib/ruby/1.8 -var/log/puppet -etc/puppet/files -usr/share/vim/addons/ftdetect -usr/share/vim/addons/syntax -var/lib/puppet diff --git a/debian/puppet.install b/debian/puppet.install index 0d438efff..cabf8a813 100644 --- a/debian/puppet.install +++ b/debian/puppet.install @@ -1,7 +1,5 @@ -debian/puppet.conf etc/puppet debian/tmp/usr/bin/filebucket usr/bin debian/tmp/usr/bin/puppet usr/bin debian/tmp/usr/bin/puppetdoc usr/bin debian/tmp/usr/sbin/puppetd usr/sbin debian/tmp/usr/bin/ralsh usr/bin -debian/tmp/usr/lib/ruby/1.8/* usr/lib/ruby/1.8 diff --git a/debian/puppetmaster.dirs b/debian/puppetmaster.dirs index b256f0e7d..236670a2d 100644 --- a/debian/puppetmaster.dirs +++ b/debian/puppetmaster.dirs @@ -1 +1 @@ -etc/puppet/manifests +usr/sbin diff --git a/debian/rules b/debian/rules index 16d33a5be..6fc440665 100755 --- a/debian/rules +++ b/debian/rules @@ -56,15 +56,17 @@ install: build # Vim auto-syntax-highlighting stuff $(INSTALL) -m0644 ext/vim/syntax/puppet.vim \ - $(CURDIR)/debian/puppet-common/usr/share/vim/addons/syntax/ + $(CURDIR)/debian/vim-puppet/usr/share/vim/addons/syntax/ $(INSTALL) -m0644 ext/vim/ftdetect/puppet.vim \ - $(CURDIR)/debian/puppet-common/usr/share/vim/addons/ftdetect/ + $(CURDIR)/debian/vim-puppet/usr/share/vim/addons/ftdetect/ + $(INSTALL) -m0644 debian/vim-puppet.yaml \ + $(CURDIR)/debian/vim-puppet/usr/share/vim/registry/ # Emacs mode $(INSTALL) -m0644 ext/emacs/puppet-mode-init.el \ - $(CURDIR)/debian/puppet-common/etc/emacs/site-start.d/50puppet-mode-init.el + $(CURDIR)/debian/puppet-el.emacsen-startup $(INSTALL) -m0644 ext/emacs/puppet-mode.el \ - $(CURDIR)/debian/puppet-common/usr/share/emacs/site-lisp/puppet-mode.el + $(CURDIR)/debian/puppet-el/usr/share/emacs/site-lisp/puppet-mode.el dh_installexamples examples/* @@ -84,6 +86,7 @@ binary-indep: build install dh_install -i dh_installchangelogs -i CHANGELOG dh_installdocs -i + dh_installemacsen dh_installman dh_installinit -ppuppetmaster dh_installinit -ppuppet --error-handler=true -- defaults 21 diff --git a/debian/vim-puppet.dirs b/debian/vim-puppet.dirs new file mode 100644 index 000000000..f42d052c1 --- /dev/null +++ b/debian/vim-puppet.dirs @@ -0,0 +1,3 @@ +usr/share/vim/registry +usr/share/vim/addons/syntax +usr/share/vim/addons/ftdetect |