New upstream releasedebian/5.1-1

8 files changed, 89 insertions, 19 deletions

diff --git a/debian/NEWS b/debian/NEWS
index 1785c15..bfe117a 100644
--- a/debian/NEWS
+++ b/debian/NEWS
@@ -1,3 +1,10 @@
+nikola (5.1-1) unstable; urgency=low
+
+  In this release, the license has changed. From now nikola is released under
+  MIT license.
+
+ -- Agustin Henze <tin@sluc.org.ar>  Wed, 02 Jan 2013 10:12:58 -0300
+
 nikola (5-1) unstable; urgency=low
 
   This version is not completely backwards compatible, thus the new major
diff --git a/debian/README.source b/debian/README.source
index 85cf849..32a971f 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -4,13 +4,13 @@ Repackaging upstream source
 nikola's original upstream source has been repackage to exclude DFSG-compliant
 components (minified JavaScript and Stylesheets) from it:
 
-$ diff -ruN nikola-5.upstream/ nikola-5 | diffstat
+$ diff -ruN nikola-5.1.upstream/ nikola-5.1 | diffstat
  css/bootstrap-responsive.min.css |    9 ---------
  css/bootstrap.min.css            |    9 ---------
  js/bootstrap.min.js              |    6 ------
  js/jquery-1.7.2.min.js           |    4 ----
  js/jquery.colorbox-min.js        |    4 ----
- 5 files changed, 32 deletions(-)
+ js/slides.min.jquery.js          |   20 --------------------
+ 6 files changed, 52 deletions(-)
 
