[med-svn] [Git][med-team/libstatgen][master] Remove merged patches

[Dylan Aïssi (@daissi)]

Dylan Aïssi pushed to branch master at Debian Med / libstatgen


Commits:
641c2a4e by Dylan Aïssi at 2021-08-21T10:40:06+02:00
Remove merged patches

- - - - -


5 changed files:

- debian/changelog
- − debian/patches/Fix_compilation_error.patch
- debian/patches/Fix_compilation_flags.patch
- − debian/patches/Remove_erroneous_deletes_in_Chromosome_constructor.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -6,6 +6,7 @@ libstatgen (1.0.15-1) UNRELEASED; urgency=medium
 
   [ Dylan Aïssi ]
   * New upstream version
+  * Remove merged patches
 
  -- Dylan Aïssi <daissi at debian.org>  Sat, 21 Aug 2021 10:34:47 +0200
 


=====================================
debian/patches/Fix_compilation_error.patch deleted
=====================================
@@ -1,33 +0,0 @@
-Description: Fix some compilation errors.
-Bug: https://github.com/statgen/libStatGen/issues/15
-     https://github.com/statgen/libStatGen/issues/17
-Origin: https://github.com/statgen/libStatGen/commit/2f1876e
-        https://github.com/statgen/libStatGen/commit/9db9c23
-        https://github.com/statgen/libStatGen/commit/5500464
-        https://github.com/statgen/libStatGen/commit/198a43e
-
---- a/general/Parameters.cpp
-+++ b/general/Parameters.cpp
-@@ -553,7 +553,7 @@
-     int  line_len = 0;
- 
-     bool legacy_parameters = false;
--    bool legacy_count = 0;
-+    int legacy_count = 0;
- 
-     for (LongParameterList * ptr = list + 1; ptr->description != NULL; ptr++)
-         if (ptr->type == LP_LEGACY_PARAMETERS)
---- a/general/Makefile
-+++ b/general/Makefile
-@@ -8,7 +8,10 @@
-   # an error, but allow unused results and variables for the
-   # time being.
-   #
--  USER_WARNINGS ?= -Werror $(shell if [ X$(CCVERSION) \> X4.2.0 ] ; then echo " -Wno-strict-overflow" ; fi)
-+  # Disable format-truncation check because StringBasics specifically tests
-+  # to make sure snprintf truncates as expected.
-+  USER_WARNINGS ?= -Werror -Wno-format-truncation $(shell if [ X$(CCVERSION) \> X4.2.0 ] ; then echo " -Wno-strict-overflow" ; fi) 
-+#  USER_WARNINGS ?= -Werror $(shell if [ X$(CCVERSION) \> X4.2.0 ] ; then echo " -Wno-strict-overflow" ; fi)
- #-Wno-strict-overflow
- # -Wno-unused-variable $(shell if [ X$(CCVERSION) \> X4.2.0 ] ; then echo " -Wno-unused-result" ; fi)
- endif


=====================================
debian/patches/Fix_compilation_flags.patch
=====================================
@@ -11,7 +11,7 @@ Description: Add -fPIC to build the shared library.
  OPTFLAG_DEBUG?=-ggdb -O0
  OPTFLAG_PROFILE?=-pg
  
-@@ -59,9 +59,9 @@
+@@ -67,9 +67,9 @@
  
  REQ_SETTINGS = 
  


=====================================
debian/patches/Remove_erroneous_deletes_in_Chromosome_constructor.patch deleted
=====================================
@@ -1,30 +0,0 @@
-From: jonathonl <jonathonl at users.noreply.github.com>
-Date: Thu, 20 Sep 2018 11:57:06 -0400
-Origin: https://github.com/statgen/libStatGen/commit/3a10afe08c209dbacc3eca7794a5a8c0a42ee566
-Bug-Debian: https:bugs.debian.org/905368
-Subject: Removes erroneous deletes in Chromosome constructor.
-
----
- general/Chromosome.cpp | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/general/Chromosome.cpp b/general/Chromosome.cpp
-index ac2ff5c..2d773e8 100644
---- a/general/Chromosome.cpp
-+++ b/general/Chromosome.cpp
-@@ -27,7 +27,6 @@ Chromosome::Chromosome(GenomeSequence* gs, const char* chromosomeName)
- Chromosome::Chromosome(const char* genomseSequenceFileName, unsigned int chromosomeIndex, bool isColorSpace) 
- {
-     std::string s(genomseSequenceFileName);
--    if (this->gs) delete gs;
-     gs = new GenomeSequence;
-     assert(gs);
-     gs->setReferenceName(s);
-@@ -39,7 +38,6 @@ Chromosome::Chromosome(const char* genomseSequenceFileName, unsigned int chromos
- 
- Chromosome::Chromosome(const std::string& genomseSequenceFileName, unsigned int chromosomeIndex, bool isColorSpace) 
- {
--    if (this->gs) delete gs;
-     gs = new GenomeSequence;
-     assert(gs);
-     gs->setReferenceName(genomseSequenceFileName);


=====================================
debian/patches/series
=====================================
@@ -1,3 +1 @@
-Fix_compilation_error.patch
 Fix_compilation_flags.patch
-Remove_erroneous_deletes_in_Chromosome_constructor.patch



View it on GitLab: https://salsa.debian.org/med-team/libstatgen/-/commit/641c2a4e1b2b3bec85adcb5971e15917cc4d4fcb

-- 
View it on GitLab: https://salsa.debian.org/med-team/libstatgen/-/commit/641c2a4e1b2b3bec85adcb5971e15917cc4d4fcb
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20210821/738bddee/attachment-0001.htm>