[med-svn] [Git][med-team/mrs][master] 2 commits: Skip broken test for log4cpp - we can be sure that the package exists due to Build-Depends anyway

[Andreas Tille]

Andreas Tille pushed to branch master at Debian Med / mrs


Commits:
792e80df by Andreas Tille at 2018-05-18T13:36:28+02:00
Skip broken test for log4cpp - we can be sure that the package exists due to Build-Depends anyway

- - - - -
6329d383 by Andreas Tille at 2018-05-18T13:41:17+02:00
Upload to unstable

- - - - -


3 changed files:

- debian/changelog
- + debian/patches/fix_check_for_log4cpp.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+mrs (6.0.5+dfsg-6) unstable; urgency=medium
+
+  * Skip broken test for log4cpp - we can be sure that the package exists
+    due to Build-Depends anyway
+    Closes: #898964
+
+ -- Andreas Tille <tille at debian.org>  Fri, 18 May 2018 13:37:17 +0200
+
 mrs (6.0.5+dfsg-5) unstable; urgency=medium
 
   * Fix format string error


=====================================
debian/patches/fix_check_for_log4cpp.patch
=====================================
--- /dev/null
+++ b/debian/patches/fix_check_for_log4cpp.patch
@@ -0,0 +1,25 @@
+Description: Skip broken test for log4cpp - we can be sure that the package exists
+    due to Build-Depends anyway
+Bug-Debian: https://bugs.debian.org/898964
+Author: Andreas Tille <tille at debian.org>
+Last-Update: Fri, 18 May 2018 13:34:00 +0200
+
+--- a/configure
++++ b/configure
+@@ -364,11 +364,11 @@ END
+ int main() { log4cpp::Category& root = log4cpp::Category::getRoot(); return 0; }
+ END
+ 
+-	if (not CheckLib("log4cpp", $header_check, $lib_check))
+-	{
+-		die "\n\nCannot continue since you don't seem to have log4cpp installed\n",
+-			"Please install the log4cpp-dev package and run configure again.\n";
+-	}
++#	if (not CheckLib("log4cpp", $header_check, $lib_check))
++#	{
++#		die "\n\nCannot continue since you don't seem to have log4cpp installed\n",
++#			"Please install the log4cpp-dev package and run configure again.\n";
++#	}
+ 
+ 	push @libs, 'log4cpp';
+ 


=====================================
debian/patches/series
=====================================
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@ init_d.diff
 gcc-6.patch
 boost-1.65-compat.patch
 fix_format_string.patch
+fix_check_for_log4cpp.patch



View it on GitLab: https://salsa.debian.org/med-team/mrs/compare/af3fca3b27a49393dac9a3c59237965a2213f9ba...6329d383cf34338fb181844b280c3cb6f2c28491

-- 
View it on GitLab: https://salsa.debian.org/med-team/mrs/compare/af3fca3b27a49393dac9a3c59237965a2213f9ba...6329d383cf34338fb181844b280c3cb6f2c28491
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/20180529/e576630f/attachment-0001.html>