[med-svn] [openmolar] 03/03: New upstream release [0.5.5] + changelog summary
Dmitry Smirnov
onlyjob at moszumanska.debian.org
Thu May 22 15:08:40 UTC 2014
This is an automated email from the git hooks/post-receive script.
onlyjob pushed a commit to branch master
in repository openmolar.
commit 763ad61 (HEAD, master)
Author: Dmitry Smirnov <onlyjob at member.fsf.org>
Date: Thu May 22 13:50:11 2014
New upstream release [0.5.5] + changelog summary
---
debian/changelog | 11 ++++++++++
debian/copyright | 27 ++++-------------------
debian/manpages | 1 -
debian/openmolar.1 | 19 ----------------
debian/patches/private-libs.patch | 10 ++++-----
debian/patches/series | 1 +
debian/patches/tarball-build.patch | 45 ++++++++++++++++++++++++++++++++++++++
debian/rules | 12 ----------
8 files changed, 66 insertions(+), 60 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 537a29e..35cf9c5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+openmolar (0.5.5-1) unstable; urgency=low
+
+ * New upstream release [May 2014].
+ * Install upstream man page, not ours;
+ Removed help2man code from "debian/rules".
+ * New "private-libs.patch" to fix build from tarball.
+ * Added "debian/clean" to remove generated files.
+ * Added "debian/gbp.conf".
+
+ -- Dmitry Smirnov <onlyjob at debian.org> Thu, 22 May 2014 23:18:13 +1000
+
openmolar (0.5.0~18-1) unstable; urgency=low
* Initial release (Closes: #564285).
diff --git a/debian/copyright b/debian/copyright
index e5a78bb..1a8507e 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,19 +3,13 @@ Upstream-Name: openmolar
Source: https://github.com/rowinggolfer/openmolar1/releases
Files: *
-Copyright: 2009-2014 Neil Wallace <rowinggolfer at googlemail.com>
- <neil at openmolar.com>
+Copyright: 2009-2014 Neil Wallace <neil at openmolar.com>
+ <rowinggolfer at googlemail.com>
License: GPL-3+
-Files: src/openmolar/main.py
- src/openmolar/firstRun.py
- src/openmolar/createdemodatabase.py
- src/openmolar/qt4gui/schema_updater.py
-Copyright: 2009 Neil Wallace
-License: GPL-2 or GPL-3+
-
Files: src/openmolar/backports/ordered_dict.py
-Copyright: 2009 Raymond Hettinger
+Copyright: 2009 Raymond Hettinger
+ 2009-2014 Neil Wallace <neil at openmolar.com>
License: Expat
Comment:
http://code.activestate.com/recipes/576669/
@@ -60,16 +54,3 @@ Comment:
This license also known as "MIT" however FSF consider "MIT" labelling
ambiguous and copyright-format specification recommend to label such license
as "Expat".
-
-License: GPL-2
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
- .
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- .
- The complete text of the GNU General Public License version 2
- can be found in "/usr/share/common-licenses/GPL-2".
diff --git a/debian/manpages b/debian/manpages
deleted file mode 100644
index 0f65186..0000000
--- a/debian/manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/*.1
diff --git a/debian/openmolar.1 b/debian/openmolar.1
deleted file mode 100644
index 72fb99f..0000000
--- a/debian/openmolar.1
+++ /dev/null
@@ -1,19 +0,0 @@
-.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.44.1.
-.TH OPENMOLAR "1" "March 2014" "OpenMolar 0.5.0-beta10" "User Commands"
-.SH NAME
-OpenMolar \- dental practice management software.
-.SH DESCRIPTION
-dental practice management software.
-.SH OPTIONS
-.TP
-\fB\-\-help\fR
-show this text
-.TP
-\fB\-\-firstrun\fR
-offer the firstrun config and demodatabase generation
-.TP
-\fB\-\-setup\fR
-takes you to the admin page
-.TP
-\fB\-\-version\fR
-show the versioning and exit
diff --git a/debian/patches/private-libs.patch b/debian/patches/private-libs.patch
index e9e9e1d..4a77676 100644
--- a/debian/patches/private-libs.patch
+++ b/debian/patches/private-libs.patch
@@ -1,14 +1,14 @@
-Last-Update: 2014-03-18
+Last-Update: 2014-05-22
Forwarded: not-needed
Author: Dmitry Smirnov <onlyjob at member.fsf.org>
Description: make sure openmolar can find its modules in prvate location
--- a/openmolar
+++ b/openmolar
-@@ -6,7 +6,10 @@
- # by the Free Software Foundation, either version 3 of the License, or
- # (at your option) any later version.
- # See the GNU General Public License for more details.
+@@ -21,7 +21,10 @@
+ # # along with OpenMolar. If not, see <http://www.gnu.org/licenses/>. # #
+ # # # #
+ # ############################################################################ #
+import sys
+sys.path.append("/usr/share/openmolar")
diff --git a/debian/patches/series b/debian/patches/series
index b13c0ac..ee28bac 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
private-libs.patch
+tarball-build.patch
diff --git a/debian/patches/tarball-build.patch b/debian/patches/tarball-build.patch
new file mode 100644
index 0000000..c1775a2
--- /dev/null
+++ b/debian/patches/tarball-build.patch
@@ -0,0 +1,45 @@
+Last-Update: 2014-05-22
+Forwarded: no
+Author: Dmitry Smirnov <onlyjob at member.fsf.org>
+Description: fix FTBFS when built from tarball; do not require python-git.
+~~~~
+Traceback (most recent call last):
+ File "setup.py", line 45, in <module>
+ from openmolar.settings import version
+ File "/tmp/src/openmolar/openmolar1-0.5.5/src/openmolar/settings/version.py", line 46, in <module>
+ repo = git.Repo(os.path.dirname(__file__))
+ File "/usr/lib/python2.7/dist-packages/git/repo/base.py", line 122, in __init__
+ raise InvalidGitRepositoryError(epath)
+git.exc.InvalidGitRepositoryError: /tmp/src/openmolar/openmolar1-0.5.5/src/openmolar/settings
+dh_auto_clean: python setup.py clean -a returned exit code 1
+~~~~
+
+--- a/src/openmolar/settings/version.py
++++ b/src/openmolar/settings/version.py
+@@ -40,26 +40,8 @@
+ LOGGER = logging.getLogger("openmolar")
+
+ LOGGER.warning("You are running a development version of OpenMolar!")
+
+-try:
+- import git
+- repo = git.Repo(os.path.dirname(__file__))
+- if repo.description == "openmolar1":
+- try:
+- git_version = repo.git.describe()
+- VERSION = re.sub("v", "", git_version, 1)
+- except git.exc.GitCommandError:
+- LOGGER.exception("No git tags found?")
+-
+- if repo.is_dirty():
+- VERSION += "-dirty"
+- else:
+- VERSION = "unofficial_build"
+-except ImportError:
+- LOGGER.debug("unable to import git")
+- VERSION = "Built without python-git"
+-
+ # --------------------------END OF DEV CODE ---------------------------------- #
+
+
+ if __name__ == '__main__':
diff --git a/debian/rules b/debian/rules
index 7dc19b0..ba56a43 100755
--- a/debian/rules
+++ b/debian/rules
@@ -19,15 +19,3 @@ override_dh_installchangelogs:
override_dh_builddeb:
dh_builddeb -- -Zxz
-
-MAN_NAME=dental practice management software.
-openmolar.1:
- PYTHONPATH="$(CURDIR)/debian/openmolar/usr/share/$(PKG):$(PYTHONPATH)" \
- help2man --no-info --name="$(MAN_NAME)" "LANG=en_AU $(CURDIR)/openmolar" > $@
- perl \
- -E 's{\s+(It was generated by help2man)}{ $$1}; # correcting help2man comment' \
- -E 's{^\.SH\s+DESCRIPTION\K}{\n$(MAN_NAME)}; # correcting empty DESCRIPTION section' \
- -E 's{command\s+line\s+options\s+are\s+as\s+follows}{.SH OPTIONS}; # create OPTIONS section' \
- -E 's{^(\\fB\\-\\-)}{.TP\n$$1}; # prepend each option with .TP' \
- -E 's{\\fR\s+\K}{\n}; # separate arguments and their descriptions' \
- -pi $@
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/openmolar.git
More information about the debian-med-commit
mailing list