From 2fcbc649157b84b48c94c35af869b29ded5a1810 Mon Sep 17 00:00:00 2001 From: Sebastiaan Mathot Date: Wed, 20 Aug 2014 13:00:09 +0200 Subject: [PATCH] Update Ubuntu packaging --- debian/changelog | 4 +++- debian/control | 12 ++++++------ debian/rules | 44 +++----------------------------------------- readme-src.md | 6 +++--- readme.md | 8 ++++---- setup.py | 4 ++-- 6 files changed, 21 insertions(+), 57 deletions(-) diff --git a/debian/changelog b/debian/changelog index d44b7c1..b80cff0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ -qnotero (1.0.0-ubuntu1) trusty; urgency=medium +qnotero (1.0.0-ubuntu7) trusty; urgency=medium * Ported to Python 3 + * Add tag support + * Do not treat editors as authors * Various bug-fixes -- Sebastiaan Mathot Tue, 19 Aug 2014 16:43:29 +0200 diff --git a/debian/control b/debian/control index eb1beef..911f253 100644 --- a/debian/control +++ b/debian/control @@ -3,18 +3,18 @@ Section: science Priority: extra Maintainer: Sebastiaan Mathot Uploaders: Sebastiaan Mathot -Build-Depends: debhelper (>= 7.0.50~), python3-support, python3-all -XS-Python-Version: >= 2.6 +Build-Depends: debhelper (>= 7.0.50~), python3-all, python3-pyqt4 (>= 4.6.0) +X-Python3-Version: >= 3.3 Standards-Version: 3.9.1 Homepage: http://www.cogsci.nl/ Package: qnotero Architecture: all -XB-Python-Version: ${python:Versions} -Depends: ${misc:Depends}, ${python:Depends}, python3-pyqt4 (>= 4.6.0), +X-Python3-Version: ${python3:Versions} +Depends: ${misc:Depends}, ${python3:Depends}, python3-pyqt4 (>= 4.6.0), python3-levenshtein -Recommends: -Suggests: xul-ext-zotero zotero-standalone +Recommends: +Suggests: xul-ext-zotero, zotero-standalone Description: Qnotero is a sidekick to Zotero, the open-source reference manager. Zotero is an excellent tool for managing your reference, but it lacks a simple and direct way to search your references and open attached PDFs at the click diff --git a/debian/rules b/debian/rules index 7d2f6e5..0440c11 100755 --- a/debian/rules +++ b/debian/rules @@ -1,43 +1,5 @@ -#!/usr/bin/make -f +export DH_VERBOSE=1 +export PYBUILD_NAME=qnotero -srcpkg = $(shell LC_ALL=C dpkg-parsechangelog | grep '^Source:' | cut -d ' ' -f 2,2) -debver = $(shell LC_ALL=C dpkg-parsechangelog | grep '^Version:' | cut -d ' ' -f 2,2 ) -upstreamver = $(shell echo $(debver) | cut -d '-' -f 1,1 ) - -# this figures out the last merge point from 'master' into the Debian branch and -# then described this commit relative to the last release tag (V...) -# If this should make any sense the local master branch must track upstreams -# master. -gitver = $(shell [ -x /usr/bin/git ] && git describe --tags --match 'release/*' $$(git merge-base -a HEAD master) | sed -e 's,^release/,,' -e 's/-/+git/') - -# one ring to rule them all ... %: - dh $@ - -override_dh_auto_clean: - dh_auto_clean - # restore old Qt wrappers - [ -d debian/temp_store ] && cp debian/temp_store/* libqtopensesame/ || true - -rm -rf debian/temp_store - -override_dh_auto_build: - # move pre-generated Qt wrappers aside - mkdir -p debian/temp_store - cp -t debian/temp_store libqnotero/*Ui.py - # update PyQt wrappers - ./scripts/compile_ui.sh - dh_auto_build - - -override_dh_install: - dh_install - # cleanups - # no duplicate license info - -rm debian/qnotero/usr/share/qnotero/COPYING - -# make orig tarball from repository content -get-orig-source: - # orig tarball, turn directory into something nicer - git archive --format=tar --prefix=$(srcpkg)-$(gitver)/ HEAD | \ - gzip -9 > $(srcpkg)_$(gitver).orig.tar.gz - + dh $@ --with python3 --buildsystem=pybuild diff --git a/readme-src.md b/readme-src.md index 4a82761..924a68e 100644 --- a/readme-src.md +++ b/readme-src.md @@ -34,7 +34,7 @@ Ubuntu/ Linux Mint users can install Qnotero through the [Cogsci.nl PPA]: ### Mac OS -There is no Qnotero package available for Mac OS. It should be possible to run Qnotero from source, if you have all the dependencies installed (notably Python and PyQt4). Please let me know of any experiences running Qnotero on Mac OS (good or bad). +There is no Qnotero package available for Mac OS. It should be possible to run Qnotero from source, if you have all the dependencies installed (notably Python 3 and PyQt4). Please let me know of any experiences running Qnotero on Mac OS (good or bad). ### Other operating systems @@ -46,7 +46,7 @@ For other operating systems, you can (try to) run Qnotero from source. Source co Qnotero has the following dependencies. -- [Python 3] -- As of Qnotero 1.0.0, Python 2 is no longer supported. +- [Python] -- As of Qnotero 1.0.0, Python >= 3.3 is required. - [PyQt4] ## Gnote integration (Linux only) @@ -95,5 +95,5 @@ There are a number of channels through which you can ask questions and provide f [cogsci.nl ppa]: https://launchpad.net/~smathot/+archive/ubuntu/cogscinl [forum]: http://forum.cogsci.nl/ -[python 3]: https://www.python.org/ +[python]: https://www.python.org/ [pyqt4]: http://www.riverbankcomputing.co.uk/software/pyqt/download diff --git a/readme.md b/readme.md index f3ce6d5..ecd1c90 100644 --- a/readme.md +++ b/readme.md @@ -1,4 +1,4 @@ -Qnotero v1.0.0~pre1 +Qnotero v1.0.0 *Copyright 2011-2014 Sebastiaan Mathôt* @@ -45,7 +45,7 @@ Ubuntu/ Linux Mint users can install Qnotero through the [Cogsci.nl PPA]: ### Mac OS -There is no Qnotero package available for Mac OS. It should be possible to run Qnotero from source, if you have all the dependencies installed (notably Python and PyQt4). Please let me know of any experiences running Qnotero on Mac OS (good or bad). +There is no Qnotero package available for Mac OS. It should be possible to run Qnotero from source, if you have all the dependencies installed (notably Python 3 and PyQt4). Please let me know of any experiences running Qnotero on Mac OS (good or bad). ### Other operating systems @@ -57,7 +57,7 @@ For other operating systems, you can (try to) run Qnotero from source. Source co Qnotero has the following dependencies. -- [Python 3] -- As of Qnotero 1.0.0, Python 2 is no longer supported. +- [Python] -- As of Qnotero 1.0.0, Python >= 3.3 is required. - [PyQt4] ## Gnote integration (Linux only) @@ -106,7 +106,7 @@ There are a number of channels through which you can ask questions and provide f [cogsci.nl ppa]: https://launchpad.net/~smathot/+archive/ubuntu/cogscinl [forum]: http://forum.cogsci.nl/ -[python 3]: https://www.python.org/ +[python]: https://www.python.org/ [pyqt4]: http://www.riverbankcomputing.co.uk/software/pyqt/download [Overview]: #overview diff --git a/setup.py b/setup.py index b0c9ae9..07ab8e1 100755 --- a/setup.py +++ b/setup.py @@ -34,8 +34,8 @@ "libqnotero._themes", "libzotero._noteProvider", ], - package_dir = { - "libqnotero" : "libqnotero/ui", + package_data = { + "libqnotero" : ["ui/*.ui"], }, data_files=[ ("/usr/share/qnotero", ["COPYING"]),