-
- -- Agustin Henze <tin@sluc.org.ar>  Wed, 12 Dec 2012 20:42:41 -0300
+ -- Agustin Henze <tin@sluc.org.ar>  Wed, 02 Jan 2013 10:12:09 -0300
diff --git a/debian/changelog b/debian/changelog
index e287645..5f61f0b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+nikola (5.1-1) unstable; urgency=low
+
+  * New upstream release (Closes: #696358).
+    - Update standard version from 3.9.3 to 3.9.4.
+    - Add libjs-jquery-slides dependency.
+
+ -- Agustin Henze <tin@sluc.org.ar>  Wed, 02 Jan 2013 10:10:11 -0300
+
 nikola (5-1) unstable; urgency=low
 
   * New upstream release, adds new features and fixes several bugs:
diff --git a/debian/control b/debian/control
index 8ad24fd..67d3972 100644
--- a/debian/control
+++ b/debian/control
@@ -8,9 +8,11 @@ Build-Depends-Indep: python-all,
  python-support (>= 1),
  python-setuptools,
  python-docutils,
-Standards-Version: 3.9.3
+Standards-Version: 3.9.4
 X-Python-Version: >= 2.7
 Homepage: http://nikola.ralsina.com.ar/
+Vcs-Git: git://git.debian.org/collab-maint/nikola.git
+Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/nikola.git
 
 Package: nikola
 Architecture: all
@@ -27,6 +29,7 @@ Depends: ${python:Depends}, ${misc:Depends},
  libjs-jquery,
  libjs-jquery-colorbox,
  libjs-twitter-bootstrap,
+ libjs-jquery-slides,
 Recommends: python-webassets
 Suggests: python-jinja2
 Description: simple yet powerful and flexible static website and blog generator
diff --git a/debian/copyright b/debian/copyright
index 5444240..b503863 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,3 +1,7 @@
+Files: nikola/data/themes/default/assets/js/slides.jquery.js
+Copyright: 2011 Nathan Searles, http://nathansearles.com
+License: Apache-2.0
+
 Files: nikola/data/themes/default/assets/js/bootstrap.js,
  nikola/data/themes/default/assets/css/bootstrap.css,
  nikola/data/themes/default/assets/css/bootstrap-responsive.css,
@@ -43,8 +47,25 @@ License: BSD
  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 Files: *
-Copyright: (c) 2012, Roberto alsina <http://ralsina.com.ar>
-License: GPL-3
+Copyright: (c) 2012 Roberto Alsina y otros.
+License: MIT/X11
+ Permission is hereby granted, free of charge, to any person obtaining a copy of
+ this software and associated documentation files (the "Software"), to deal in
+ the Software without restriction, including without limitation the rights to
+ use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+ of the Software, and to permit persons to whom the Software is furnished to do
+ so, subject to the following conditions:
+ .
+ The above copyright notice and this permission notice shall be included in all
+ copies or substantial portions of the Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ SOFTWARE.
 
 Files: debian/*
 Copyright: (C) 2012 Agustin Henze <tin@sluc.org.ar>
diff --git a/debian/nikola.links b/debian/nikola.links
index 704e283..e056401 100644
--- a/debian/nikola.links
+++ b/debian/nikola.links
@@ -1,11 +1,35 @@
-/usr/share/javascript/jquery-colorbox/jquery.colorbox-min.js usr/share/pyshared/nikola/data/themes/default/assets/js/jquery.colorbox-min.js
-/usr/share/pyshared/nikola/data/themes/default/assets/js/jquery.colorbox-min.js usr/lib/python2.7/dist-packages/nikola/data/themes/default/assets/js/jquery.colorbox-min.js
-/usr/share/javascript/jquery/jquery.js usr/share/pyshared/nikola/data/themes/default/assets/js/jquery-1.7.2.min.js
-/usr/share/pyshared/nikola/data/themes/default/assets/js/jquery-1.7.2.min.js usr/lib/python2.7/dist-packages/nikola/data/themes/default/assets/js/jquery-1.7.2.min.js
-/usr/share/twitter-bootstrap/files/js/bootstrap.js usr/share/pyshared/nikola/data/themes/default/assets/js/bootstrap.js
-/usr/share/twitter-bootstrap/files/js/bootstrap.min.js usr/share/pyshared/nikola/data/themes/default/assets/js/bootstrap.min.js
-/usr/share/pyshared/nikola/data/themes/default/assets/js/bootstrap.min.js usr/share/pyshared/nikola/data/themes/default/assets/js/bootstrap.min.js
-/usr/share/twitter-bootstrap/files/css/bootstrap-responsive.css usr/share/pyshared/nikola/data/themes/default/assets/css/bootstrap-responsive.css
-/usr/share/twitter-bootstrap/files/css/bootstrap-responsive.min.css usr/share/pyshared/nikola/data/themes/default/assets/css/bootstrap-responsive.min.css
-/usr/share/twitter-bootstrap/files/css/bootstrap.css usr/share/pyshared/nikola/data/themes/default/assets/css/bootstrap.css
-/usr/share/twitter-bootstrap/files/css/bootstrap.min.css usr/share/pyshared/nikola/data/themes/default/assets/css/bootstrap.min.css
+/usr/share/javascript/jquery-colorbox/jquery.colorbox-min.js
+usr/share/pyshared/nikola/data/themes/default/assets/js/jquery.colorbox-min.js
+
+/usr/share/pyshared/nikola/data/themes/default/assets/js/jquery.colorbox-min.js
+usr/lib/python2.7/dist-packages/nikola/data/themes/default/assets/js/jquery.colorbox-min.js
+
+/usr/share/javascript/jquery/jquery.js
+usr/share/pyshared/nikola/data/themes/default/assets/js/jquery-1.7.2.min.js
+
+/usr/share/pyshared/nikola/data/themes/default/assets/js/jquery-1.7.2.min.js
+usr/lib/python2.7/dist-packages/nikola/data/themes/default/assets/js/jquery-1.7.2.min.js
+
+/usr/share/twitter-bootstrap/files/js/bootstrap.js
+usr/share/pyshared/nikola/data/themes/default/assets/js/bootstrap.js
+
+/usr/share/twitter-bootstrap/files/js/bootstrap.min.js
+usr/share/pyshared/nikola/data/themes/default/assets/js/bootstrap.min.js
+
+/usr/share/pyshared/nikola/data/themes/default/assets/js/bootstrap.min.js
+usr/share/pyshared/nikola/data/themes/default/assets/js/bootstrap.min.js
+
+/usr/share/javascript/jquery-slides/slides.min.jquery.js
+usr/share/pyshared/nikola/data/themes/default/assets/js/slides.min.jquery.js
+
+/usr/share/twitter-bootstrap/files/css/bootstrap-responsive.css
+usr/share/pyshared/nikola/data/themes/default/assets/css/bootstrap-responsive.css
+
+/usr/share/twitter-bootstrap/files/css/bootstrap-responsive.min.css
+usr/share/pyshared/nikola/data/themes/default/assets/css/bootstrap-responsive.min.css
+
+/usr/share/twitter-bootstrap/files/css/bootstrap.css
+usr/share/pyshared/nikola/data/themes/default/assets/css/bootstrap.css
+
+/usr/share/twitter-bootstrap/files/css/bootstrap.min.css
+usr/share/pyshared/nikola/data/themes/default/assets/css/bootstrap.min.css
diff --git a/debian/pydist-overrides b/debian/pydist-overrides
new file mode 100644
index 0000000..fb7f70d
--- /dev/null
+++ b/debian/pydist-overrides
@@ -0,0 +1 @@
+pillow python-imaging
diff --git a/debian/rules b/debian/rules
index a598f1a..404dd38 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,10 +14,10 @@ override_dh_auto_build:
 override_dh_auto_clean:
 	dh_auto_clean -- --all
 	rm -rf build
+	rm -rf Nikola.egg-info
 	rm -f debian/nikola.1
 
 override_dh_auto_install:
-	dh_auto_install
 	set -ex; \
 	for py in $(PYVERS); do \
 		$$py setup.py install --root debian/nikola \
@@ -34,10 +34,16 @@ override_dh_auto_install:
 	# PyRSS2Gen, provided by python-pyrss2gen on runtime-dep
 	rm debian/nikola/usr/lib/python2.7/dist-packages/nikola/PyRSS2Gen.py
 
+override_dh_python2:
+	dh_python2
+	chmod -x debian/nikola/usr/share/pyshared/nikola/data/samplesite/stories/configsample.txt
+	chmod -x debian/nikola/usr/share/pyshared/nikola/conf.py.in
+
 override_dh_link:
 	# Remove embedded code from other software pieces
 	# Bootstrap, provided by libjs-twitter-bootstrap on runtime-dep
 	rm debian/nikola/usr/share/pyshared/nikola/data/themes/default/assets/js/bootstrap.js
+	rm debian/nikola/usr/share/pyshared/nikola/data/themes/default/assets/js/slides.jquery.js
 	rm debian/nikola/usr/share/pyshared/nikola/data/themes/default/assets/css/bootstrap-responsive.css
 	rm debian/nikola/usr/share/pyshared/nikola/data/themes/default/assets/css/bootstrap.css
 	dh_link