[med-svn] [openmolar] 02/02: New upstream release [0.6.0] + changelog summary

[Dmitry Smirnov]

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

onlyjob pushed a commit to branch master
in repository openmolar.

commit 55481a2 (HEAD, master)
Author: Dmitry Smirnov <onlyjob at member.fsf.org>
Date:   Fri Jul 4 06:44:32 2014

    New upstream release [0.6.0] + changelog summary
---
 debian/changelog                   |  9 ++++++++
 debian/patches/series              |  1 -
 debian/patches/tarball-build.patch | 45 --------------------------------------
 debian/rules                       |  4 ++--
 4 files changed, 11 insertions(+), 48 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 35cf9c5..cd5b7df 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+openmolar (0.6.0-1) unstable; urgency=low
+
+  * New upstream release [July 2014].
+  * Removed obsolete "tarball-build.patch".
+  * Disabled override_dh_installchangelogs, this version have no changelog.
+  * Watch openmolar.com for releases; check tarball signature.
+
+ -- Dmitry Smirnov <onlyjob at debian.org>  Fri, 04 Jul 2014 16:37:02 +1000
+
 openmolar (0.5.5-1) unstable; urgency=low
 
   * New upstream release [May 2014].
diff --git a/debian/patches/series b/debian/patches/series
index ee28bac..b13c0ac 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 private-libs.patch
-tarball-build.patch
diff --git a/debian/patches/tarball-build.patch b/debian/patches/tarball-build.patch
deleted file mode 100644
index c1775a2..0000000
--- a/debian/patches/tarball-build.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-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 ba56a43..317b968 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,8 +14,8 @@ override_dh_auto_install:
             --install-lib=usr/share/$(PKG)/
 #            --install-scripts=usr/bin/
 
-override_dh_installchangelogs:
-	dh_installchangelogs TODO.txt
+#override_dh_installchangelogs:
+#	dh_installchangelogs TODO.txt
 
 override_dh_builddeb:
 	dh_builddeb -- -Zxz

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/openmolar.git