[med-svn] [Git][med-team/ctsim][master] 4 commits: cme fix dpkg-control

[Andreas Tille]

Andreas Tille pushed to branch master at Debian Med / ctsim


Commits:
15627625 by Andreas Tille at 2018-04-25T16:33:21+02:00
cme fix dpkg-control

     - Standards-Version: 4.1.4
     - (Re-)add Vcs-fields
     - Drop unneeded Breaks

- - - - -
28864f6b by Andreas Tille at 2018-04-25T16:42:54+02:00
Do not insert incorrect CPPFLAG for powerpc* (and other architectures)

- - - - -
478a9814 by Andreas Tille at 2018-04-25T16:43:01+02:00
Update d/copyright

- - - - -
1e1dde2b by Andreas Tille at 2018-04-25T16:49:36+02:00
Upload to unstable

- - - - -


5 changed files:

- debian/changelog
- debian/control
- debian/copyright
- + debian/patches/drop_incorrect_cppflags.patch
- + debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+ctsim (6.0.2-2) unstable; urgency=medium
+
+  * cme fix dpkg-control
+     - Standards-Version: 4.1.4
+     - (Re-)add Vcs-fields
+     - Drop unneeded Breaks
+  * Do not insert incorrect CPPFLAG for powerpc* (and other architectures)
+    Closes: #896843
+  * Update d/copyright
+
+ -- Andreas Tille <tille at debian.org>  Wed, 25 Apr 2018 16:44:10 +0200
+
 ctsim (6.0.2-1) unstable; urgency=low
 
   * New upstream


=====================================
debian/control
=====================================
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,9 @@ Build-Depends: debhelper (>= 10),
                libwxgtk3.0-dev,
                ctn-dev,
                libpng-dev
-Standards-Version: 4.1.3
+Standards-Version: 4.1.4
+Vcs-Browser: https://salsa.debian.org/med-team/ctsim
+Vcs-Git: https://salsa.debian.org/med-team/ctsim.git
 Homepage: http://www.ctsim.org
 
 Package: ctsim
@@ -34,7 +36,6 @@ Description: Computed tomography simulator
 Package: ctsim-help
 Architecture: all
 Depends: ${misc:Depends}
-Replaces: ctsim (<< 3.5.3)
 Description: Online help file for CTSim
  This package provides the online help file for the ctsim package.
  CTSim is a graphical computed tomography simulator. 


=====================================
debian/copyright
=====================================
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,10 +1,10 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: CTSim
 Upstream-Contact: Kevin M. Rosenberg <kevin at rosenberg.net>
 Source: http://www.ctsim.org/download
 
 Files: *
-Copyright: 1983-2010 Kevin M. Rosenberg
+Copyright: 1983-2018 Kevin M. Rosenberg
 License: GPL
 
 License: GPL
@@ -16,7 +16,7 @@ License: GPL
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
 
 Files: debian/*
-Copyright: 2002-2010 Kevin M. Rosenberg <kmr at debian.org>
-           2014 Andreas Tille <tille at debian.org>
+Copyright: 2002-2018 Kevin M. Rosenberg <kmr at debian.org>
+           2014-2018 Andreas Tille <tille at debian.org>
 License: GPL
 


=====================================
debian/patches/drop_incorrect_cppflags.patch
=====================================
--- /dev/null
+++ b/debian/patches/drop_incorrect_cppflags.patch
@@ -0,0 +1,50 @@
+Author: Barry Arndt <barndt at us.ibm.com>,
+        Adrian Bunk <bunk at debian.org>,
+        Andreas Tille <tille at debian.org>
+Last-Update: Wed, 25 Apr 2018 16:32:45 +0200
+Bug-Debian: https://bugs.debian.org/896843
+Forwarded: Kevin M. Rosenberg <kmr at debian.org>
+Description: Do not insert incorrect CPPFLAG for powerpc*
+ Quoting Adrian Bunk <bunk at debian.org> from bug-report:
+ .
+ This whole compiler options block should be nuked,
+ it also creates baseline violations on amd64 and i386.
+ .
+ > This fix should also fix the FTBFS of ctsim on 
+ > powerpc, powerpcspe, and ppc64.
+ .
+ None of these have AltiVec in the port baseline,
+ so that mustn't be done there.
+ .
+ (And ppc64el has it enabled by default, so no benefits from adding
+  -maltivec there.)
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -129,26 +129,6 @@ if test "${getopt_long}" = "false" ; the
+ fi
+ AM_CONDITIONAL(INCLUDED_GETOPT_LONG, test "$GETOPTLONG"="1")
+ 
+-ARCH_OPTION=""
+-case $target_cpu in
+-    i386|i486|i586|i686|x86|x86_64)
+-        AX_EXT
+-        CFLAGS="$CFLAGS $CPUEXT_FLAGS $SIMD_FLAGS"
+-        CXXFLAGS="$CXXFLAGS $CPUEXT_FLAGS $SIMD_FLAGS"
+-        ;;
+-    powerpc*)
+-        ARCH_OPTION="-fno-common -faltivec";;
+-    armv1*|armv2*|armv3*|armv4*|armv5*|armv6*)
+-        ARCH_OPTION="-ffast-math";;
+-    armv7*|armv8*)
+-        ARCH_OPTION="-ffast-math -mcpu=cortex-a7 -mfloat-abi=hard -mfpu=neon-vfpv4";;
+-    *)
+-        # unknown architecture : use portable C version
+-        ARCH_OPTION="";;
+-esac
+-CPPFLAGS="$CPPFLAGS $ARCH_OPTION"
+-CXXFLAGS="$CPPFLAGS $ARCH_OPTION"
+-
+ if test "${readline}" = "true" ; then
+   ctlibs_base="$ctlibs_base -lreadline"
+   if test "${ncurses}" = "true"; then


=====================================
debian/patches/series
=====================================
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+drop_incorrect_cppflags.patch



View it on GitLab: https://salsa.debian.org/med-team/ctsim/compare/81160e42a4a9e9641510a9bebe433a43c3e31915...1e1dde2bf618ef783b859e318d22152e37ceb4e9

---
View it on GitLab: https://salsa.debian.org/med-team/ctsim/compare/81160e42a4a9e9641510a9bebe433a43c3e31915...1e1dde2bf618ef783b859e318d22152e37ceb4e9
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/20180425/9ff7bc8b/attachment-0001.html>