[med-svn] [mothur] 03/04: d/patches: refresh
Tomasz Buchert
tomasz at moszumanska.debian.org
Tue Mar 14 23:04:32 UTC 2017
This is an automated email from the git hooks/post-receive script.
tomasz pushed a commit to branch master
in repository mothur.
commit ec37447a84bee338a0770423b10b7595f5acb049
Author: Tomasz Buchert <tomasz at debian.org>
Date: Tue Mar 14 23:27:51 2017 +0100
d/patches: refresh
---
...mmand.patch => 0002-Fix-catchall-command.patch} | 0
.../0002-Update-version-numbers-everywhere.patch | 77 ----------------------
.../0003-Update-version-numbers-everywhere.patch | 49 ++++++++++++++
debian/patches/series | 4 +-
4 files changed, 51 insertions(+), 79 deletions(-)
diff --git a/debian/patches/0003-Fix-catchall-command.patch b/debian/patches/0002-Fix-catchall-command.patch
similarity index 100%
rename from debian/patches/0003-Fix-catchall-command.patch
rename to debian/patches/0002-Fix-catchall-command.patch
diff --git a/debian/patches/0002-Update-version-numbers-everywhere.patch b/debian/patches/0002-Update-version-numbers-everywhere.patch
deleted file mode 100644
index e9ff0d8..0000000
--- a/debian/patches/0002-Update-version-numbers-everywhere.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-From: Tomasz Buchert <tomasz at debian.org>
-Date: Sun, 26 Feb 2017 15:47:54 +0100
-Subject: Update version numbers everywhere.
-
-The upstream regularly forgets to update version numbers in the source files.
----
- Makefile | 2 +-
- Mothur.xcodeproj/project.pbxproj | 8 ++++----
- makefile-internal | 2 +-
- 3 files changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index a805276..249feea 100644
---- a/Makefile
-+++ b/Makefile
-@@ -16,7 +16,7 @@ BOOST_LIBRARY_DIR="\"Enter_your_boost_library_path_here\""
- BOOST_INCLUDE_DIR="\"Enter_your_boost_include_path_here\""
- MOTHUR_FILES="\"Enter_your_default_path_here\""
- RELEASE_DATE = "\"2/2/2017\""
--VERSION = "\"1.39.1\""
-+VERSION = "\"1.39.3\""
-
- ifeq ($(strip $(64BIT_VERSION)),yes)
- CXXFLAGS += -DBIT_VERSION
-diff --git a/Mothur.xcodeproj/project.pbxproj b/Mothur.xcodeproj/project.pbxproj
-index 612d786..1cbdcb5 100644
---- a/Mothur.xcodeproj/project.pbxproj
-+++ b/Mothur.xcodeproj/project.pbxproj
-@@ -3384,7 +3384,7 @@
- GCC_MODEL_TUNING = G5;
- GCC_OPTIMIZATION_LEVEL = 3;
- GCC_PREPROCESSOR_DEFINITIONS = (
-- "VERSION=\"\\\"1.39.2\\\"\"",
-+ "VERSION=\"\\\"1.39.3\\\"\"",
- "RELEASE_DATE=\"\\\"2/16/2017\\\"\"",
- "MOTHUR_FILES=\"\\\"/Users/sarahwestcott/desktop/release\\\"\"",
- );
-@@ -3419,7 +3419,7 @@
- GCC_MODEL_TUNING = G5;
- GCC_OPTIMIZATION_LEVEL = 3;
- GCC_PREPROCESSOR_DEFINITIONS = (
-- "VERSION=\"\\\"1.39.2\\\"\"",
-+ "VERSION=\"\\\"1.39.3\\\"\"",
- "RELEASE_DATE=\"\\\"2/16/2017\\\"\"",
- "MOTHUR_FILES=\"\\\"/Users/sarahwestcott/desktop/release\\\"\"",
- );
-@@ -3455,7 +3455,7 @@
- GCC_OPTIMIZATION_LEVEL = 3;
- GCC_PREPROCESSOR_DEFINITIONS = (
- "MOTHUR_FILES=\"\\\"/Users/sarahwestcott/desktop/release\\\"\"",
-- "VERSION=\"\\\"1.39.1\\\"\"",
-+ "VERSION=\"\\\"1.39.3\\\"\"",
- "RELEASE_DATE=\"\\\"2/2/2017\\\"\"",
- );
- GCC_VERSION = "";
-@@ -3505,7 +3505,7 @@
- GCC_MODEL_TUNING = "";
- GCC_OPTIMIZATION_LEVEL = 3;
- GCC_PREPROCESSOR_DEFINITIONS = (
-- "VERSION=\"\\\"1.39.2\\\"\"",
-+ "VERSION=\"\\\"1.39.3\\\"\"",
- "RELEASE_DATE=\"\\\"2/16/2017\\\"\"",
- "MOTHUR_FILES=\"\\\"/Users/sarahwestcott/desktop/release\\\"\"",
- );
-diff --git a/makefile-internal b/makefile-internal
-index 3e017db..85a4d64 100644
---- a/makefile-internal
-+++ b/makefile-internal
-@@ -2,7 +2,7 @@
- USEREADLINE ?= no
- USEBOOST ?= no
- RELEASE_DATE = "\"2/7/2017\""
--VERSION = "\"1.39.1\""
-+VERSION = "\"1.39.3\""
-
- # Optimize to level 3:
- CXXFLAGS += -O3
diff --git a/debian/patches/0003-Update-version-numbers-everywhere.patch b/debian/patches/0003-Update-version-numbers-everywhere.patch
new file mode 100644
index 0000000..315252c
--- /dev/null
+++ b/debian/patches/0003-Update-version-numbers-everywhere.patch
@@ -0,0 +1,49 @@
+From: Tomasz Buchert <tomasz at debian.org>
+Date: Sun, 26 Feb 2017 15:47:54 +0100
+Subject: Update version numbers everywhere.
+
+The upstream regularly forgets to update version numbers in the source files.
+---
+ Mothur.xcodeproj/project.pbxproj | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/Mothur.xcodeproj/project.pbxproj b/Mothur.xcodeproj/project.pbxproj
+index 644a293..9154eb3 100644
+--- a/Mothur.xcodeproj/project.pbxproj
++++ b/Mothur.xcodeproj/project.pbxproj
+@@ -3385,7 +3385,7 @@
+ GCC_MODEL_TUNING = G5;
+ GCC_OPTIMIZATION_LEVEL = 3;
+ GCC_PREPROCESSOR_DEFINITIONS = (
+- "VERSION=\"\\\"1.39.3\\\"\"",
++ "VERSION=\"\\\"1.39.4\\\"\"",
+ "RELEASE_DATE=\"\\\"2/23/2017\\\"\"",
+ "MOTHUR_FILES=\"\\\"/Users/sarahwestcott/desktop/release\\\"\"",
+ );
+@@ -3418,7 +3418,7 @@
+ GCC_MODEL_TUNING = G5;
+ GCC_OPTIMIZATION_LEVEL = 3;
+ GCC_PREPROCESSOR_DEFINITIONS = (
+- "VERSION=\"\\\"1.39.3\\\"\"",
++ "VERSION=\"\\\"1.39.4\\\"\"",
+ "RELEASE_DATE=\"\\\"2/23/2017\\\"\"",
+ "MOTHUR_FILES=\"\\\"/Users/sarahwestcott/desktop/release\\\"\"",
+ );
+@@ -3451,7 +3451,7 @@
+ GCC_OPTIMIZATION_LEVEL = 3;
+ GCC_PREPROCESSOR_DEFINITIONS = (
+ "MOTHUR_FILES=\"\\\"/Users/sarahwestcott/desktop/release\\\"\"",
+- "VERSION=\"\\\"1.39.1\\\"\"",
++ "VERSION=\"\\\"1.39.4\\\"\"",
+ "RELEASE_DATE=\"\\\"2/2/2017\\\"\"",
+ );
+ GCC_VERSION = "";
+@@ -3502,7 +3502,7 @@
+ GCC_MODEL_TUNING = "";
+ GCC_OPTIMIZATION_LEVEL = 3;
+ GCC_PREPROCESSOR_DEFINITIONS = (
+- "VERSION=\"\\\"1.39.3\\\"\"",
++ "VERSION=\"\\\"1.39.4\\\"\"",
+ "RELEASE_DATE=\"\\\"2/23/2017\\\"\"",
+ "MOTHUR_FILES=\"\\\"/Users/sarahwestcott/desktop/release\\\"\"",
+ );
diff --git a/debian/patches/series b/debian/patches/series
index efa24cf..fae52f0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,3 @@
0001-Add-hardening-flags.patch
-0002-Update-version-numbers-everywhere.patch
-0003-Fix-catchall-command.patch
+0002-Fix-catchall-command.patch
+0003-Update-version-numbers-everywhere.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/mothur.git
More information about the debian-med-commit
mailing list