New upstream release

6 files changed, 37 insertions, 67 deletions

diff --git a/debian/NEWS b/debian/NEWS
new file mode 100644
index 0000000..1785c15
--- /dev/null
+++ b/debian/NEWS
@@ -0,0 +1,13 @@
+nikola (5-1) unstable; urgency=low
+
+  This version is not completely backwards compatible, thus the new major
+  version number, but switching to it should be easy-ish. If you are using
+  version 4.0.3:
+   - Remove your dodo.py
+   - Use nikola build instead of doit from now on
+   - Use nikola serve instead of doit serve, nikola new_post instead of doit
+     new_post, and so on. Some other doit task are also converted into nikola
+     command you can get the list using nikola help.
+
+
+ -- Agustin Henze <tin@sluc.org.ar>  Wed, 12 Dec 2012 20:39:20 -0300
diff --git a/debian/README.source b/debian/README.source
index 192b586..85cf849 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-4.0.3-old/ nikola-4.0.3/ | diffstat 
+$ diff -ruN nikola-5.upstream/ nikola-5 | diffstat
  css/bootstrap-responsive.min.css |    9 ---------
  css/bootstrap.min.css            |    9 ---------
  js/bootstrap.min.js              |    6 ------
@@ -13,4 +13,4 @@ $ diff -ruN nikola-4.0.3-old/ nikola-4.0.3/ | diffstat
  5 files changed, 32 deletions(-)
 
 
- -- Ulises Vitulli <dererk@debian.org>  Thu, 15 Nov 2012 11:23:07 -0300
+ -- Agustin Henze <tin@sluc.org.ar>  Wed, 12 Dec 2012 20:42:41 -0300
diff --git a/debian/changelog b/debian/changelog
index 0bcfa52..e287645 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,21 @@
+nikola (5-1) unstable; urgency=low
+
+  * New upstream release, adds new features and fixes several bugs:
+    Features:
+     - Templates now know their name from template_name in their context.
+     - Made most of Nikola into Yapsy plugins.
+     - Recurse galleries/ and render each folder as a gallery.
+     - Breadcrumbs and folder links in image galleries.
+    Bugfixes:
+     - Fixed doc installation
+     - Put webassets cache in cache/webassets
+     - Don't crash on incomplete translations
+     - Fixed Issue 160: render_tags didn't call scan_posts()
+     - Fixed Issue 161: webassets setting USE_BUNDLES was ignored
+     - Fixed Issue 153: index.txt was being ignored in galleries.
+
+ -- Agustin Henze <tin@sluc.org.ar>  Wed, 12 Dec 2012 20:33:41 -0300
+
 nikola (4.0.3-2) unstable; urgency=low
 
   * Fix broken symlinks not being included on the repkg source.
diff --git a/debian/nikola.1 b/debian/nikola.1
deleted file mode 100644
index 6a8e849..0000000
--- a/debian/nikola.1
+++ /dev/null
@@ -1,58 +0,0 @@
-.\" Man page generated from reStructeredText.
-.
-.TH NIKOLA 1 "" "" "nikola"
-.SH NAME
-nikola \- Is a static Site and Blog Generator
-.
-.nr rst2man-indent-level 0
-.
-.de1 rstReportMargin
-\\$1 \\n[an-margin]
-level \\n[rst2man-indent-level]
-level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
--
-\\n[rst2man-indent0]
-\\n[rst2man-indent1]
-\\n[rst2man-indent2]
-..
-.de1 INDENT
-.\" .rstReportMargin pre:
-. RS \\$1
-. nr rst2man-indent\\n[rst2man-indent-level] \\n[an-margin]
-. nr rst2man-indent-level +1
-.\" .rstReportMargin post:
-..
-.de UNINDENT
-. RE
-.\" indent \\n[an-margin]
-.\" old: \\n[rst2man-indent\\n[rst2man-indent-level]]
-.nr rst2man-indent-level -1
-.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
-.in \\n[rst2man-indent\\n[rst2man-indent-level]]u
-..
-.SH SYNOPSIS
-.sp
-\fBnikola\fP command [\fIoptions\fP]
-.SH DESCRIPTION
-.INDENT 0.0
-.TP
-.B nikola
-Is a static Site and Blog Generator.
-.UNINDENT
-.SH OPTIONS
-.sp
-To create a new site in a folder, run "nikola init foldername [src]".
-.sp
-The destination folder must not exist.
-.sp
-If you pass the src argument, that folder will be used as a template for
-the new site instead of Nikola\(aqs sample site.
-.SH AUTHOR
-.sp
-Roberto Alsina <\fI\%http://ralsina.com.ar/\fP>
-.sp
-This manpage was initially written by Agustin Henze
-<\fI\%tin@sluc.org.ar\fP> for the Debian Project.
-.\" Generated by docutils manpage writer.
-.\" 
-.
diff --git a/debian/nikola.manpages b/debian/nikola.manpages
index 85e8e6d..32821a1 100644
--- a/debian/nikola.manpages
+++ b/debian/nikola.manpages
@@ -1,3 +1 @@
 debian/nikola.1
-debian/nikola_check.1
-debian/nikola_import_wordpress.1
diff --git a/debian/rules b/debian/rules
index e367bde..a598f1a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,6 +14,7 @@ override_dh_auto_build:
 override_dh_auto_clean:
 	dh_auto_clean -- --all
 	rm -rf build
+	rm -f debian/nikola.1
 
 override_dh_auto_install:
 	dh_auto_install
@@ -25,12 +26,10 @@ override_dh_auto_install:
 	# Documentation
 	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/theming.txt debian/nikola/usr/share/doc/nikola/theming.html; \
+		rst2html docs/extending.txt debian/nikola/usr/share/doc/nikola/extending.html;
 	# Manpage
-	rm debian/nikola/usr/*.txt
-	rst2man debian/man/nikola.rst debian/nikola.1
-	rst2man debian/man/nikola_check.rst debian/nikola_check.1
-	rst2man debian/man/nikola_import_wordpress.rst debian/nikola_import_wordpress.1
+	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