This is an automated email from the git hooks/post-receive script. tille pushed a commit to branch master in repository openmolar.
commit e57bc3a4a7b2a06e8d39f425576e9cec6e6d03d4 Author: Andreas Tille <[email protected]> Date: Sat Dec 17 19:17:56 2016 +0100 Update patches --- debian/changelog | 4 ++-- debian/patches/197.patch | 18 ------------------ debian/patches/private-libs.patch | 15 ++++++--------- debian/patches/series | 1 - 4 files changed, 8 insertions(+), 30 deletions(-) diff --git a/debian/changelog b/debian/changelog index fe548e9..1002428 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -openmolar (1.0.15-gd81f9e5-1) UNRELEASED; urgency=medium +openmolar (1.0.15-gd81f9e5-1) unstable; urgency=medium * Team upload. * New upstream version @@ -9,7 +9,7 @@ openmolar (1.0.15-gd81f9e5-1) UNRELEASED; urgency=medium * /mysql-server | mariadb-server/default-mysql-server | virtual-mysql-server/ Closes: #848479 - -- Andreas Tille <[email protected]> Sat, 17 Dec 2016 18:51:33 +0100 + -- Andreas Tille <[email protected]> Sat, 17 Dec 2016 19:04:06 +0100 openmolar (0.6.2-2) unstable; urgency=medium diff --git a/debian/patches/197.patch b/debian/patches/197.patch deleted file mode 100644 index 65b740d..0000000 --- a/debian/patches/197.patch +++ /dev/null @@ -1,18 +0,0 @@ -Last-Update: 2015-02-23 -Origin: upstream, https://github.com/rowinggolfer/openmolar1/commit/0cf8a35ebd62a37481afaeffab8381da56da880e -Bug-Upstream: https://github.com/rowinggolfer/openmolar1/issues/197 -From: rowinggolfer <[email protected]> -Description: [PATCH] fixes #197 - ---- a/src/openmolar/qt4gui/diary_widget.py -+++ b/src/openmolar/qt4gui/diary_widget.py -@@ -1540,8 +1540,9 @@ - ''' - dl = InsertBlocksDialog() - if dl.exec_(): - dl.apply() -+ self.layout_diary() - - def diary_tabWidget_nav(self, i): - ''' - catches a signal that the diary tab widget has been moved diff --git a/debian/patches/private-libs.patch b/debian/patches/private-libs.patch index 4a77676..69d53d5 100644 --- a/debian/patches/private-libs.patch +++ b/debian/patches/private-libs.patch @@ -1,18 +1,15 @@ Last-Update: 2014-05-22 Forwarded: not-needed Author: Dmitry Smirnov <[email protected]> -Description: make sure openmolar can find its modules in prvate location +Description: make sure openmolar can find its modules in private location --- a/openmolar +++ b/openmolar -@@ -21,7 +21,10 @@ - # # along with OpenMolar. If not, see <http://www.gnu.org/licenses/>. # # - # # # # - # ############################################################################ # +@@ -29,6 +29,7 @@ this is called with python2. + ''' -+import sys + import sys +sys.path.append("/usr/share/openmolar") -+ - from openmolar import main - main.run() + if sys.version < '3.0': + sys.exit("This program requires a python3 runtime") diff --git a/debian/patches/series b/debian/patches/series index e1cb81f..b13c0ac 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1 @@ -197.patch private-libs.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/openmolar.git _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
