From 5cb42cc4e11b74aab00f0e00b60ce74efd5dd468 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jelmer=20Vernoo=C4=B3?= Date: Fri, 27 Jan 2017 01:01:09 +0000 Subject: New upstream snapshot. --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 718076f..d172b00 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +klaus (1.0.1+git20170126-1) UNRELEASED; urgency=medium + + * New upstream snapshot. + + -- Jelmer Vernooij Fri, 27 Jan 2017 01:00:25 +0000 + klaus (1.0.1-1) unstable; urgency=low * New upstream release. -- cgit v1.2.3 From 008588bd1472a870179c49cc8fbabea18489d655 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jelmer=20Vernoo=C4=B3?= Date: Fri, 27 Jan 2017 01:24:31 +0000 Subject: Add python3 package. --- debian/.gitignore | 2 ++ debian/changelog | 3 +++ debian/control | 25 ++++++++++++++++++++- debian/docs | 1 - debian/klaus.1 | 51 ------------------------------------------- debian/manpages | 1 - debian/python-klaus.docs | 1 + debian/python-klaus.install | 2 ++ debian/python-klaus.postinst | 6 +++++ debian/python-klaus.prerm | 8 +++++++ debian/python-klaus3.docs | 1 + debian/python3-klaus.install | 2 ++ debian/python3-klaus.postinst | 6 +++++ debian/python3-klaus.prerm | 8 +++++++ debian/rules | 10 ++++++++- 15 files changed, 72 insertions(+), 55 deletions(-) delete mode 100644 debian/docs delete mode 100644 debian/klaus.1 delete mode 100644 debian/manpages create mode 100644 debian/python-klaus.docs create mode 100644 debian/python-klaus.install create mode 100644 debian/python-klaus.postinst create mode 100644 debian/python-klaus.prerm create mode 100644 debian/python-klaus3.docs create mode 100644 debian/python3-klaus.install create mode 100644 debian/python3-klaus.postinst create mode 100644 debian/python3-klaus.prerm 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 d172b00..381c0fe 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,9 @@ klaus (1.0.1+git20170126-1) UNRELEASED; urgency=medium * New upstream snapshot. + * Rename the klaus package to python-klaus, with klaus package as a + transitional package. + * Add python3-klaus package. -- Jelmer Vernooij Fri, 27 Jan 2017 01:00:25 +0000 diff --git a/debian/control b/debian/control index 7bdfe7f..4df98d3 100644 --- a/debian/control +++ b/debian/control @@ -2,15 +2,23 @@ Source: klaus Section: vcs Priority: optional Maintainer: Jelmer Vernooij -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 Standards-Version: 3.9.8 Homepage: https://github.com/jonashaag/klaus Vcs-Git: git://anonscm.debian.org/collab-maint/klaus.git 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}, python-klaus +Description: transitional dummy package for python-klaus + This is a transitional dummy package that depends on python-klaus. It can be + safely removed. + +Package: python-klaus +Architecture: all Depends: ${misc:Depends}, ${python:Depends}, python-dulwich (>= 0.13.0), python-six, python-flask, python-pygments, python-humanize, python-werkzeug Suggests: exuberant-ctags Description: simple easy-to-set-up Git web viewer @@ -19,3 +27,18 @@ Description: simple easy-to-set-up Git web viewer * 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 +Depends: ${misc:Depends}, ${python3:Depends}, python3-dulwich (>= 0.13.0), python3-six, python3-flask, python3-pygments, python3-humanize, python3-werkzeug +Suggests: exuberant-ctags +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/docs b/debian/docs deleted file mode 100644 index a1320b1..0000000 --- a/debian/docs +++ /dev/null @@ -1 +0,0 @@ -README.rst 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 and contributors (see Git logs). 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/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/python-klaus.install b/debian/python-klaus.install new file mode 100644 index 0000000..0b01eba --- /dev/null +++ b/debian/python-klaus.install @@ -0,0 +1,2 @@ +usr/bin/klaus2 +usr/share/man/man1/klaus2.1 diff --git a/debian/python-klaus.postinst b/debian/python-klaus.postinst new file mode 100644 index 0000000..16988c1 --- /dev/null +++ b/debian/python-klaus.postinst @@ -0,0 +1,6 @@ +#!/bin/sh -e + +update-alternatives --install /usr/bin/klaus klaus /usr/bin/klaus2 23 \ + --slave /usr/share/man/man1/klaus.1.gz klaus.1.gz /usr/share/man/man1/klaus2.1.gz + +#DEBHELPER# diff --git a/debian/python-klaus.prerm b/debian/python-klaus.prerm new file mode 100644 index 0000000..66ffd17 --- /dev/null +++ b/debian/python-klaus.prerm @@ -0,0 +1,8 @@ +#!/bin/sh -e + +if [ "$1" != "upgrade" ] +then + update-alternatives --remove klaus /usr/bin/klaus2 +fi + +#DEBHELPER# diff --git a/debian/python-klaus3.docs b/debian/python-klaus3.docs new file mode 100644 index 0000000..a1320b1 --- /dev/null +++ b/debian/python-klaus3.docs @@ -0,0 +1 @@ +README.rst diff --git a/debian/python3-klaus.install b/debian/python3-klaus.install new file mode 100644 index 0000000..083fa0f --- /dev/null +++ b/debian/python3-klaus.install @@ -0,0 +1,2 @@ +usr/bin/klaus3 +usr/share/man/man1/klaus3.1 diff --git a/debian/python3-klaus.postinst b/debian/python3-klaus.postinst new file mode 100644 index 0000000..d748a14 --- /dev/null +++ b/debian/python3-klaus.postinst @@ -0,0 +1,6 @@ +#!/bin/sh -e + +update-alternatives --install /usr/bin/klaus klaus /usr/bin/klaus3 5 \ + --slave /usr/share/man/man1/klaus.1.gz klaus.1.gz /usr/share/man/man1/klaus3.1.gz + +#DEBHELPER# diff --git a/debian/python3-klaus.prerm b/debian/python3-klaus.prerm new file mode 100644 index 0000000..fbbe284 --- /dev/null +++ b/debian/python3-klaus.prerm @@ -0,0 +1,8 @@ +#!/bin/sh -e + +if [ "$1" != "upgrade" ] +then + update-alternatives --remove klaus /usr/bin/klaus3 +fi + +#DEBHELPER# diff --git a/debian/rules b/debian/rules index c91cbda..95e7b24 100755 --- a/debian/rules +++ b/debian/rules @@ -1,10 +1,18 @@ #!/usr/bin/make -f DPKG_EXPORT_BUILDFLAGS = 1 +export PYBUILD_AFTER_INSTALL=mv '{destdir}/usr/bin/klaus' '{destdir}/usr/bin/klaus{version.major}' + 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 + install -d debian/tmp/usr/share/man/man1 + install -T klaus.1 debian/tmp/usr/share/man/man1/klaus2.1 + install -T klaus.1 debian/tmp/usr/share/man/man1/klaus3.1 override_dh_auto_clean: dh_auto_clean -- cgit v1.2.3 From e97976b898f5739bb764bd1beb049f14ccd13415 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jelmer=20Vernoo=C4=B3?= Date: Fri, 27 Jan 2017 02:30:57 +0000 Subject: Update 01_httpauth: Fix import with python3. --- debian/patches/01_httpauth | 14 ++++++++++++++ klaus/__init__.py | 2 +- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/debian/patches/01_httpauth b/debian/patches/01_httpauth index 8f006a0..252f849 100644 --- a/debian/patches/01_httpauth +++ b/debian/patches/01_httpauth @@ -212,3 +212,17 @@ index 0000000..82860d0 try: import argparse # not available for Python 2.6 +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/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 -- cgit v1.2.3 From e6bd3cc4dfbaa7442507b70684e2e44940840638 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jelmer=20Vernoo=C4=B3?= Date: Fri, 27 Jan 2017 02:33:53 +0000 Subject: Set pybuild data. --- debian/python-klaus.install | 1 - debian/python3-klaus.install | 1 - debian/rules | 1 + 3 files changed, 1 insertion(+), 2 deletions(-) diff --git a/debian/python-klaus.install b/debian/python-klaus.install index 0b01eba..d4b4c3a 100644 --- a/debian/python-klaus.install +++ b/debian/python-klaus.install @@ -1,2 +1 @@ -usr/bin/klaus2 usr/share/man/man1/klaus2.1 diff --git a/debian/python3-klaus.install b/debian/python3-klaus.install index 083fa0f..f0282c2 100644 --- a/debian/python3-klaus.install +++ b/debian/python3-klaus.install @@ -1,2 +1 @@ -usr/bin/klaus3 usr/share/man/man1/klaus3.1 diff --git a/debian/rules b/debian/rules index 95e7b24..fe21dfe 100755 --- a/debian/rules +++ b/debian/rules @@ -1,6 +1,7 @@ #!/usr/bin/make -f DPKG_EXPORT_BUILDFLAGS = 1 +export PYBUILD_NAME=klaus export PYBUILD_AFTER_INSTALL=mv '{destdir}/usr/bin/klaus' '{destdir}/usr/bin/klaus{version.major}' include /usr/share/dpkg/default.mk -- cgit v1.2.3 From 81a54880ff846fbebdee60b495770b8b9689d0eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jelmer=20Vernoo=C4=B3?= Date: Sun, 29 Jan 2017 16:45:33 +0000 Subject: releasing package klaus version 1.0.1+git20170126-1 --- debian/changelog | 2 +- debian/control | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 381c0fe..e90520f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -klaus (1.0.1+git20170126-1) UNRELEASED; urgency=medium +klaus (1.0.1+git20170126-1) experimental; urgency=low * New upstream snapshot. * Rename the klaus package to python-klaus, with klaus package as a diff --git a/debian/control b/debian/control index 4df98d3..3ce1526 100644 --- a/debian/control +++ b/debian/control @@ -5,7 +5,7 @@ Maintainer: Jelmer Vernooij 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 Standards-Version: 3.9.8 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 -- cgit v1.2.3 From fb95c338b4440dffbd49e7dd9bbb74f4fed77975 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jelmer=20Vernoo=C4=B3?= Date: Sun, 29 Jan 2017 23:14:54 +0000 Subject: Add recommends for python-chardet, python-docutils, python-markdown. --- debian/changelog | 6 ++++++ debian/control | 8 +++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index e90520f..9dcfd5e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +klaus (1.0.1+git20170126-2) UNRELEASED; urgency=medium + + * Add recommends for python-chardet, python-docutils, python-markdown. + + -- Jelmer Vernooij Sun, 29 Jan 2017 23:14:52 +0000 + klaus (1.0.1+git20170126-1) experimental; urgency=low * New upstream snapshot. diff --git a/debian/control b/debian/control index 3ce1526..0000532 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: klaus Section: vcs Priority: optional Maintainer: Jelmer Vernooij -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 +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: 3.9.8 Homepage: https://github.com/jonashaag/klaus Vcs-Git: git://anonscm.debian.org/collab-maint/klaus.git -b experimental @@ -19,7 +19,8 @@ Description: transitional dummy package for python-klaus Package: python-klaus Architecture: all -Depends: ${misc:Depends}, ${python:Depends}, python-dulwich (>= 0.13.0), python-six, python-flask, python-pygments, python-humanize, python-werkzeug +Depends: ${misc:Depends}, ${python:Depends}, python-dulwich (>= 0.13.0), python-six, python-flask, python-pygments, python-humanize, python-werkzeug, python-chardet +Recommends: python-markdown, python-chardet, python-docutils Suggests: exuberant-ctags Description: simple easy-to-set-up Git web viewer Features: @@ -32,7 +33,8 @@ Description: simple easy-to-set-up Git web viewer Package: python3-klaus Architecture: all -Depends: ${misc:Depends}, ${python3:Depends}, python3-dulwich (>= 0.13.0), python3-six, python3-flask, python3-pygments, python3-humanize, python3-werkzeug +Depends: ${misc:Depends}, ${python3:Depends}, python3-dulwich (>= 0.13.0), python3-six, python3-flask, python3-pygments, python3-humanize, python3-werkzeug, python3-chardet, python3-docutils +Recommends: python3-markdown Suggests: exuberant-ctags Description: simple easy-to-set-up Git web viewer Features: -- cgit v1.2.3 From 642a90118b8f892646cf3923a7af6ccf2d80ebd6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jelmer=20Vernoo=C4=B3?= Date: Tue, 31 Jan 2017 23:04:09 +0000 Subject: Move klaus binary back into 'klaus' application package. Keep python3-klaus/python-klaus packages for those using klaus as a library. --- debian/changelog | 2 ++ debian/control | 19 ++++++++++++------- debian/klaus.manpages | 1 + debian/python-klaus.install | 1 - debian/python-klaus.postinst | 6 ------ debian/python-klaus.prerm | 8 -------- debian/python-klaus3.docs | 1 - debian/python3-klaus.docs | 1 + debian/python3-klaus.install | 1 - debian/python3-klaus.postinst | 6 ------ debian/python3-klaus.prerm | 8 -------- debian/rules | 8 ++++---- 12 files changed, 20 insertions(+), 42 deletions(-) create mode 100644 debian/klaus.manpages delete mode 100644 debian/python-klaus.install delete mode 100644 debian/python-klaus.postinst delete mode 100644 debian/python-klaus.prerm delete mode 100644 debian/python-klaus3.docs create mode 100644 debian/python3-klaus.docs delete mode 100644 debian/python3-klaus.install delete mode 100644 debian/python3-klaus.postinst delete mode 100644 debian/python3-klaus.prerm diff --git a/debian/changelog b/debian/changelog index 9dcfd5e..169cbfb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ klaus (1.0.1+git20170126-2) UNRELEASED; 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. -- Jelmer Vernooij Sun, 29 Jan 2017 23:14:52 +0000 diff --git a/debian/control b/debian/control index 0000532..71d5a92 100644 --- a/debian/control +++ b/debian/control @@ -12,16 +12,21 @@ X-Python3-Version: >= 3.2 Package: klaus Architecture: all -Depends: ${misc:Depends}, python-klaus -Description: transitional dummy package for python-klaus - This is a transitional dummy package that depends on python-klaus. It can be - safely removed. +Depends: ${misc:Depends}, python3-klaus +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 Depends: ${misc:Depends}, ${python:Depends}, python-dulwich (>= 0.13.0), python-six, python-flask, python-pygments, python-humanize, python-werkzeug, python-chardet -Recommends: python-markdown, python-chardet, python-docutils -Suggests: exuberant-ctags +Recommends: python-markdown, python-chardet, python-docutils, uwsgi-plugin +Suggests: exuberant-ctags, uwsgi-plugin-python | gunicorn Description: simple easy-to-set-up Git web viewer Features: . @@ -35,7 +40,7 @@ Package: python3-klaus Architecture: all Depends: ${misc:Depends}, ${python3:Depends}, python3-dulwich (>= 0.13.0), python3-six, python3-flask, python3-pygments, python3-humanize, python3-werkzeug, python3-chardet, python3-docutils Recommends: python3-markdown -Suggests: exuberant-ctags +Suggests: exuberant-ctags, uwsgi-plugin-python3 | gunicorn3 Description: simple easy-to-set-up Git web viewer Features: . 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/python-klaus.install b/debian/python-klaus.install deleted file mode 100644 index d4b4c3a..0000000 --- a/debian/python-klaus.install +++ /dev/null @@ -1 +0,0 @@ -usr/share/man/man1/klaus2.1 diff --git a/debian/python-klaus.postinst b/debian/python-klaus.postinst deleted file mode 100644 index 16988c1..0000000 --- a/debian/python-klaus.postinst +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh -e - -update-alternatives --install /usr/bin/klaus klaus /usr/bin/klaus2 23 \ - --slave /usr/share/man/man1/klaus.1.gz klaus.1.gz /usr/share/man/man1/klaus2.1.gz - -#DEBHELPER# diff --git a/debian/python-klaus.prerm b/debian/python-klaus.prerm deleted file mode 100644 index 66ffd17..0000000 --- a/debian/python-klaus.prerm +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh -e - -if [ "$1" != "upgrade" ] -then - update-alternatives --remove klaus /usr/bin/klaus2 -fi - -#DEBHELPER# diff --git a/debian/python-klaus3.docs b/debian/python-klaus3.docs deleted file mode 100644 index a1320b1..0000000 --- a/debian/python-klaus3.docs +++ /dev/null @@ -1 +0,0 @@ -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/python3-klaus.install b/debian/python3-klaus.install deleted file mode 100644 index f0282c2..0000000 --- a/debian/python3-klaus.install +++ /dev/null @@ -1 +0,0 @@ -usr/share/man/man1/klaus3.1 diff --git a/debian/python3-klaus.postinst b/debian/python3-klaus.postinst deleted file mode 100644 index d748a14..0000000 --- a/debian/python3-klaus.postinst +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh -e - -update-alternatives --install /usr/bin/klaus klaus /usr/bin/klaus3 5 \ - --slave /usr/share/man/man1/klaus.1.gz klaus.1.gz /usr/share/man/man1/klaus3.1.gz - -#DEBHELPER# diff --git a/debian/python3-klaus.prerm b/debian/python3-klaus.prerm deleted file mode 100644 index fbbe284..0000000 --- a/debian/python3-klaus.prerm +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh -e - -if [ "$1" != "upgrade" ] -then - update-alternatives --remove klaus /usr/bin/klaus3 -fi - -#DEBHELPER# diff --git a/debian/rules b/debian/rules index fe21dfe..56cbe65 100755 --- a/debian/rules +++ b/debian/rules @@ -2,7 +2,6 @@ DPKG_EXPORT_BUILDFLAGS = 1 export PYBUILD_NAME=klaus -export PYBUILD_AFTER_INSTALL=mv '{destdir}/usr/bin/klaus' '{destdir}/usr/bin/klaus{version.major}' include /usr/share/dpkg/default.mk @@ -11,9 +10,10 @@ include /usr/share/dpkg/default.mk override_dh_auto_install: dh_auto_install - install -d debian/tmp/usr/share/man/man1 - install -T klaus.1 debian/tmp/usr/share/man/man1/klaus2.1 - install -T klaus.1 debian/tmp/usr/share/man/man1/klaus3.1 + 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 -- cgit v1.2.3 From 5b51653cf4a7534907731827ed767cdefcb8cc86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jelmer=20Vernoo=C4=B3?= Date: Tue, 31 Jan 2017 23:12:26 +0000 Subject: Install upstream changelog and readme. --- debian/changelog | 2 ++ debian/klaus.docs | 1 + debian/rules | 3 +++ 3 files changed, 6 insertions(+) create mode 100644 debian/klaus.docs diff --git a/debian/changelog b/debian/changelog index 169cbfb..b7faf8d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,8 @@ klaus (1.0.1+git20170126-2) UNRELEASED; 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. -- Jelmer Vernooij Sun, 29 Jan 2017 23:14:52 +0000 diff --git a/debian/klaus.docs b/debian/klaus.docs new file mode 100644 index 0000000..a1320b1 --- /dev/null +++ b/debian/klaus.docs @@ -0,0 +1 @@ +README.rst diff --git a/debian/rules b/debian/rules index 56cbe65..11d5c0b 100755 --- a/debian/rules +++ b/debian/rules @@ -20,5 +20,8 @@ override_dh_auto_clean: rm -rf klaus.egg-info rm -rf tests/repos/build/ +override_dh_installchangelog: + dh_installchangelog CHANGELOG.rst + override_dh_auto_test: #./runtests.sh -- cgit v1.2.3 From c9551acbb9d2926e023c305ad7505b0595ef06a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jelmer=20Vernoo=C4=B3?= Date: Tue, 31 Jan 2017 23:20:38 +0000 Subject: Add uwsgi example ini files. --- debian/changelog | 1 + debian/klaus.examples | 2 ++ debian/uwsgi-autoreload.ini | 20 ++++++++++++++++++++ debian/uwsgi.ini | 20 ++++++++++++++++++++ 4 files changed, 43 insertions(+) create mode 100644 debian/klaus.examples create mode 100644 debian/uwsgi-autoreload.ini create mode 100644 debian/uwsgi.ini diff --git a/debian/changelog b/debian/changelog index b7faf8d..77f64ea 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ klaus (1.0.1+git20170126-2) UNRELEASED; urgency=medium python3-klaus/python-klaus packages for those using klaus as a library. * Install upstream changelog. * Install README.rst. + * Add uwsgi example ini files. -- Jelmer Vernooij Sun, 29 Jan 2017 23:14:52 +0000 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/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 -- cgit v1.2.3 From a1850e1fe7cad9f59cf5a508cccc606dc4e0d7f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jelmer=20Vernoo=C4=B3?= Date: Wed, 8 Feb 2017 03:40:42 +0000 Subject: Add Replaces: for older klaus versions to python-klaus. Closes: #854530 --- debian/changelog | 2 ++ debian/control | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 77f64ea..8ee0cff 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,8 @@ klaus (1.0.1+git20170126-2) UNRELEASED; urgency=medium * Install upstream changelog. * Install README.rst. * Add uwsgi example ini files. + * Add Replaces: for older klaus versions to python-klaus. Closes: + #854530 -- Jelmer Vernooij Sun, 29 Jan 2017 23:14:52 +0000 diff --git a/debian/control b/debian/control index 71d5a92..023082d 100644 --- a/debian/control +++ b/debian/control @@ -12,7 +12,7 @@ X-Python3-Version: >= 3.2 Package: klaus Architecture: all -Depends: ${misc:Depends}, python3-klaus +Depends: ${misc:Depends}, python3-klaus (= ${binary:Version}) Description: simple easy-to-set-up Git web viewer Features: . @@ -26,6 +26,7 @@ Package: python-klaus Architecture: all Depends: ${misc:Depends}, ${python:Depends}, python-dulwich (>= 0.13.0), python-six, python-flask, python-pygments, python-humanize, python-werkzeug, python-chardet Recommends: python-markdown, python-chardet, python-docutils, uwsgi-plugin +Replaces: klaus (<= 1.0.1-1) Suggests: exuberant-ctags, uwsgi-plugin-python | gunicorn Description: simple easy-to-set-up Git web viewer Features: -- cgit v1.2.3 From ef07455ee8e97b8bfebeefcbc2592dec12b89c73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jelmer=20Vernoo=C4=B3?= Date: Wed, 8 Feb 2017 03:41:38 +0000 Subject: Fix typo. --- debian/rules | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/rules b/debian/rules index 11d5c0b..6c41658 100755 --- a/debian/rules +++ b/debian/rules @@ -20,8 +20,8 @@ override_dh_auto_clean: rm -rf klaus.egg-info rm -rf tests/repos/build/ -override_dh_installchangelog: - dh_installchangelog CHANGELOG.rst +override_dh_installchangelogs: + dh_installchangelogs CHANGELOG.rst override_dh_auto_test: #./runtests.sh -- cgit v1.2.3 From 8181d3e8fa7e9ab5c5dcd1018ae6a79498e26128 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jelmer=20Vernoo=C4=B3?= Date: Wed, 8 Feb 2017 03:42:53 +0000 Subject: Fix dependencies. --- debian/control | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/control b/debian/control index 023082d..e7e74be 100644 --- a/debian/control +++ b/debian/control @@ -24,8 +24,8 @@ Description: simple easy-to-set-up Git web viewer Package: python-klaus Architecture: all -Depends: ${misc:Depends}, ${python:Depends}, python-dulwich (>= 0.13.0), python-six, python-flask, python-pygments, python-humanize, python-werkzeug, python-chardet -Recommends: python-markdown, python-chardet, python-docutils, uwsgi-plugin +Depends: ${misc:Depends}, ${python:Depends}, python-dulwich (>= 0.13.0), python-six, python-flask, python-pygments, python-humanize, python-werkzeug +Recommends: python-markdown, python-chardet, python-docutils Replaces: klaus (<= 1.0.1-1) Suggests: exuberant-ctags, uwsgi-plugin-python | gunicorn Description: simple easy-to-set-up Git web viewer @@ -40,7 +40,7 @@ Description: simple easy-to-set-up Git web viewer Package: python3-klaus Architecture: all Depends: ${misc:Depends}, ${python3:Depends}, python3-dulwich (>= 0.13.0), python3-six, python3-flask, python3-pygments, python3-humanize, python3-werkzeug, python3-chardet, python3-docutils -Recommends: python3-markdown +Recommends: python3-markdown, python3-chardet, python3-docutils Suggests: exuberant-ctags, uwsgi-plugin-python3 | gunicorn3 Description: simple easy-to-set-up Git web viewer Features: -- cgit v1.2.3 From f0ade6b1f6a86db81e3b28e144ba082461077bf7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jelmer=20Vernoo=C4=B3?= Date: Wed, 8 Feb 2017 03:44:22 +0000 Subject: Also add breaks. --- debian/control | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/control b/debian/control index e7e74be..e085da3 100644 --- a/debian/control +++ b/debian/control @@ -27,6 +27,7 @@ Architecture: all Depends: ${misc:Depends}, ${python:Depends}, python-dulwich (>= 0.13.0), python-six, python-flask, python-pygments, python-humanize, python-werkzeug 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: -- cgit v1.2.3 From 1ec83ce4261570e4a41161f5d9449057ad4cc6e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jelmer=20Vernoo=C4=B3?= Date: Wed, 8 Feb 2017 03:44:38 +0000 Subject: releasing package klaus version 1.0.1+git20170126-2 --- debian/changelog | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 8ee0cff..1bd0bb3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -klaus (1.0.1+git20170126-2) UNRELEASED; urgency=medium +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 @@ -6,8 +6,8 @@ klaus (1.0.1+git20170126-2) UNRELEASED; urgency=medium * Install upstream changelog. * Install README.rst. * Add uwsgi example ini files. - * Add Replaces: for older klaus versions to python-klaus. Closes: - #854530 + * Add Replaces: for older klaus versions to python-klaus. + Closes: #854530 -- Jelmer Vernooij Sun, 29 Jan 2017 23:14:52 +0000 -- cgit v1.2.3 From 293db3ac04e4ac632a707429bc52bf283c003cdc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jelmer=20Vernoo=C4=B3?= Date: Wed, 8 Feb 2017 03:49:03 +0000 Subject: New upstream snapshot. --- debian/changelog | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/debian/changelog b/debian/changelog index 1bd0bb3..636d820 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +klaus (1.0.1+git20170207-1) UNRELEASED; urgency=medium + + * New upstream snapshot. + + Fixes regression while accessing main repository page. + + -- Jelmer Vernooij 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. -- cgit v1.2.3 From b9c9d6e11644e27b420d071bc874104f3fd38420 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jelmer=20Vernoo=C4=B3?= Date: Wed, 8 Feb 2017 03:56:38 +0000 Subject: Several packaging fixes. --- debian/changelog | 4 ++++ debian/control | 6 ++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 636d820..5df9518 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,10 @@ klaus (1.0.1+git20170207-1) UNRELEASED; 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 Wed, 08 Feb 2017 03:48:42 +0000 diff --git a/debian/control b/debian/control index e085da3..a9a680a 100644 --- a/debian/control +++ b/debian/control @@ -12,7 +12,7 @@ X-Python3-Version: >= 3.2 Package: klaus Architecture: all -Depends: ${misc:Depends}, python3-klaus (= ${binary:Version}) +Depends: ${misc:Depends}, python3-klaus (= ${binary:Version}), ${python3:Depends} Description: simple easy-to-set-up Git web viewer Features: . @@ -24,6 +24,7 @@ Description: simple easy-to-set-up Git web viewer 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 Recommends: python-markdown, python-chardet, python-docutils Replaces: klaus (<= 1.0.1-1) @@ -40,7 +41,8 @@ Description: simple easy-to-set-up Git web viewer Package: python3-klaus Architecture: all -Depends: ${misc:Depends}, ${python3:Depends}, python3-dulwich (>= 0.13.0), python3-six, python3-flask, python3-pygments, python3-humanize, python3-werkzeug, python3-chardet, python3-docutils +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 -- cgit v1.2.3 From 8ea1663a71446216eab1901d379536eb5c034e5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jelmer=20Vernoo=C4=B3?= Date: Wed, 8 Feb 2017 03:58:22 +0000 Subject: releasing package klaus version 1.0.1+git20170207-1 --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 5df9518..095cdf8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -klaus (1.0.1+git20170207-1) UNRELEASED; urgency=medium +klaus (1.0.1+git20170207-1) experimental; urgency=medium * New upstream snapshot. + Fixes regression while accessing main repository page. -- cgit v1.2.3