Advertisement
Guest User

Untitled

a guest
Feb 5th, 2014
78
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 3.66 KB | None | 0 0
  1. diff -r 26e8dcfac46e debian/control
  2. --- a/debian/control    Fri Jan 24 15:33:22 2014 +1100
  3. +++ b/debian/control    Fri Jan 24 15:36:20 2014 +1100
  4. @@ -8,17 +8,17 @@
  5.  Build-Depends: debhelper (>= 9.20120410~),
  6.                 bash-completion,
  7.                 cython,
  8. -               libzmq3-dev (>> 3.2.3+dfsg-1),
  9. +               libzmq3-dev (>> 3.2.3+dfsg-1~),
  10.                 python | python-all | python-dev | python-all-dev,
  11.                 python-crypto,
  12.                 python-jinja2,
  13.                 python-m2crypto,
  14. -               python-msgpack,
  15. +               msgpack-python,
  16.                 python-setuptools,
  17.                 python-sphinx (>= 1.0),
  18.                 python-yaml,
  19. -               python-zmq (>= 13.1.0),
  20. -               dh-systemd (>= 1.4)
  21. +               yui-compressor,
  22. +               python-zmq (>= 13.1.0~)
  23.  Standards-Version: 3.9.5
  24.  Homepage: http://saltstack.org/
  25.  Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-salt/salt.git
  26. @@ -65,7 +65,7 @@
  27.           salt-common (= ${source:Version}),
  28.           python-m2crypto,
  29.           python-crypto,
  30. -         python-msgpack,
  31. +         msgpack-python,
  32.           python-zmq (>= 13.1.0)
  33.  Description: remote manager to administer servers via salt
  34.   salt is a powerful remote execution manager that can be used to
  35. @@ -93,7 +93,7 @@
  36.           salt-common (= ${source:Version}),
  37.           python-m2crypto,
  38.           python-crypto,
  39. -         python-msgpack,
  40. +         msgpack-python,
  41.           python-zmq (>= 13.1.0),
  42.           dctrl-tools
  43.  Recommends: dmidecode,
  44. @@ -148,7 +148,7 @@
  45.  Depends: ${misc:Depends},
  46.           ${python:Depends},
  47.           salt-common (= ${source:Version}),
  48. -         python-msgpack,
  49. +         msgpack-python,
  50.           sshpass
  51.  Description: remote manager to administer servers via salt
  52.   salt is a powerful remote execution manager that can be used to
  53. @@ -177,8 +177,6 @@
  54.  Section: doc
  55.  Depends: ${misc:Depends},
  56.      libjs-sphinxdoc,
  57. -    libjs-modernizr,
  58. -    libjs-twitter-bootstrap,
  59.      libjs-jquery
  60.  Description: additional documentation for salt, the distributed remote execution system
  61.   salt is a powerful remote execution manager that can be used to
  62. diff -r 26e8dcfac46e debian/patches/series
  63. --- a/debian/patches/series Fri Jan 24 15:33:22 2014 +1100
  64. +++ b/debian/patches/series Fri Jan 24 15:36:20 2014 +1100
  65. @@ -1,2 +1,3 @@
  66.  doc-minor-fixes.diff
  67.  yaml.scanner
  68. +js-minify.diff
  69. diff -r 26e8dcfac46e debian/rules
  70. --- a/debian/rules  Fri Jan 24 15:33:22 2014 +1100
  71. +++ b/debian/rules  Fri Jan 24 15:36:20 2014 +1100
  72. @@ -5,7 +5,7 @@
  73.  include /usr/share/python/python.mk
  74.  
  75.  %:
  76. -   dh $@ --with python2,bash-completion --with=systemd
  77. +   dh $@ --with python2,bash-completion
  78.  
  79.  override_dh_auto_build:
  80.     dh_auto_build
  81. diff -r 26e8dcfac46e debian/salt-doc.links
  82. --- a/debian/salt-doc.links Fri Jan 24 15:33:22 2014 +1100
  83. +++ b/debian/salt-doc.links Fri Jan 24 15:36:20 2014 +1100
  84. @@ -4,8 +4,3 @@
  85.  usr/share/javascript/sphinxdoc/1.0/sidebar.js usr/share/doc/salt/html/_static/sidebar.js
  86.  usr/share/javascript/sphinxdoc/1.0/underscore.js usr/share/doc/salt/html/_static/underscore.js
  87.  usr/share/javascript/jquery/jquery.js usr/share/doc/salt/html/_static/js/vendor/jquery-1.9.1.js
  88. -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
  89. -usr/share/twitter-bootstrap/files/js/bootstrap.min.js usr/share/doc/salt/html/_static/js/vendor/bootstrap.min.js
  90. -usr/share/twitter-bootstrap/files/css/bootstrap.css usr/share/doc/salt/html/_static/css/bootstrap.min.css
  91. -usr/share/twitter-bootstrap/files/css/bootstrap-responsive.min.css usr/share/doc/salt/html/_static/css/bootstrap-responsive.min.css
  92. -
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement