[med-svn] [r-bioc-makecdfenv] 02/02: Fix strange build problem by removing configure file, fix d/changelog

[Andreas Tille]

This is an automated email from the git hooks/post-receive script.

tille pushed a commit to branch master
in repository r-bioc-makecdfenv.

commit d5769500ac6cf5a7b7f45e9ea38ef3c9094232eb
Author: Andreas Tille <tille at debian.org>
Date:   Mon Oct 9 17:36:15 2017 +0200

    Fix strange build problem by removing configure file, fix d/changelog
---
 debian/changelog                      | 15 ++++++---------
 debian/patches/delete_configure.patch |  5 +++++
 debian/patches/fix_cflags.patch       | 12 ++++++++++++
 debian/patches/series                 |  1 +
 4 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 444ef95..5df8b9c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,18 +1,15 @@
-r-bioc-makecdfenv (1.52.0-2) UNRELEASED; urgency=medium
+r-bioc-makecdfenv (1.52.0-1) UNRELEASED; urgency=medium
 
-  * Moved packaging from SVN to Git
-  * Standards-Version: 4.1.1
-
- -- Andreas Tille <tille at debian.org>  Mon, 09 Oct 2017 15:01:31 +0200
-
-r-bioc-makecdfenv (1.52.0-1) unstable; urgency=medium
 
   * New upstream version
   * debhelper 10
-  * Standards-Version: 4.1.0 (no changes needed)
+  * Standards-Version: 4.1.1 (no changes needed)
   * Build-Depends: zlib1g-dev
+  * Moved packaging from SVN to Git
+  * Fix strange build problem by removing configure file
 
- -- Andreas Tille <tille at debian.org>  Fri, 25 Aug 2017 14:27:42 +0200
+  
+ -- Andreas Tille <tille at debian.org>  Mon, 09 Oct 2017 15:01:31 +0200
 
 r-bioc-makecdfenv (1.50.0-1) unstable; urgency=medium
 
diff --git a/debian/patches/delete_configure.patch b/debian/patches/delete_configure.patch
index ea0f057..8172d35 100644
--- a/debian/patches/delete_configure.patch
+++ b/debian/patches/delete_configure.patch
@@ -1,3 +1,8 @@
+Autor: Andreas Tille <tille at debian.org>
+Las-Update: Mon, 09 Oct 2017 15:01:31 +0200
+Description: Try to fix build by removing configure
+ The patch is not sufficient in its own and also needs fix_cflags.patch
+
 --- a/configure
 +++ /dev/null
 @@ -1,975 +0,0 @@
diff --git a/debian/patches/fix_cflags.patch b/debian/patches/fix_cflags.patch
new file mode 100644
index 0000000..5beead6
--- /dev/null
+++ b/debian/patches/fix_cflags.patch
@@ -0,0 +1,12 @@
+Autor: Andreas Tille <tille at debian.org>
+Las-Update: Mon, 09 Oct 2017 15:01:31 +0200
+Description: Somehow this patch is needed since @CLAGS@ is not resolved
+ by autoconf - no idea why
+
+--- a/src/Makevars.in
++++ b/src/Makevars.in
+@@ -1,3 +1,3 @@
+-PKG_CFLAGS =  @CFLAGS@
++PKG_CFLAGS =  ${CFLAGS}
+ PKG_LIBS = @LIBS@
+ PKG_CPPFLAGS = @DEFS@
diff --git a/debian/patches/series b/debian/patches/series
index 24fdd07..82c8a7d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 use_debian_packaged_zlib.patch
 delete_configure.patch
+fix_cflags.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/r-bioc-makecdfenv.git