Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- diff -r 26e8dcfac46e debian/control
- --- a/debian/control Fri Jan 24 15:33:22 2014 +1100
- +++ b/debian/control Fri Jan 24 15:36:20 2014 +1100
- @@ -8,17 +8,17 @@
- Build-Depends: debhelper (>= 9.20120410~),
- bash-completion,
- cython,
- - libzmq3-dev (>> 3.2.3+dfsg-1),
- + libzmq3-dev (>> 3.2.3+dfsg-1~),
- python | python-all | python-dev | python-all-dev,
- python-crypto,
- python-jinja2,
- python-m2crypto,
- - python-msgpack,
- + msgpack-python,
- python-setuptools,
- python-sphinx (>= 1.0),
- python-yaml,
- - python-zmq (>= 13.1.0),
- - dh-systemd (>= 1.4)
- + yui-compressor,
- + python-zmq (>= 13.1.0~)
- Standards-Version: 3.9.5
- Homepage: http://saltstack.org/
- Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-salt/salt.git
- @@ -65,7 +65,7 @@
- salt-common (= ${source:Version}),
- python-m2crypto,
- python-crypto,
- - python-msgpack,
- + msgpack-python,
- python-zmq (>= 13.1.0)
- Description: remote manager to administer servers via salt
- salt is a powerful remote execution manager that can be used to
- @@ -93,7 +93,7 @@
- salt-common (= ${source:Version}),
- python-m2crypto,
- python-crypto,
- - python-msgpack,
- + msgpack-python,
- python-zmq (>= 13.1.0),
- dctrl-tools
- Recommends: dmidecode,
- @@ -148,7 +148,7 @@
- Depends: ${misc:Depends},
- ${python:Depends},
- salt-common (= ${source:Version}),
- - python-msgpack,
- + msgpack-python,
- sshpass
- Description: remote manager to administer servers via salt
- salt is a powerful remote execution manager that can be used to
- @@ -177,8 +177,6 @@
- Section: doc
- Depends: ${misc:Depends},
- libjs-sphinxdoc,
- - libjs-modernizr,
- - libjs-twitter-bootstrap,
- libjs-jquery
- Description: additional documentation for salt, the distributed remote execution system
- salt is a powerful remote execution manager that can be used to
- diff -r 26e8dcfac46e debian/patches/series
- --- a/debian/patches/series Fri Jan 24 15:33:22 2014 +1100
- +++ b/debian/patches/series Fri Jan 24 15:36:20 2014 +1100
- @@ -1,2 +1,3 @@
- doc-minor-fixes.diff
- yaml.scanner
- +js-minify.diff
- diff -r 26e8dcfac46e debian/rules
- --- a/debian/rules Fri Jan 24 15:33:22 2014 +1100
- +++ b/debian/rules Fri Jan 24 15:36:20 2014 +1100
- @@ -5,7 +5,7 @@
- include /usr/share/python/python.mk
- %:
- - dh $@ --with python2,bash-completion --with=systemd
- + dh $@ --with python2,bash-completion
- override_dh_auto_build:
- dh_auto_build
- diff -r 26e8dcfac46e debian/salt-doc.links
- --- a/debian/salt-doc.links Fri Jan 24 15:33:22 2014 +1100
- +++ b/debian/salt-doc.links Fri Jan 24 15:36:20 2014 +1100
- @@ -4,8 +4,3 @@
- usr/share/javascript/sphinxdoc/1.0/sidebar.js usr/share/doc/salt/html/_static/sidebar.js
- usr/share/javascript/sphinxdoc/1.0/underscore.js usr/share/doc/salt/html/_static/underscore.js
- usr/share/javascript/jquery/jquery.js usr/share/doc/salt/html/_static/js/vendor/jquery-1.9.1.js
- -usr/share/javascript/modernizr/modernizr.min.js usr/share/doc/salt/html/_static/js/vendor/modernizr-2.6.2-respond-1.1.0.min.js
- -usr/share/twitter-bootstrap/files/js/bootstrap.min.js usr/share/doc/salt/html/_static/js/vendor/bootstrap.min.js
- -usr/share/twitter-bootstrap/files/css/bootstrap.css usr/share/doc/salt/html/_static/css/bootstrap.min.css
- -usr/share/twitter-bootstrap/files/css/bootstrap-responsive.min.css usr/share/doc/salt/html/_static/css/bootstrap-responsive.min.css
- -
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement