[cohomcalg] 02/03: d/patches: Update for new upstream version.
Doug Torrance
dtorrance-guest at moszumanska.debian.org
Mon Jan 16 11:55:05 UTC 2017
This is an automated email from the git hooks/post-receive script.
dtorrance-guest pushed a commit to branch master
in repository cohomcalg.
commit cceefe40ac2718c3563c54a0696a334b18f80ba4
Author: Doug Torrance <dtorrance at piedmont.edu>
Date: Mon Jan 16 06:48:23 2017 -0500
d/patches: Update for new upstream version.
---
debian/patches/hardening.patch | 36 --------------------
debian/patches/link_polylib.patch | 2 +-
debian/patches/reproducible_build.patch | 23 -------------
debian/patches/series | 3 --
debian/patches/spelling.patch | 59 ---------------------------------
5 files changed, 1 insertion(+), 122 deletions(-)
diff --git a/debian/patches/hardening.patch b/debian/patches/hardening.patch
deleted file mode 100644
index 5abab22..0000000
--- a/debian/patches/hardening.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Description: Honor build flags from dpkg-buildflags for hardening.
-Author: Doug Torrance <dtorrance at piedmont.edu>
-Last-Update: 2017-01-07
-
---- a/Makefile
-+++ b/Makefile
-@@ -8,7 +8,6 @@
- CC := g++
- CFLAGS := -O3
- LD := g++
--LDFLAGS :=
- # Note: (1) If you want to enforce 32-bit or 64-bit compilation,
- # add "-m32" or "-m64" to both CFLAGS and LDFLAGS.
- # (2) If you want to enforce a static linking of all libraries
-@@ -36,12 +35,12 @@
- # macros for .c/.cpp dirs
- define make-goal-cpp
- $1/%.o: %.cpp
-- $(CC) $(INCLUDES) $(DEFS) $(CFLAGS) -c $$< -o $$@
-+ $(CC) $(INCLUDES) $(DEFS) $(CPPFLAGS) $(CXXFLAGS) -c $$< -o $$@
- endef
-
- define make-goal-c
- $1/%.o: %.c
-- $(CC) $(INCLUDES) $(DEFS) $(CFLAGS) -c $$< -o $$@
-+ $(CC) $(INCLUDES) $(DEFS) $(CPPFLAGS) $(CFLAGS) -c $$< -o $$@
- endef
-
-
-@@ -63,4 +62,4 @@
-
-
- $(eval $(call make-goal-c, build/polylib_mod))
--$(eval $(call make-goal-cpp, build))
-\ No newline at end of file
-+$(eval $(call make-goal-cpp, build))
diff --git a/debian/patches/link_polylib.patch b/debian/patches/link_polylib.patch
index f630086..77e7f2a 100644
--- a/debian/patches/link_polylib.patch
+++ b/debian/patches/link_polylib.patch
@@ -4,7 +4,7 @@ Last-Update: 2017-01-07
--- a/Makefile
+++ b/Makefile
-@@ -50,7 +50,7 @@
+@@ -49,7 +49,7 @@
all: checkdirs bin/cohomcalg
bin/cohomcalg: $(COHOMCALG_OBJ) $(POLYLIB_OBJ)
diff --git a/debian/patches/reproducible_build.patch b/debian/patches/reproducible_build.patch
deleted file mode 100644
index 5825224..0000000
--- a/debian/patches/reproducible_build.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Description: Remove timestamp to allow reproducible builds.
-Author: Doug Torrance <dtorrance at piedmont.edu>
-Last-Update: 2017-01-08
-
---- a/source/main.cpp
-+++ b/source/main.cpp
-@@ -34,7 +34,6 @@
- #define APP_NAME "cohomCalg"
- #define APP_VERSION "0.31c"
- #define APP_AUTHOR "author: Benjamin Jurke (mail at benjaminjurke.net)" << std::endl << " Based on the algorithm presented in arXiv:1003.5217"
--#define APP_UPDATE __DATE__ << " @ " << __TIME__
- #define APP_PLATFORM APP_TARGET_OS << " " << APP_ARCH
-
-
-@@ -420,7 +419,7 @@
- stringstream ss;
- ss << endl
- << " " << APP_NAME << " v" << APP_VERSION << endl
-- << " (compiled on " << APP_UPDATE <<" for " << APP_PLATFORM << ")" << endl
-+ << " (compiled for " << APP_PLATFORM << ")" << endl
- << " " << APP_AUTHOR << endl
- << endl;
- string strAppInfo = ss.str();
diff --git a/debian/patches/series b/debian/patches/series
index cd2fc2b..78dbe8e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1 @@
link_polylib.patch
-hardening.patch
-spelling.patch
-reproducible_build.patch
diff --git a/debian/patches/spelling.patch b/debian/patches/spelling.patch
deleted file mode 100644
index 9640402..0000000
--- a/debian/patches/spelling.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-Description: Fix spelling errors.
-Author: Doug Torrance <dtorrance at piedmont.edu>
-Last-Update: 2017-01-07
-
---- a/source/rationals.cpp
-+++ b/source/rationals.cpp
-@@ -523,7 +523,7 @@
- }
- else
- {
-- WARN_OUT("Counting of the rationoms errorneous - is your input geometry valid?");
-+ WARN_OUT("Counting of the rationals erroneous - is your input geometry valid?");
-
- // During a normal program run, we have the warning output, but in integration mode we treat this as a serious error
- if (CCmdLineArguments::GetVerboseLevel() < -5)
-@@ -853,7 +853,7 @@
- {
- MSG_OUT("Verbose level 2: Serre dualization information:");
- MSG_OUT("-----------------------------------------------");
-- MSG_OUT(" Due to the ambiguous contributions to the requested cohomologies the following braching occured:");
-+ MSG_OUT(" Due to the ambiguous contributions to the requested cohomologies the following branching occurred:");
- MSG_OUT(" - \"normal\" configurations: " << numcohoms << " (" << BytesToReadableSize(numcohoms * sizeof(ui32vec64)) << " memory)");
- MSG_OUT(" - Serre-dual configurations: " << numdualcohoms << " (" << BytesToReadableSize(numdualcohoms * sizeof(ui32vec64)) << " memory)");
- MSG_OUT("");
---- a/source/main.cpp
-+++ b/source/main.cpp
-@@ -218,10 +218,10 @@
- CONSOLE_MSG_OUT("Syntax: cohomcalg [--option1] [--option2] ... InputFileName [> OutputFileName]");
- CONSOLE_MSG_OUT("");
- CONSOLE_MSG_OUT("Command line options:");
-- CONSOLE_MSG_OUT(" --in=\"...\" Treats the text between paranthesis like additional");
-+ CONSOLE_MSG_OUT(" --in=\"...\" Treats the text between parentheses like additional");
- CONSOLE_MSG_OUT(" input data, i.e. like appended content of the input file.");
- CONSOLE_MSG_OUT(" --nomonomfile Prohibits usage and generation of monomial file.");
-- CONSOLE_MSG_OUT(" --checkserre Computes the Serre dual cohomology for comparision.");
-+ CONSOLE_MSG_OUT(" --checkserre Computes the Serre dual cohomology for comparison.");
- CONSOLE_MSG_OUT(" --noreduction Deactivates the Serre self-duality reduction for ambiguous");
- CONSOLE_MSG_OUT(" monomials (may increase computation time dramatically!)");
- CONSOLE_MSG_OUT(" --hideinput Does not print the input data read from the input file.");
-@@ -690,7 +690,7 @@
- }
-
- CONSOLE_MSG_OUT("");
-- CONSOLE_MSG_OUT(" All done. Programm run successfully completed.");
-+ CONSOLE_MSG_OUT(" All done. Program run successfully completed.");
- CONSOLE_MSG_OUT("");
-
- return 0;
---- a/source/tokenizer.cpp
-+++ b/source/tokenizer.cpp
-@@ -42,7 +42,7 @@
-
- bool operator!=(const CToken &lhs, const CToken &rhs)
- {
-- /* The operator function handles the comparision of two tokens. We do NOT compare the
-+ /* The operator function handles the comparison of two tokens. We do NOT compare the
- InputOffset, i.e. just the data and type of the tokens has to be equal. */
-
- if (lhs.tkType != rhs.tkType) return true;
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/cohomcalg.git
More information about the debian-science-commits
mailing list