Pull in changes from experimental, including package split.

15 files changed, 151 insertions, 57 deletions

diff --git a/debian/.gitignore b/debian/.gitignore
index 21bc59f..3b43352 100644
--- a/debian/.gitignore
+++ b/debian/.gitignore
@@ -4,5 +4,7 @@
 *.substvars
 files
 klaus/
+python-klaus/
+python3-klaus/
 tmp/
 debhelper-build-stamp
diff --git a/debian/changelog b/debian/changelog
index 835ace1..4b41f95 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+klaus (1.2.1-2) UNRELEASED; urgency=medium
+
+  * Pull in changes from experimental, including package split.
+
+ -- Jelmer Vernooij <jelmer@debian.org>  Thu, 06 Jul 2017 01:13:35 +0000
+
 klaus (1.2.1-1) unstable; urgency=medium
 
   * New upstream release.
@@ -5,6 +11,39 @@ klaus (1.2.1-1) unstable; urgency=medium
 
  -- Jelmer Vernooij <jelmer@debian.org>  Wed, 05 Jul 2017 18:57:31 +0000
 
+klaus (1.0.1+git20170207-1) experimental; urgency=medium
+
+  * New upstream snapshot.
+   + Fixes regression while accessing main repository page.
+  * Add missing dependency on python3 to klaus.
+  * python3-klaus: Remove unnecessary depends on python3-chardet,
+    python3-docutils (already included in Recommends).
+  * Set section for python3-klaus and python-klaus to Python.
+
+ -- Jelmer Vernooij <jelmer@debian.org>  Wed, 08 Feb 2017 03:48:42 +0000
+
+klaus (1.0.1+git20170126-2) experimental; urgency=medium
+
+  * Add recommends for python-chardet, python-docutils, python-markdown.
+  * Move klaus binary back into 'klaus' application package. Keep
+    python3-klaus/python-klaus packages for those using klaus as a library.
+  * Install upstream changelog.
+  * Install README.rst.
+  * Add uwsgi example ini files.
+  * Add Replaces: for older klaus versions to python-klaus.
+    Closes: #854530
+
+ -- Jelmer Vernooij <jelmer@debian.org>  Sun, 29 Jan 2017 23:14:52 +0000
+
+klaus (1.0.1+git20170126-1) experimental; urgency=low
+
+  * New upstream snapshot.
+  * Rename the klaus package to python-klaus, with klaus package as a
+    transitional package.
+  * Add python3-klaus package.
+
+ -- Jelmer Vernooij <jelmer@debian.org>  Fri, 27 Jan 2017 01:00:25 +0000
+
 klaus (1.0.1-1) unstable; urgency=low
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index a1ba646..29d13e3 100644
--- a/debian/control
+++ b/debian/control
@@ -2,20 +2,54 @@ Source: klaus
 Section: vcs
 Priority: optional
 Maintainer: Jelmer Vernooij <jelmer@debian.org>
-Build-Depends-Indep: debhelper (>= 9), python-all (>= 2.6.6-3), python-dulwich (>= 0.13.0), python-six, python-flask, python-pygments, python-humanize, python-requests, python-werkzeug, exuberant-ctags, dh-python, python-setuptools
+Build-Depends-Indep: debhelper (>= 9), python-all (>= 2.6.6-3), python3-all, python-dulwich (>= 0.13.0), python3-dulwich, python-six, python3-six, python-flask, python3-flask, python-pygments, python3-pygments, python-humanize, python3-humanize, python-requests, python3-requests, python-werkzeug, python3-werkzeug, exuberant-ctags, dh-python, python-setuptools, python-markdown, python3-markdown, python-chardet, python3-chardet, python3-docutils, python-docutils
 Standards-Version: 4.0.0
 Homepage: https://github.com/jonashaag/klaus
-Vcs-Git: git://anonscm.debian.org/collab-maint/klaus.git
+Vcs-Git: git://anonscm.debian.org/collab-maint/klaus.git -b experimental
 Vcs-Browser: https://anonscm.debian.org/gitweb/?p=collab-maint/klaus.git;a=summary
 X-Python-Version: >= 2.6
+X-Python3-Version: >= 3.2
 
 Package: klaus
 Architecture: all
+Depends: ${misc:Depends}, python3-klaus (= ${binary:Version}), ${python3:Depends}
+Description: simple easy-to-set-up Git web viewer
+ Features:
+ .
+  * Easy to set up -- almost no configuration required
+  * Syntax highlighting
+  * Git Smart HTTP support
+ .
+ This package contains the command-line server.
+
+Package: python-klaus
+Architecture: all
+Section: python
 Depends: ${misc:Depends}, ${python:Depends}, python-dulwich (>= 0.13.0), python-six, python-flask, python-pygments, python-humanize, python-werkzeug
