[Python-modules-commits] [panoramisk] 05/08: merge patched into master

[Orestis Ioannou]

This is an automated email from the git hooks/post-receive script.

oorestisime-guest pushed a commit to branch master
in repository panoramisk.

commit a78c79111d837f24e35afc63fa1ff72b6e32d111
Merge: bd05a26 30173e6
Author: Orestis Ioannou <orestis at oioannou.com>
Date:   Wed Jul 6 23:50:42 2016 +0200

    merge patched into master

 debian/.git-dpm                                     |  4 ++--
 ...ersion-in-docs-since-package-not-yet-insta.patch | 21 +++++++++++++++++++++
 debian/patches/series                               |  1 +
 docs/conf.py                                        |  3 +--
 4 files changed, 25 insertions(+), 4 deletions(-)

diff --cc debian/.git-dpm
index 080a515,0000000..a73ce42
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,8 -1,0 +1,8 @@@
 +# see git-dpm(1) from git-dpm package
- 86374c4b10e82edf985aeb620ab4ce377cf3a2dd
- 86374c4b10e82edf985aeb620ab4ce377cf3a2dd
++30173e66b9ca0e762d1f5f85e0c19919855f28d4
++30173e66b9ca0e762d1f5f85e0c19919855f28d4
 +86374c4b10e82edf985aeb620ab4ce377cf3a2dd
 +86374c4b10e82edf985aeb620ab4ce377cf3a2dd
 +panoramisk_1.0.orig.tar.gz
 +ed430ea6470331a1540543d1e1c95314e7bea646
 +40197
diff --cc debian/patches/0001-hardcode-version-in-docs-since-package-not-yet-insta.patch
index 0000000,0000000..814641e
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-hardcode-version-in-docs-since-package-not-yet-insta.patch
@@@ -1,0 -1,0 +1,21 @@@
++From 30173e66b9ca0e762d1f5f85e0c19919855f28d4 Mon Sep 17 00:00:00 2001
++From: Orestis Ioannou <orestis at oioannou.com>
++Date: Wed, 6 Jul 2016 23:50:37 +0200
++Subject: hardcode version in docs since package not yet installed
++
++---
++ docs/conf.py | 3 +--
++ 1 file changed, 1 insertion(+), 2 deletions(-)
++
++diff --git a/docs/conf.py b/docs/conf.py
++index c56f8ca..08dd834 100755
++--- a/docs/conf.py
+++++ b/docs/conf.py
++@@ -242,6 +242,5 @@ texinfo_documents = [
++ #texinfo_show_urls = 'footnote'
++ 
++ html_theme = 'nature'
++-import pkg_resources
++-version = pkg_resources.get_distribution("panoramisk").version
+++version = '1.0'
++ release = version
diff --cc debian/patches/series
index 0000000,0000000..8ae3092
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++0001-hardcode-version-in-docs-since-package-not-yet-insta.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/panoramisk.git