[SCM] lcalc: program for computing zeros and values of L-functions branch, master, updated. debian/0.0.20080205-1.2-19-gd60ce09

[Tobias Hansen]

The following commit has been merged in the master branch:
commit 8fdc85aad4b0b6735bb235092904ce93d83af578
Author: Tobias Hansen <tobias.han at gmx.de>
Date:   Sat Jan 12 14:54:11 2013 +0100

    Remove lcalc-const-fixes.patch and add headers to the other patches.

diff --git a/debian/patches/Makefile.patch b/debian/patches/Makefile.patch
index 58eccc5..eba4892 100644
--- a/debian/patches/Makefile.patch
+++ b/debian/patches/Makefile.patch
@@ -1,3 +1,12 @@
+Description: Various Makefile adjustments.
+ * This patch was taken from the Sage spkg 1.23.p10
+   and further changed by me (Tobias Hansen).
+ * Use $CC, $CXX, $CXXFLAGS and $CPPFLAGS (properly).
+ * Change PARI location.
+ * Remove some LDFLAGS.
+Origin: http://www.sagemath.org/packages/standard/lcalc-1.23.p10.spkg
+Author: Tobias Hansen <thansen at debian.org>
+
 --- a/src/Makefile
 +++ b/src/Makefile
 @@ -29,7 +29,15 @@
@@ -24,7 +33,7 @@
 -CCFLAGS =  -Wa,-W -O3 $(OPENMP_FLAG) -Wno-deprecated $(PREPROCESSOR_DEFINE) $(MACHINE_SPECIFIC_FLAGS) $(EXTRA)
 -#CCFLAGS =  -Wa,-W -O3 $(OPENMP_FLAG)  $(PREPROCESSOR_DEFINE) $(MACHINE_SPECIFIC_FLAGS) $(EXTRA)
 -#CCFLAGS =  -Wa,-W -O2 -fno-exceptions -Wno-deprecated $(PREPROCESSOR_DEFINE) $(MACHINE_SPECIFIC_FLAGS) $(EXTRA)
-+CCFLAGS += $(CXXFLAGS) $(CPPFLAGS) -O3  $(OPENMP_FLAG)  $(PREPROCESSOR_DEFINE) $(MACHINE_SPECIFIC_FLAGS) $(EXTRA)
++CCFLAGS += $(CXXFLAGS) $(CPPFLAGS) -O3  $(OPENMP_FLAG) -Wno-deprecated $(PREPROCESSOR_DEFINE) $(MACHINE_SPECIFIC_FLAGS) $(EXTRA)
  
  #warning- O2 doesn't help with -DUSE_LONG_DOUBLE on mac, and actually seems to hurt, making runtime longer
  #by a factor of 1.5
diff --git a/debian/patches/gcc.patch b/debian/patches/gcc.patch
index 0541b44..1f2ead8 100644
--- a/debian/patches/gcc.patch
+++ b/debian/patches/gcc.patch
@@ -1,3 +1,7 @@
+Description: Fix FTBFS with newer gcc
+Author: Luca Falavigna <dktrkranz at debian.org>
+Bug-Debian: http://bugs.debian.org/624986
+
 --- a/src/Lglobals.cc
 +++ b/src/Lglobals.cc
 @@ -21,6 +21,7 @@
diff --git a/debian/patches/lcalc-const-fixes.patch b/debian/patches/lcalc-const-fixes.patch
deleted file mode 100644
index 59d2193..0000000
--- a/debian/patches/lcalc-const-fixes.patch
+++ /dev/null
@@ -1,58 +0,0 @@
---- a/include/cmdline.h
-+++ b/include/cmdline.h
-@@ -320,7 +320,7 @@
- int cmdline_parser_required (struct gengetopt_args_info *args_info,
-   const char *prog_name);
- 
--extern char *cmdline_parser_output_character_values[] ;	/**< @brief Possible values for output-character.  */
-+extern const char *cmdline_parser_output_character_values[] ;	/**< @brief Possible values for output-character.  */
- 
- 
- #ifdef __cplusplus
---- a/src/cmdline.c
-+++ b/src/cmdline.c
-@@ -93,7 +93,7 @@
-                         struct cmdline_parser_params *params, const char *additional_error);
- 
- 
--char *cmdline_parser_output_character_values[] = {"1", "2", 0} ;	/* Possible values for output-character.  */
-+const char *cmdline_parser_output_character_values[] = {"1", "2", 0} ;	/* Possible values for output-character.  */
- 
- static char *
- gengetopt_strdup (const char *s);
-@@ -410,7 +410,7 @@
-  * -2 if more than one value has matched
-  */
- static int
--check_possible_values(const char *val, char *values[])
-+check_possible_values(const char *val, const char *values[])
- {
-   int i, found, last;
-   size_t len;
-@@ -439,7 +439,7 @@
- 
- 
- static void
--write_into_file(FILE *outfile, const char *opt, const char *arg, char *values[])
-+write_into_file(FILE *outfile, const char *opt, const char *arg, const char *values[])
- {
-   int found = -1;
-   if (arg) {
-@@ -681,7 +681,7 @@
- static
- int update_arg(void *field, char **orig_field,
-                unsigned int *field_given, unsigned int *prev_given, 
--               char *value, char *possible_values[], const char *default_value,
-+               const char *value, const char *possible_values[], const char *default_value,
-                cmdline_parser_arg_type arg_type,
-                int check_ambiguity, int override,
-                int no_free, int multiple_option,
-@@ -770,7 +770,7 @@
-   default:
-     if (value && orig_field) {
-       if (no_free) {
--        *orig_field = value;
-+        *orig_field = (char *)value;
-       } else {
-         if (*orig_field)
-           free (*orig_field); /* free previous string */
diff --git a/debian/patches/pari_2.5.patch b/debian/patches/pari_2.5.patch
index 093e1fe..868b686 100644
--- a/debian/patches/pari_2.5.patch
+++ b/debian/patches/pari_2.5.patch
@@ -1,3 +1,7 @@
+Description: Port to pari 2.5 API
+Author: Luca Falavigna <dktrkranz at debian.org>
+Bug-Debian: http://bugs.debian.org/635506
+
 --- a/src/Lcommandline.cc
 +++ b/src/Lcommandline.cc
 @@ -473,7 +473,7 @@
diff --git a/debian/patches/series b/debian/patches/series
index 86ff1a1..3a3703e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-lcalc-const-fixes.patch
 gcc.patch
 pari_2.5.patch
 Makefile.patch

-- 
lcalc: program for computing zeros and values of L-functions