This is an automated email from the git hooks/post-receive script. tille pushed a commit to branch master in repository hyphy.
commit c9c225c6b15993a461b87d82013f976f703031d4 Author: Andreas Tille <[email protected]> Date: Tue Sep 22 17:01:20 2015 +0200 New upstream version --- debian/changelog | 6 ++++++ debian/patches/spelling.patch | 2 +- debian/patches/use_debian_sqlite.patch | 4 ++-- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index d03862f..e767caa 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +hyphy (2.2.6+dfsg-1) UNRELEASED; urgency=medium + + * New upstream version + + -- Andreas Tille <[email protected]> Tue, 22 Sep 2015 17:00:57 +0200 + hyphy (2.2.5+dfsg-2) unstable; urgency=medium * Versioned Build-Depends: cmake (>= 3.0) diff --git a/debian/patches/spelling.patch b/debian/patches/spelling.patch index 5263b8f..1f09415 100644 --- a/debian/patches/spelling.patch +++ b/debian/patches/spelling.patch @@ -22,7 +22,7 @@ Description: Fix two spelling issues +//EOF --- a/src/gui/preferences.cpp +++ b/src/gui/preferences.cpp -@@ -155,7 +155,7 @@ void ReadPreferences (void) +@@ -158,7 +158,7 @@ void ReadPreferences (void) "Normal",optionList.Tokenize (comma), globalPreferencesList,true); optionList = "Do not use distances,Use distances"; _hyPreferencesKeys.Insert(_hyPreferencesInitGuess.makeDynamic(),((_List*)globalPreferencesList.lData[4])->lLength); diff --git a/debian/patches/use_debian_sqlite.patch b/debian/patches/use_debian_sqlite.patch index a57a1bd..aaf48fd 100644 --- a/debian/patches/use_debian_sqlite.patch +++ b/debian/patches/use_debian_sqlite.patch @@ -119,7 +119,7 @@ Description: Use Debian packaged sqlite3 linkPath = path.join(scriptPath, 'Link') coreSrcPath = path.join(srcPath, 'core') -@@ -35,14 +35,16 @@ else: +@@ -36,14 +36,16 @@ else: coreSrcFiles = glob(path.join(coreSrcPath, '*.cpp')) newSrcFiles = glob(path.join(newSrcPath, '*.cpp')) @@ -139,7 +139,7 @@ Description: Use Debian packaged sqlite3 # check for 64bit and define as such define_macros = [('__HYPHY_64__', None)] if '64' in architecture()[0] else [] -@@ -72,7 +74,7 @@ setup( +@@ -74,7 +76,7 @@ setup( ('__AFYP_REWRITE_BGM__', None), ('__HEADLESS__', None), ('_HYPHY_LIBDIRECTORY_', '"/usr/local/lib/hyphy"')] + define_macros, -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/hyphy.git _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
