[med-svn] [Git][med-team/ncbi-tools6][master] 3 commits: Improve cross building: Don't force the build architecture compiler

[Andreas Tille]

Andreas Tille pushed to branch master at Debian Med / ncbi-tools6


Commits:
69dcbc77 by Andreas Tille at 2018-09-09T14:39:49Z
Improve cross building: Don't force the build architecture compiler

- - - - -
517ef95d by Andreas Tille at 2018-09-09T14:42:28Z
Standards-Version: 4.2.1

- - - - -
3e19f563 by Andreas Tille at 2018-09-09T14:43:29Z
cme fix dpkg-control

- - - - -


3 changed files:

- debian/changelog
- debian/control
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,14 @@
+ncbi-tools6 (6.1.20170106-5) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * Improve cross building: Don't force the build architecture compiler
+    (Thanks for the patch to Helmut Grohne)
+    Closes: #908353
+  * Standards-Version: 4.2.1
+  * cme fix dpkg-control
+
+ -- Andreas Tille <tille at debian.org>  Sun, 09 Sep 2018 16:35:00 +0200
+
 ncbi-tools6 (6.1.20170106-4) unstable; urgency=medium
 
   * debian/compat: Advance to Debhelper 11.


=====================================
debian/control
=====================================
@@ -4,16 +4,16 @@ Uploaders: Aaron M. Ucko <ucko at debian.org>
 Section: libdevel
 Priority: optional
 Build-Depends: debhelper (>= 11~)
+Build-Depends-Arch: csh | c-shell,
+                    libglu1-mesa-dev | libglu-dev,
+                    libgnutls28-dev | gnutls-dev,
+                    libmotif-dev,
+                    libpcre3-dev,
+                    libpng-dev,
+                    libxmu-dev
 Build-Depends-Indep: icoutils,
                      imagemagick
-Build-Depends-Arch: csh | c-shell,
-               libglu1-mesa-dev | libglu-dev,
-               libgnutls28-dev | gnutls-dev,
-               libmotif-dev,
-               libpcre3-dev,
-               libpng-dev,
-               libxmu-dev
-Standards-Version: 4.1.4
+Standards-Version: 4.2.1
 Vcs-Browser: https://salsa.debian.org/med-team/ncbi-tools6
 Vcs-Git: https://salsa.debian.org/med-team/ncbi-tools6.git
 Homepage: http://www.ncbi.nlm.nih.gov/IEB/ToolBox/
@@ -83,10 +83,8 @@ Depends: libncbi6 (<< ${source:Upstream-Version}.1),
 Suggests: libvibrant6b,
           ncbi-blast+,
           ncbi-tools-x11
-Breaks: blast2 (<< 1:2.2.26.20160908),
-        libncbi6-dev (<< 6.1.20110713-3~)
-Replaces: blast2 (<< 1:2.2.26.20160908),
-          libncbi6-dev (<< 6.1.20110713-3~)
+Breaks: blast2 (<< 1:2.2.26.20160908)
+Replaces: blast2 (<< 1:2.2.26.20160908)
 Description: NCBI libraries for biology applications (text-based utilities)
  This package includes various utilities distributed with the NCBI C SDK,
  including the development tools asntool and errhdr (formerly of


=====================================
debian/rules
=====================================
@@ -12,7 +12,7 @@ testversions:
 
 # Set these here, rather than using the csh hackage that passes for an
 # upstream build system.  Mostly taken from ../platform/{ppc,}linux.ncbi.mk.
-CC = gcc # -pipe
+include /usr/share/dpkg/buildtools.mk
 VIBFLAG = -DWIN_MOTIF
 VIBLIBS = -lXm -lXmu -lXt -lX11 # -lXext # -lXp
 OTHERLIBS = -lm



View it on GitLab: https://salsa.debian.org/med-team/ncbi-tools6/compare/d21070cdb2114e677c06eb6cc681938bb2e23def...3e19f563b46c2cd68eb61c5ca895f7c8f836d4ec

-- 
View it on GitLab: https://salsa.debian.org/med-team/ncbi-tools6/compare/d21070cdb2114e677c06eb6cc681938bb2e23def...3e19f563b46c2cd68eb61c5ca895f7c8f836d4ec
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/20180909/5533c3ee/attachment-0001.html>