New upstream releasedebian/5.2-1

5 files changed, 33 insertions, 21 deletions

diff --git a/debian/NEWS b/debian/NEWS
index bfe117a..4261c20 100644
--- a/debian/NEWS
+++ b/debian/NEWS
@@ -1,9 +1,9 @@
-nikola (5.1-1) unstable; urgency=low
+nikola (5.2-1) unstable; urgency=low
 
-  In this release, the license has changed. From now nikola is released under
-  MIT license.
+  The license has changed from GPL-3 to MIT. From 5.1 version, nikola is
+  released under MIT license.
 
- -- Agustin Henze <tin@sluc.org.ar>  Wed, 02 Jan 2013 10:12:58 -0300
+ -- Agustin Henze <tin@sluc.org.ar>  Wed, 13 Feb 2013 18:58:12 -0300
 
 nikola (5-1) unstable; urgency=low
 
diff --git a/debian/README.source b/debian/README.source
index 32a971f..54931ae 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -4,7 +4,7 @@ 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.1.upstream/ nikola-5.1 | diffstat
+$ diff -ruN nikola-5.2.upstream/ nikola-5.2 | diffstat
  css/bootstrap-responsive.min.css |    9 ---------
  css/bootstrap.min.css            |    9 ---------
  js/bootstrap.min.js              |    6 ------
diff --git a/debian/changelog b/debian/changelog
index 5f61f0b..c54c55b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,21 @@
-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.2-1) unstable; urgency=low
+
+  * Imported Upstream version 5.2 (Closes: #696358, #699910).
+  * Bump Standards-Version to 3.9.4 (no changes required).
+  * Added libjs-jquery-slides dependency.
+    - Removed slides.jquery.js file of the upstream installation.
+  * Updated copyright file: 
+    - The license of nikola has changed from GPL-3 to MIT.
+    - Added license of slides.jquery.js file.
+  * Fixed assets symlinks on debian/nikola.links.
+  * Updated debian/rules:
+    - Deleted the remove sentence of PyRSS2Gen, fixed in upstream.
+    - Copy custom.css into the right place, it'll be reported to upstream.
+    - Added conversion from rst to html of the docs/creating-a-theme.txt file.
+  * Created debian/pydist-overrides: pillow overridden by python-imaging.
+  * Added Vcs-git and Vcs-browser to debian/control file.
+
+ -- Agustin Henze <tin@sluc.org.ar>  Wed, 13 Feb 2013 18:42:55 -0300
 
 nikola (5-1) unstable; urgency=low
 
diff --git a/debian/nikola.links b/debian/nikola.links
index e056401..468f35d 100644
--- a/debian/nikola.links
+++ b/debian/nikola.links
@@ -17,11 +17,17 @@ usr/share/pyshared/nikola/data/themes/default/assets/js/bootstrap.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/lib/python2.7/dist-packages/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/pyshared/nikola/data/themes/default/assets/js/slides.min.jquery.js
+usr/lib/python2.7/dist-packages/nikola/data/themes/default/assets/js/slides.min.jquery.js
+
+/usr/share/javascript/jquery-slides/slides.jquery.js
+usr/share/pyshared/nikola/data/themes/default/assets/js/slides.jquery.js
+
 /usr/share/twitter-bootstrap/files/css/bootstrap-responsive.css
 usr/share/pyshared/nikola/data/themes/default/assets/css/bootstrap-responsive.css
 
diff --git a/debian/rules b/debian/rules
index 404dd38..d8d112d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -27,17 +27,10 @@ override_dh_auto_install:
 	mkdir -p debian/nikola/usr/share/doc/nikola; \
 		rst2html docs/manual.txt debian/nikola/usr/share/doc/nikola/manual.html; \
 		rst2html docs/theming.txt debian/nikola/usr/share/doc/nikola/theming.html; \
+		rst2html docs/creating-a-theme.txt debian/nikola/usr/share/doc/nikola/creating-a-theme.html; \
 		rst2html docs/extending.txt debian/nikola/usr/share/doc/nikola/extending.html;
 	# Manpage
 	rst2man docs/man/nikola.1 debian/nikola.1
-	# Remove embedded code from other software pieces
-	# 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
@@ -46,4 +39,6 @@ override_dh_link:
 	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
+	# A nasty fix, I'll report this to upstream.
+	cp nikola/data/samplesite/files/assets/css/custom.css debian/nikola/usr/lib/python2.7/dist-packages/nikola/data/themes/default/assets/css/custom.css
 	dh_link