-Suggests: exuberant-ctags
+Recommends: python-markdown, python-chardet, python-docutils
+Replaces: klaus (<= 1.0.1-1)
+Breaks: klaus (<= 1.0.1-1)
+Suggests: exuberant-ctags, uwsgi-plugin-python | gunicorn
 Description: simple easy-to-set-up Git web viewer
  Features:
  .
   * Easy to set up -- almost no configuration required
   * Syntax highlighting
   * Git Smart HTTP support
+ .
+ This package contains the Python 2.x version.
+
+Package: python3-klaus
+Architecture: all
+Section: python
+Depends: ${misc:Depends}, ${python3:Depends}, python3-dulwich (>= 0.13.0), python3-six, python3-flask, python3-pygments, python3-humanize, python3-werkzeug
+Recommends: python3-markdown, python3-chardet, python3-docutils
+Suggests: exuberant-ctags, uwsgi-plugin-python3 | gunicorn3
+Description: simple easy-to-set-up Git web viewer
+ Features:
+ .
+  * Easy to set up -- almost no configuration required
+  * Syntax highlighting
+  * Git Smart HTTP support
+ .
+ This package contains the Python 3.x version.
diff --git a/debian/klaus.1 b/debian/klaus.1
deleted file mode 100644
index 590de69..0000000
--- a/debian/klaus.1
+++ /dev/null
@@ -1,51 +0,0 @@
-.TH KLAUS "1" "December 2015" "klaus 4e82832" "User Commands"
-.SH NAME
-klaus \- easy to set up Git web viewer
-.SH SYNOPSIS
-.B klaus
-[\fIOPTION\fR]... [\fIDIR\fR]...
-.SH DESCRIPTION
-Klaus is a simple and easy-to-set-up Git web viewer that Just Works\(tm.
-.PP
-It supports syntax highlighting and Git Smart HTTP.
-.SH OPTIONS
-.TP
-\fB\-h\fR, \fB\-\-help\fR
-show this help message and exit
-.TP
-\fB\-\-host\fR HOST
-default: 127.0.0.1
-.TP
-\fB\-\-port\fR PORT
-default: 8080
-.TP
-\fB\-\-site\-name\fR SITE_NAME
-site name showed in header. default: your hostname
-.TP
-\fB\-\-version\fR
-print version number
-.TP
-\fB\-b\fR, \fB\-\-browser\fR
-open klaus in a browser on server start
-.TP
-\fB\-B\fR BROWSER, \fB\-\-with\-browser\fR BROWSER
-specify which browser to use with \fB\-\-browser\fR
-.TP
-\fB\-\-ctags\fR {none,tags\-and\-branches,ALL}
-enable ctags for which revisions? default: none.
-WARNING: Don't use 'ALL' for public servers!
-.SS "Git Smart HTTP:"
-.TP
-\fB\-\-smarthttp\fR
-enable Git Smart HTTP serving
-.TP
-\fB\-\-htdigest\fR FILE
-use credentials from FILE
-.SS "Development flags:"
-.IP
-DO NOT USE IN PRODUCTION!
-.TP
-\fB\-\-debug\fR
-Enable Werkzeug debugger and reloader
-.SH AUTHORS
-Copyright \(co 2011-2015 Jonas Haag <jonas@lophus.org> and contributors (see Git logs).
diff --git a/debian/docs b/debian/klaus.docs
index a1320b1..a1320b1 100644
--- a/debian/docs
+++ b/debian/klaus.docs
diff --git a/debian/klaus.examples b/debian/klaus.examples
new file mode 100644
index 0000000..e97bf36
--- /dev/null
+++ b/debian/klaus.examples
@@ -0,0 +1,2 @@
+debian/uwsgi.ini
+debian/uwsgi-autoreload.ini
diff --git a/debian/klaus.manpages b/debian/klaus.manpages
new file mode 100644
index 0000000..a40af9b
--- /dev/null
+++ b/debian/klaus.manpages
@@ -0,0 +1 @@
+klaus.1
diff --git a/debian/manpages b/debian/manpages
deleted file mode 100644
index 0459737..0000000
--- a/debian/manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/klaus.1
diff --git a/debian/patches/01_httpauth b/debian/patches/01_httpauth
index 7908617..cb8287e 100644
--- a/debian/patches/01_httpauth
+++ b/debian/patches/01_httpauth
@@ -214,3 +214,17 @@ index 2579760..e6e1a70 100644
  
  setup(
      name='klaus',
+diff --git a/klaus/__init__.py b/klaus/__init__.py
+index ecd8795..aefc2b9 100644
+--- a/klaus/__init__.py
++++ b/klaus/__init__.py
+@@ -1,8 +1,8 @@
+ import jinja2
+ import flask
+-import httpauth
+ import dulwich.web
+ from klaus import views, utils
++from klaus import httpauth
+ from klaus.repo import FancyRepo
+ 
+ 
diff --git a/debian/python-klaus.docs b/debian/python-klaus.docs
new file mode 100644
index 0000000..a1320b1
--- /dev/null
+++ b/debian/python-klaus.docs
@@ -0,0 +1 @@
+README.rst
diff --git a/debian/python3-klaus.docs b/debian/python3-klaus.docs
new file mode 100644
index 0000000..a1320b1
--- /dev/null
+++ b/debian/python3-klaus.docs
@@ -0,0 +1 @@
+README.rst
diff --git a/debian/rules b/debian/rules
index c91cbda..6c41658 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,15 +1,27 @@
 #!/usr/bin/make -f
 DPKG_EXPORT_BUILDFLAGS = 1
 
+export PYBUILD_NAME=klaus
+
 include /usr/share/dpkg/default.mk
 
 %:
-	dh $@ --with python2 --buildsystem=python_distutils
+	dh $@ --with python2,python3 --buildsystem=pybuild
+
+override_dh_auto_install:
+	dh_auto_install
+	rm debian/python-klaus/usr/bin/klaus
+	mkdir -p debian/klaus/usr/bin
+	mv debian/python3-klaus/usr/bin/klaus \
+	   debian/klaus/usr/bin/klaus
 
 override_dh_auto_clean:
 	dh_auto_clean
 	rm -rf klaus.egg-info
 	rm -rf tests/repos/build/
 
+override_dh_installchangelogs:
+	dh_installchangelogs CHANGELOG.rst
+
 override_dh_auto_test:
 	#./runtests.sh
diff --git a/debian/uwsgi-autoreload.ini b/debian/uwsgi-autoreload.ini
new file mode 100644
index 0000000..9406112
--- /dev/null
+++ b/debian/uwsgi-autoreload.ini
@@ -0,0 +1,20 @@
+# Example klaus configuration that loads all Git repositories in a specific
+# directory.
+[uwsgi]
+socket = 127.0.0.1:8005
+uid = klaus
+gid = klaus
+master = true
+# Run between 2 and 4 processes, depending on load.
+cheaper = 2
+processes = 4
+module = klaus.contrib.wsgi_autoreload
+plugin = python3
+env = KLAUS_SITE_NAME=A site
+env = KLAUS_REPOS_ROOT=/path/to/git/repositories
+# Uncomment to enable the Git smart http server
+# env = KLAUS_USE_SMARTHTTP=1
+# Uncomment to disable pushing over the smart server
+# env = KLAUS_DISABLE_PUSH=1
+# Uncomment to allow unauthenticated pushes
+# env = KLAUS_UNAUTHENTICATED_PUSH=1
diff --git a/debian/uwsgi.ini b/debian/uwsgi.ini
new file mode 100644
index 0000000..3fc7c72
--- /dev/null
+++ b/debian/uwsgi.ini
@@ -0,0 +1,20 @@
+# Example klaus configuration that loads a specific set of repositories.
+[uwsgi]
+socket = 127.0.0.1:8005
+uid = klaus
+gid = klaus
+master = true
+# Run between 2 and 4 processes, depending on load.
+cheaper = 2
+processes = 4
+module = klaus.contrib.wsgi
+plugin = python3
+env = KLAUS_SITE_NAME=A site
+# Which repositories to load
+env = KLAUS_REPOS=/path/to/git/repo1:/path/to/git/repo2
+# Uncomment to enable the Git smart http server
+# env = KLAUS_USE_SMARTHTTP=1
+# Uncomment to disable pushing over the smart server
+# env = KLAUS_DISABLE_PUSH=1
+# Uncomment to allow unauthenticated pushes
+# env = KLAUS_UNAUTHENTICATED_PUSH=1
diff --git a/klaus/__init__.py b/klaus/__init__.py
index 7745125..ae677fd 100644
--- a/klaus/__init__.py
+++ b/klaus/__init__.py
@@ -1,8 +1,8 @@
 import jinja2
 import flask
-import httpauth
 import dulwich.web
 from klaus import views, utils
+from klaus import httpauth
 from klaus.repo import FancyRepo