[med-svn] [Git][med-team/libssw][master] 3 commits: do not hardcode source/target version levels

[Sascha Steinbiss]

Sascha Steinbiss pushed to branch master at Debian Med / libssw


Commits:
687032ec by Sascha Steinbiss at 2021-02-20T21:51:04+01:00
do not hardcode source/target version levels

- - - - -
6ce25676 by Sascha Steinbiss at 2021-02-20T21:51:12+01:00
bump Standards-Version

- - - - -
77459033 by Sascha Steinbiss at 2021-02-20T21:51:20+01:00
use watchfile version 4

- - - - -


5 changed files:

- debian/changelog
- debian/control
- debian/patches/build_all_libs.patch
- debian/patches/hardening.patch
- debian/watch


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,12 @@
+libssw (1.1-13) unstable; urgency=medium
+
+  * Do not hardcode source/target version levels into javac call.
+    Closes: #982045
+  * Bump Standards-Version.
+  * Use watchfile version 4.
+
+ -- Sascha Steinbiss <satta at debian.org>  Sat, 20 Feb 2021 21:21:08 +0100
+
 libssw (1.1-12) unstable; urgency=medium
 
   * Mark one symbol as optional, disappearing on s390x with -O3


=====================================
debian/control
=====================================
@@ -12,7 +12,7 @@ Build-Depends: debhelper (>= 12~),
                zlib1g-dev,
                libsimde-dev,
                maven-repo-helper <!nojava>
-Standards-Version: 4.5.0
+Standards-Version: 4.5.1
 Vcs-Browser: https://salsa.debian.org/med-team/libssw
 Vcs-Git: https://salsa.debian.org/med-team/libssw.git
 Homepage: https://github.com/mengyao/Complete-Striped-Smith-Waterman-Library


=====================================
debian/patches/build_all_libs.patch
=====================================
@@ -6,7 +6,7 @@ Description: build all libraries
 Author: Sascha Steinbiss <sascha at steinbiss.name>
 --- a/src/Makefile
 +++ b/src/Makefile
-@@ -5,26 +5,31 @@ CXXFLAGS := $(CFLAGS)
+@@ -5,26 +5,31 @@
  LOBJS = ssw.o
  LCPPOBJS = ssw_cpp.o
  PROG = ssw_test
@@ -45,7 +45,7 @@ Author: Sascha Steinbiss <sascha at steinbiss.name>
  
  $(EXAMPLE): example.c
  
-@@ -38,10 +43,10 @@ $(JAVA_LIB): sswjni.c ssw.c ssw.h
+@@ -38,10 +43,10 @@
  	$(CC) $(CFLAGS) $(JAVA_INLCUDES) -fPIC -shared -rdynamic -o $@ $< ssw.c 
  
  $(JAVA_JAR): $(JAVA_OBJ)
@@ -54,11 +54,11 @@ Author: Sascha Steinbiss <sascha at steinbiss.name>
  
  %.class: %.java
 -	javac -cp ./ $<
-+	javac -target 1.6 -source 1.6 $<
++	javac $<
  	
  ssw.o: ssw.c ssw.h
  	$(CC) -c -o $@ $< $(CFLAGS)
-@@ -50,4 +55,4 @@ ssw_cpp.o: ssw_cpp.cpp ssw_cpp.h ssw.h
+@@ -50,4 +55,4 @@
  	$(CXX) -c -o $@ $< $(CXXFLAGS)
  
  clean:


=====================================
debian/patches/hardening.patch
=====================================
@@ -15,7 +15,7 @@ Author: Sascha Steinbiss <sascha at steinbiss.name>
  LOBJS = ssw.o
  LCPPOBJS = ssw_cpp.o
  PROG = ssw_test
-@@ -24,7 +25,7 @@ all: default java
+@@ -24,7 +25,7 @@
  java: $(JAVA_JAR) $(JAVA_LIB)
  
  $(LIB): ssw.c ssw.h ssw_cpp.h ssw_cpp.cpp
@@ -24,7 +24,7 @@ Author: Sascha Steinbiss <sascha at steinbiss.name>
  
  $(STATICLIB): $(LOBJS) $(LCPPOBJS)
  	ar rcs $@ $^
-@@ -34,13 +35,13 @@ $(PROG): main.c kseq.h
+@@ -34,13 +35,13 @@
  $(EXAMPLE): example.c
  
  $(PROG) $(EXAMPLE): $(LOBJS)
@@ -41,8 +41,8 @@ Author: Sascha Steinbiss <sascha at steinbiss.name>
  
  $(JAVA_JAR): $(JAVA_OBJ)
  	jar cvf $@ $^
-@@ -49,10 +50,10 @@ $(JAVA_JAR): $(JAVA_OBJ)
- 	javac -target 1.6 -source 1.6 $<
+@@ -49,10 +50,10 @@
+ 	javac $<
  	
  ssw.o: ssw.c ssw.h
 -	$(CC) -c -o $@ $< $(CFLAGS)


=====================================
debian/watch
=====================================
@@ -1,2 +1,2 @@
-version=3
+version=4
 https://github.com/mengyao/Complete-Striped-Smith-Waterman-Library/tags .*/v?(\d.*)\.(?:tgz|tbz2|txz|tar\.(?:gz|bz2|xz))



View it on GitLab: https://salsa.debian.org/med-team/libssw/-/compare/09413a4a3c713949b6e9d9e05f636561df9293b9...77459033989459e978a00a5fb60415289241f3fd

-- 
View it on GitLab: https://salsa.debian.org/med-team/libssw/-/compare/09413a4a3c713949b6e9d9e05f636561df9293b9...77459033989459e978a00a5fb60415289241f3fd
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/20210220/325eb399/attachment-0001.htm>