[med-svn] [Git][med-team/jellyfish1][master] 2 commits: Add changes to 1.1.11-5 Upload

[Nilesh Patra (@nilesh)]

Nilesh Patra pushed to branch master at Debian Med / jellyfish1


Commits:
cef7c24b by Nilesh Patra at 2021-08-29T03:21:43+05:30
Add changes to 1.1.11-5 Upload

- - - - -
2a227084 by Nilesh Patra at 2021-08-29T03:30:32+05:30
Get package building with autoconf 2.70

- - - - -


8 changed files:

- debian/changelog
- − debian/compat
- debian/control
- debian/manpages
- + debian/patches/autoconf.patch
- debian/patches/series
- debian/rules
- + debian/salsa-ci.yml


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,15 @@
+jellyfish1 (1.1.11-5) unstable; urgency=medium
+
+  * Standards-Version: 4.5.1 (routine-update)
+  * debhelper-compat 13 (routine-update)
+  * Respect DEB_BUILD_OPTIONS in override_dh_auto_test target (routine-
+    update)
+  * Add salsa-ci file (routine-update)
+  * Rules-Requires-Root: no (routine-update)
+  * Use secure URI in Homepage field.
+
+ -- Andreas Tille <tille at debian.org>  Thu, 26 Nov 2020 07:52:51 +0100
+
 jellyfish1 (1.1.11-4) unstable; urgency=medium
 
   * debhelper 11


=====================================
debian/compat deleted
=====================================
@@ -1 +0,0 @@
-11


=====================================
debian/control
=====================================
@@ -4,11 +4,12 @@ Uploaders: Shaun Jackman <sjackman at debian.org>,
            Andreas Tille <tille at debian.org>
 Section: science
 Priority: optional
-Build-Depends: debhelper (>= 11~)
-Standards-Version: 4.2.1
+Build-Depends: debhelper-compat (= 13)
+Standards-Version: 4.5.1
 Vcs-Browser: https://salsa.debian.org/med-team/jellyfish1
 Vcs-Git: https://salsa.debian.org/med-team/jellyfish1.git
-Homepage: http://www.cbcb.umd.edu/software/jellyfish/
+Homepage: https://www.cbcb.umd.edu/software/jellyfish/
+Rules-Requires-Root: no
 
 Package: jellyfish1
 Architecture: any


=====================================
debian/manpages
=====================================
@@ -1 +1 @@
-doc/jellyfish.man
+debian/tmp/usr/share/man/man1/*


=====================================
debian/patches/autoconf.patch
=====================================
@@ -0,0 +1,27 @@
+Description: Fix macros in configure.ac, and avoid repeating same macroto get it building with autoconf 2.70
+Author: Nilesh Patra <nilesh at debian.org>
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=978842
+Last-Update: 2021-08-29
+--- a/configure.ac
++++ b/configure.ac
+@@ -5,7 +5,6 @@
+ AM_SILENT_RULES([yes])
+ AC_CONFIG_SRCDIR([jellyfish])
+ AC_CONFIG_HEADERS([config.h])
+-AC_CONFIG_MACRO_DIR([m4])
+ AC_PROG_LIBTOOL
+ 
+ # Change default compilation flags
+@@ -26,9 +25,9 @@
+ )
+ 
+ AC_ARG_VAR([MD5], [Path to md5 hashing program])
+-AS_IF([test "x$MD5" = "x"], AC_CHECK_PROG([MD5], [md5sum], [md5sum]), [])
+-AS_IF([test "x$MD5" = "x"], AC_CHECK_PROG([MD5], [md5], [md5 -r]), [])
+-AS_IF([test "x$MD5" = "x"], AC_MSG_ERROR([Could not find md5 hashing program in your path]), [])
++AS_IF([test "x$MD5" = "x"], [AC_CHECK_PROG([MD5], [md5sum], [md5sum])], [])
++AS_IF([test "x$MD5" = "x"], [AC_CHECK_PROG([MD5], [md5], [md5 -r])], [])
++AS_IF([test "x$MD5" = "x"], [AC_MSG_ERROR([Could not find md5 hashing program in your path])], [])
+ 
+ AC_ARG_WITH([sse],
+             [AS_HELP_STRING([--with-sse], [enable SSE])],


=====================================
debian/patches/series
=====================================
@@ -1,3 +1,4 @@
 man
 arm64.patch
 mips.patch
+autoconf.patch


=====================================
debian/rules
=====================================
@@ -35,12 +35,15 @@ override_dh_install:
 	find debian -name "*.la" -delete
 	find debian -name "*.so" -delete
 	find debian -name "pkgconfig" -type d | xargs rm -rf
+	# there is no development package for this version any more - remove header files to keep dh_missing happy
+	rm -rf debian/tmp/usr/include/jellyfish*
 
 override_dh_installman:
 	dh_installman
 	mv debian/$(DEB_SOURCE)/usr/share/man/man1/jellyfish.1 debian/$(DEB_SOURCE)/usr/share/man/man1/jellyfish1.1
 
 override_dh_auto_test:
+ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 	# dh_auto_test && true
 	echo "****************************************************** do not test for the moment ******************************************************"
 # jellyfish contains a *really* big test which should *not* run on autobuilders
@@ -48,3 +51,4 @@ override_dh_auto_test:
 # uncommenting the following.
 #override_dh_auto_test:
 #	BIG=1 dh_auto_test
+endif


=====================================
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



View it on GitLab: https://salsa.debian.org/med-team/jellyfish1/-/compare/d3b8af119cf6825968a67ddd4eb362303fb7f251...2a2270845b0d186ecf8093428e6810204ac4ea47

-- 
View it on GitLab: https://salsa.debian.org/med-team/jellyfish1/-/compare/d3b8af119cf6825968a67ddd4eb362303fb7f251...2a2270845b0d186ecf8093428e6810204ac4ea47
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/20210828/1738251b/attachment-0001.htm>