[med-svn] r13529 - in trunk/packages/maqview/trunk/debian: . patches

[Andreas Tille]

Author: tille
Date: 2013-05-10 10:57:11 +0000 (Fri, 10 May 2013)
New Revision: 13529

Modified:
   trunk/packages/maqview/trunk/debian/changelog
   trunk/packages/maqview/trunk/debian/control
   trunk/packages/maqview/trunk/debian/patches/fix-gcc-4.5.patch
   trunk/packages/maqview/trunk/debian/patches/use-dpkg-buildflags.patch
Log:
Try to fix #707426 but failed


Modified: trunk/packages/maqview/trunk/debian/changelog
===================================================================
--- trunk/packages/maqview/trunk/debian/changelog	2013-05-08 21:06:56 UTC (rev 13528)
+++ trunk/packages/maqview/trunk/debian/changelog	2013-05-10 10:57:11 UTC (rev 13529)
@@ -1,3 +1,15 @@
+maqview (0.2.5-5) UNRELEASED; urgency=low
+
+  * debian/patches/fix-gcc-4.5.patch: Append -Xi to linker libraries
+  * debian/patches/use-dpkg-buildflags.patch: Enable multiarch libraries
+    FIXME_not_yet_Closes: #707426
+  * debian/control:
+     - Add libxi6 to Build-Depends
+     - Standard-Version: 3.9.4 (no changes needed)
+     - removed DM-Upload-Allowed
+
+ -- Andreas Tille <tille at debian.org>  Fri, 10 May 2013 11:42:33 +0200
+
 maqview (0.2.5-4) unstable; urgency=low
 
   * debian/watch: call debian/get-orig-source

Modified: trunk/packages/maqview/trunk/debian/control
===================================================================
--- trunk/packages/maqview/trunk/debian/control	2013-05-08 21:06:56 UTC (rev 13528)
+++ trunk/packages/maqview/trunk/debian/control	2013-05-10 10:57:11 UTC (rev 13529)
@@ -2,11 +2,15 @@
 Section: science
 Priority: optional
 Maintainer: Debian-Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
-DM-Upload-Allowed: yes
 Uploaders: Andreas Tille <tille at debian.org>,
  Charles Plessy <plessy at debian.org>
-Build-Depends: debhelper (>= 9), autotools-dev, automake, freeglut3-dev, dh-autoreconf
-Standards-Version: 3.9.3
+Build-Depends: debhelper (>= 9),
+               autotools-dev,
+               automake,
+               freeglut3-dev,
+               dh-autoreconf,
+               libxi6
+Standards-Version: 3.9.4
 Homepage: http://maq.sourceforge.net/maqview.shtml
 Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/maqview/trunk/
 Vcs-Svn: svn://svn.debian.org/debian-med/trunk/packages/maqview/trunk/

Modified: trunk/packages/maqview/trunk/debian/patches/fix-gcc-4.5.patch
===================================================================
--- trunk/packages/maqview/trunk/debian/patches/fix-gcc-4.5.patch	2013-05-08 21:06:56 UTC (rev 13528)
+++ trunk/packages/maqview/trunk/debian/patches/fix-gcc-4.5.patch	2013-05-10 10:57:11 UTC (rev 13529)
@@ -1,3 +1,7 @@
+Author: Andreas Tille <tille at debian.org>
+Description: Enable building with gcc-4.5 and higher
+LastChanged: Fri, 10 May 2013 11:42:33 +0200
+
 --- maqview-0.2.5.orig/configure.ac
 +++ maqview-0.2.5/configure.ac
 @@ -33,8 +33,8 @@
@@ -6,8 +10,8 @@
      case $is_static in
 -      1) GLLIBS="-Wl,-Bstatic -lglut -Wl,-Bdynamic -lGL -lGLU -lm";;
 -	  0) GLLIBS="-lGL -lglut -lm";;
-+      1) GLLIBS="-Wl,-Bstatic -lglut -Wl,-Bdynamic -lGL -lGLU -lm -lX11";;
-+	  0) GLLIBS="-lGL -lGLU -lglut -lm -lX11";;
++      1) GLLIBS="-Wl,-Bstatic -lglut -Wl,-Bdynamic -lGL -lGLU -lm -lX11 -lXi";;
++	  0) GLLIBS="-lGL -lGLU -lglut -lm -lX11 -lXi";;
      esac
  	AC_SUBST([GLLIBS]);;
  #  *) AC_MSG_ERROR([OS is not supported]);;

Modified: trunk/packages/maqview/trunk/debian/patches/use-dpkg-buildflags.patch
===================================================================
--- trunk/packages/maqview/trunk/debian/patches/use-dpkg-buildflags.patch	2013-05-08 21:06:56 UTC (rev 13528)
+++ trunk/packages/maqview/trunk/debian/patches/use-dpkg-buildflags.patch	2013-05-10 10:57:11 UTC (rev 13529)
@@ -1,7 +1,7 @@
 Description: Use build flags from environment (dpkg-buildflags).
- Necessary for hardening flags.
+Description: Enable propagating hardening flags and finding multiarch libraries
 Author: Simon Ruderich <simon at ruderich.org>
-Last-Update: 2012-04-28
+Last-Update: 10 May 2013 11:42:33 +0200
 
 Index: maqview-0.2.5/configure.ac
 ===================================================================
@@ -13,7 +13,7 @@
       AC_MSG_WARN([Library libglut will be statically linked.])
 -     LDFLAGS="-L${prefix}/lib"
 -     CPPFLAGS="-I${prefix}/include";;
-+     LDFLAGS="$LDFLAGS -L${prefix}/lib"
++     LDFLAGS="$LDFLAGS -L${prefix}/lib/`dpkg-architecture -qDEB_HOST_MULTIARCH` -L${prefix}/lib"
 +     CPPFLAGS="$CPPFLAGS -I${prefix}/include";;
  esac