New releasedebian/6.2.1-1

7 files changed, 112 insertions, 74 deletions

diff --git a/debian/changelog b/debian/changelog
index 9a2a777..f50feb0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+nikola (6.2.1-1) unstable; urgency=low
+
+  * Imported Upstream version 6.2.1 (Closes: #722177)
+  * Updating debian/watch file to the new url of the project
+  * Add get-orig-source target
+  * Change the default theme bootstrap3 by bootstrap
+  * Update dependencies, recommendations and suggestions
+
+ -- Agustin Henze <tin@debian.org>  Mon, 18 Nov 2013 19:26:32 -0300
+
 nikola (5.4.4-1) unstable; urgency=low
 
   [ Agustin Henze ]
diff --git a/debian/control b/debian/control
index 04fd7f4..7a0cecc 100644
--- a/debian/control
+++ b/debian/control
@@ -1,22 +1,25 @@
 Source: nikola
 Section: python
 Priority: optional
-Maintainer: Agustin Henze <tin@sluc.org.ar>
+Maintainer: Agustin Henze <tin@debian.org>
 Uploaders: Ulises Vitulli <dererk@debian.org>
-Build-Depends: debhelper (>= 9)
-Build-Depends-Indep: python-all,
+Build-Depends:
+ debhelper (>= 9),
+ python-all,
  python-support (>= 1),
  python-setuptools,
  python-docutils,
-Standards-Version: 3.9.4
+Standards-Version: 3.9.5
 X-Python-Version: >= 2.7
-Homepage: http://nikola.ralsina.com.ar/
+Homepage: http://getnikola.com/
 Vcs-Git: git://anonscm.debian.org/collab-maint/nikola.git
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/nikola.git
 
 Package: nikola
 Architecture: all
-Depends: ${python:Depends}, ${misc:Depends},
+Depends:
+ ${python:Depends},
+ ${misc:Depends},
  python-doit,
  python-pygments,
  python-imaging,
@@ -26,12 +29,28 @@ Depends: ${python:Depends}, ${misc:Depends},
  python-lxml,
  python-yapsy,
  python-pyrss2gen,
+ python-tz,
  libjs-jquery,
  libjs-jquery-colorbox,
  libjs-twitter-bootstrap,
- libjs-jquery-slides,
-Recommends: python-webassets, python-requests
-Suggests: python-jinja2
+ libjs-imagesloaded,
+Recommends:
+ python-webassets,
+ python-requests,
+ python-typogrify,
+ python-livereload,
+Suggests:
+ python-jinja2,
+ python-feedparser,
+ ipython,
+ bpython,
+ python-markdown,
+ python-misaka,
+ pandoc,
+ python-textile,
+ python-creoleparser,
+ txt2tags,
+ node-less,
 Description: simple yet powerful and flexible static website and blog generator
  Nikola is a static site and blog generator. Feed information to it on one
  side and get a ready-to-deploy website on the other.
diff --git a/debian/copyright b/debian/copyright
index 70a6e89..69e2cf9 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,33 +1,40 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: Nikola
 Upstream-Contact: Roberto Alsina <ralsina@kde.org>
-Source: http://nikola.ralsina.com.ar/
+Source: https://github.com/getnikola/nikola
 
-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
-Copyright: 2012 Twitter, Inc.
-License: Apache-2.0
- Licensed under the Apache License, Version 2.0 (the "License");
+Files: *
+Copyright: (c) 2012-2013 Roberto Alsina y otros.
+License: MIT/X11
+
+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:
  .
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
+ The above copyright notice and this permission notice shall be included in all
+ copies or substantial portions of the Software.
  .
- On Debian systems, the complete text of the Apache-2.0
- License can be found in `/usr/share/common-licenses/Apache-2.0'.
+ 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: nikola/rc4.py
 Copyright: (C) 2012 Bo Zhu http://about.bozhu.me
 License: MIT/X11
 
-Files: nikola/plugins/compile_misaka*
+Files: nikola/plugins/compile/misaka.py
 Copyright: (c) 2013 Chris Lee
 License: MIT/X11
 
-Files: nikola/plugins/compile_markdown/mdx_podcast.py
+Files: nikola/plugins/compile/markdown/mdx_podcast.py
 Copyright: (c) 2013 Michael Rabbitt, Roberto Alsina
 License: MIT/X11
 
@@ -35,7 +42,7 @@ Files: nikola/plugins/compile_markdown/mdx_gist.py
 Copyright: (c) 2013 Michael Rabbitt
 License: MIT/X11
 
-Files: nikola/plugins/compile_ipynb*
+Files: nikola/plugins/compile/ipynb*
 Copyright: (c) 2013 Damian Avila
 License: MIT/X11
 
@@ -43,31 +50,8 @@ Files: nikola/plugins/task_localsearch/files/*
 Copyright: (c) 2013 Tipue
 License: MIT/X11
 
-Files: *
-Copyright: (c) 2012 Roberto Alsina y otros.
-License: MIT/X11
-
-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-2013 Agustin Henze <tin@sluc.org.ar>
+Copyright: (C) 2012-2013 Agustin Henze <tin@debian.org>
 License: GPL-3
 
 License: GPL-3
diff --git a/debian/nikola.docs b/debian/nikola.docs
index b43bf86..a1320b1 100644
--- a/debian/nikola.docs
+++ b/debian/nikola.docs
@@ -1 +1 @@
-README.md
+README.rst
diff --git a/debian/nikola.links b/debian/nikola.links
index 468f35d..9ab3302 100644
--- a/debian/nikola.links
+++ b/debian/nikola.links
@@ -1,41 +1,65 @@
 /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/bootstrap/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/pyshared/nikola/data/themes/bootstrap/assets/js/jquery.colorbox-min.js
+usr/lib/python2.7/dist-packages/nikola/data/themes/bootstrap/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/javascript/jquery/jquery.min.js
+usr/share/pyshared/nikola/data/themes/bootstrap/assets/js/jquery.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/pyshared/nikola/data/themes/bootstrap/assets/js/jquery.min.js
+usr/lib/python2.7/dist-packages/nikola/data/themes/bootstrap/assets/js/jquery.min.js
 
 /usr/share/twitter-bootstrap/files/js/bootstrap.js
-usr/share/pyshared/nikola/data/themes/default/assets/js/bootstrap.js
+usr/share/pyshared/nikola/data/themes/bootstrap/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/bootstrap/assets/js/bootstrap.js
+usr/lib/python2.7/dist-packages/nikola/data/themes/bootstrap/assets/js/bootstrap.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/twitter-bootstrap/files/js/bootstrap.min.js
+usr/share/pyshared/nikola/data/themes/bootstrap/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/bootstrap/assets/js/bootstrap.min.js
+usr/lib/python2.7/dist-packages/nikola/data/themes/bootstrap/assets/js/bootstrap.min.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/imagesloaded/imagesloaded.pkgd.min.js
+usr/share/pyshared/nikola/data/themes/bootstrap/assets/js/imagesloaded.pkgd.min.js
 
-/usr/share/javascript/jquery-slides/slides.jquery.js
-usr/share/pyshared/nikola/data/themes/default/assets/js/slides.jquery.js
+/usr/share/pyshared/nikola/data/themes/bootstrap/assets/js/imagesloaded.pkgd.min.js
+usr/lib/python2.7/dist-packages/nikola/data/themes/bootstrap/assets/js/imagesloaded.pkgd.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/pyshared/nikola/data/themes/bootstrap/assets/css/bootstrap-responsive.css
+
+/usr/share/pyshared/nikola/data/themes/bootstrap/assets/css/bootstrap-responsive.css
+usr/lib/python2.7/dist-packages/nikola/data/themes/bootstrap/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/pyshared/nikola/data/themes/bootstrap/assets/css/bootstrap-responsive.min.css
+
+/usr/share/pyshared/nikola/data/themes/bootstrap/assets/css/bootstrap-responsive.min.css
+usr/lib/python2.7/dist-packages/nikola/data/themes/bootstrap/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/pyshared/nikola/data/themes/bootstrap/assets/css/bootstrap.css
+
+/usr/share/pyshared/nikola/data/themes/bootstrap/assets/css/bootstrap.css
+usr/lib/python2.7/dist-packages/nikola/data/themes/bootstrap/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/pyshared/nikola/data/themes/bootstrap/assets/css/bootstrap.min.css
+
+/usr/share/pyshared/nikola/data/themes/bootstrap/assets/css/bootstrap.min.css
+usr/lib/python2.7/dist-packages/nikola/data/themes/bootstrap/assets/css/bootstrap.min.css
+
+/usr/share/twitter-bootstrap/files/img/glyphicons-halflings.png
+usr/share/pyshared/nikola/data/themes/bootstrap/assets/img/glyphicons-halflings.png
+
+/usr/share/pyshared/nikola/data/themes/bootstrap/assets/img/glyphicons-halflings.png
+usr/lib/python2.7/dist-packages/nikola/data/themes/bootstrap/assets/img/glyphicons-halflings.png
+
+/usr/share/twitter-bootstrap/files/img/glyphicons-halflings-white.png
+usr/share/pyshared/nikola/data/themes/bootstrap/assets/img/glyphicons-halflings-white.png
+
+/usr/share/pyshared/nikola/data/themes/bootstrap/assets/img/glyphicons-halflings-white.png
+usr/lib/python2.7/dist-packages/nikola/data/themes/bootstrap/assets/img/glyphicons-halflings-white.png
diff --git a/debian/nikola.manpages b/debian/nikola.manpages
index 32821a1..55f0254 100644
--- a/debian/nikola.manpages
+++ b/debian/nikola.manpages
@@ -1 +1 @@
-debian/nikola.1
+docs/man/nikola.1
diff --git a/debian/patches/series b/debian/patches/series
index b980a36..fe6bf15 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 0001-Making-bootstrap-as-default-theme-not-bootstrap3.patch
+0002-Remove-jquery-version-of-bundles.patch