[med-svn] [Git][med-team/sumaclust][master] 6 commits: Fix build

[Andreas Tille]

Andreas Tille pushed to branch master at Debian Med / sumaclust


Commits:
bed5b012 by Andreas Tille at 2020-04-01T14:38:38+02:00
Fix build

- - - - -
23e24c95 by Andreas Tille at 2020-04-01T14:44:19+02:00
polish watch file

- - - - -
67309166 by Andreas Tille at 2020-04-01T14:44:47+02:00
routine-update: Standards-Version: 4.5.0

- - - - -
739315e7 by Andreas Tille at 2020-04-01T14:44:51+02:00
routine-update: Add salsa-ci file

- - - - -
9649e547 by Andreas Tille at 2020-04-01T14:44:51+02:00
routine-update: Rules-Requires-Root: no

- - - - -
0107b376 by Andreas Tille at 2020-04-01T14:46:04+02:00
routine-update: Ready to upload to unstable

- - - - -


6 changed files:

- debian/changelog
- debian/control
- + debian/patches/fix_build.patch
- debian/patches/series
- + debian/salsa-ci.yml
- debian/watch


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,14 @@
+sumaclust (1.0.34-2) unstable; urgency=medium
+
+  * Fix Build
+    Closes: #952093, #954262
+  * Polish watch file
+  * Standards-Version: 4.5.0 (routine-update)
+  * Add salsa-ci file (routine-update)
+  * Rules-Requires-Root: no (routine-update)
+
+ -- Andreas Tille <tille at debian.org>  Wed, 01 Apr 2020 14:45:13 +0200
+
 sumaclust (1.0.34-1) unstable; urgency=medium
 
   * Team upload.


=====================================
debian/control
=====================================
@@ -5,10 +5,11 @@ Uploaders: Tim Booth <tbooth at ceh.ac.uk>,
 Section: science
 Priority: optional
 Build-Depends: debhelper-compat (= 12)
-Standards-Version: 4.4.1
+Standards-Version: 4.5.0
 Vcs-Browser: https://salsa.debian.org/med-team/sumaclust
 Vcs-Git: https://salsa.debian.org/med-team/sumaclust.git
 Homepage: http://metabarcoding.org/sumaclust
+Rules-Requires-Root: no
 
 Package: sumaclust
 Architecture: any


=====================================
debian/patches/fix_build.patch
=====================================
@@ -0,0 +1,31 @@
+Description: Fix Build
+Bug-Debian: https://bugs.debian.org/952093
+            https://bugs.debian.org/954262
+Author: Andreas Tille <tille at debian.org>
+Last-Update: Wed, 01 Apr 2020 14:36:27 +0200
+
+--- a/Makefile
++++ b/Makefile
+@@ -1,6 +1,6 @@
+-PREFIX=/usr/local
++PREFIX=/usr
+ 
+-CFLAGS=-I$(PREFIX)/include
++CFLAGS=-I$(PREFIX)/include -I$(CURDIR)/sumalibs
+ 
+ EXEC = sumaclust
+ 
+--- a/global.mk
++++ b/global.mk
+@@ -8,9 +8,9 @@ LDFLAGS:=$(LDFLAGS)
+ 
+ 
+ ifeq ($(CC),gcc)
+-        CFLAGS = -O3 -s -DOMP_SUPPORT -fopenmp -w
++        CFLAGS += -g -O3 -s -DOMP_SUPPORT -fopenmp -w -I$(CURDIR)/sumalibs
+ else
+-        CFLAGS = -O3 -w
++        CFLAGS += -g -O3 -w
+ endif
+ 
+ 


=====================================
debian/patches/series
=====================================
@@ -1 +1,2 @@
 hardening.patch
+fix_build.patch


=====================================
debian/salsa-ci.yml
=====================================
@@ -0,0 +1,4 @@
+---
+include:
+  - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml
+  - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml


=====================================
debian/watch
=====================================
@@ -1,9 +1,3 @@
-version=3
+version=4
 
 https://git.metabarcoding.org/obitools/sumaclust/wikis/home .*/sumaclust/uploads/.*/sumaclust_v(\d[\d.-]+)\.(?:tar(?:\.gz|\.bz2)?|tgz)
-
-# sumaclust is maintained in a Gitlab repository
-#    https://wiki.debian.org/debian/watch#Gitlab
-# recommends something like this but it does not work
-# opts=filenamemangle=s/.*\.tar\.gz\?ref=v?(\d\S*)/<project>-$1\.tar\.gz/g \
-#  https://git.metabarcoding.org/obitools/sumaclust/tags .*archive\.tar\.gz\?ref=v?(\d\S*)



View it on GitLab: https://salsa.debian.org/med-team/sumaclust/-/compare/1cb2230b7e4bc33d2063567819c991ec0bbdbf84...0107b3760acd6c6ed6afeca2cff19880999aeff1

-- 
View it on GitLab: https://salsa.debian.org/med-team/sumaclust/-/compare/1cb2230b7e4bc33d2063567819c991ec0bbdbf84...0107b3760acd6c6ed6afeca2cff19880999aeff1
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/20200401/98b19843/attachment-0001.html>