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