[med-svn] r15299 - trunk/packages/vxl/trunk/debian

[Mathieu Malaterre]

Author: malat
Date: 2013-11-28 12:17:51 +0000 (Thu, 28 Nov 2013)
New Revision: 15299

Modified:
   trunk/packages/vxl/trunk/debian/changelog
   trunk/packages/vxl/trunk/debian/copyright
   trunk/packages/vxl/trunk/debian/rules
Log:
Prepare next upload

Modified: trunk/packages/vxl/trunk/debian/changelog
===================================================================
--- trunk/packages/vxl/trunk/debian/changelog	2013-11-28 12:14:19 UTC (rev 15298)
+++ trunk/packages/vxl/trunk/debian/changelog	2013-11-28 12:17:51 UTC (rev 15299)
@@ -1,3 +1,10 @@
+vxl (1.17.0-6) unstable; urgency=high
+
+  * Hide symptoms from --as-needed on IA64. Closes: #728574
+  * Update d/copyright. Closes: #723126
+
+ -- Mathieu Malaterre <malat at debian.org>  Thu, 28 Nov 2013 13:14:57 +0100
+
 vxl (1.17.0-5) unstable; urgency=low
 
   * Use libcoin80-dev for transition

Modified: trunk/packages/vxl/trunk/debian/copyright
===================================================================
--- trunk/packages/vxl/trunk/debian/copyright	2013-11-28 12:14:19 UTC (rev 15298)
+++ trunk/packages/vxl/trunk/debian/copyright	2013-11-28 12:17:51 UTC (rev 15299)
@@ -32,10 +32,30 @@
  USE OR PERFORMANCE OF THIS SOFTWARE.
 
 
+Files: v3p/rply/
+Copyright: 2003-2005 Diego Nehab.
+License: BSD
+ Permission is hereby granted, free of charge, to any person obtaining a
+ copy of this software and associated documentation files (the "Software"),
+ to deal in the Software without restriction, including without limitation
+ the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ and/or sell copies of the Software, and to permit persons to whom the
+ Software is furnished to do so, subject to the following conditions:
+ .
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ DEALINGS IN THE SOFTWARE.
+
 Files: contrib/rpl/rgrl/rgrl_copyright.h
-Copyright:
- Copyright (c) 2002-2004 Rensselaer Polytechnic Institute
-License: BSD (2 clause)
+Copyright: 2002-2004 Rensselaer Polytechnic Institute
+License: BSD-2-clause
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions are met:
  .
@@ -197,7 +217,7 @@
 Files: contrib/brl/b3p/shapelib/*
 Copyright:
  Copyright (c) 1999, Frank Warmerdam
-License: MIT/X11 (BSD like)
+License: MIT-X11
  This software is available under the following "MIT Style" license,
  or at the option of the licensee under the LGPL (see LICENSE.LGPL).  This
  option is discussed in more detail in shapelib.html.
@@ -223,7 +243,7 @@
 Files: contrib/brl/b3p/minizip/*
 Copyright:
  Copyright (C) 1998-2005 Gilles Vollant
-License: zlib/libpng
+License: zlib
  This software is provided 'as-is', without any express or implied
  warranty.  In no event will the authors be held liable for any damages
  arising from the use of this software.
@@ -283,8 +303,7 @@
  DEALINGS IN THE SOFTWARE.
 
 Files: debian/*
-Copyright:
- Copyright 2009-2012, Mathieu Malaterre <malat at debian.org>
+Copyright: 2009-2012, Mathieu Malaterre <malat at debian.org>
 License: GPL-2+
  The Debian packaging is licensed under the GPL-2 or any later version,
  see `/usr/share/common-licenses/GPL-2'

Modified: trunk/packages/vxl/trunk/debian/rules
===================================================================
--- trunk/packages/vxl/trunk/debian/rules	2013-11-28 12:14:19 UTC (rev 15298)
+++ trunk/packages/vxl/trunk/debian/rules	2013-11-28 12:17:51 UTC (rev 15299)
@@ -1,7 +1,11 @@
 #!/usr/bin/make -f
 #export DH_VERBOSE=1
 
+# http://bugs.debian.org/718047
+# http://bugs.debian.org/728574
+ifneq ($(shell dpkg-architecture -qDEB_BUILD_ARCH_CPU ), ia64)
 export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
+endif
 
 VER_FULL = $(shell dpkg-parsechangelog | grep '^Version' | cut -d' ' -f2 | cut -f1 -d-)
 SOVERSION = $(shell echo $(VER_FULL) | cut -f1-2 -d.)