[med-svn] r10373 - trunk/packages/vxl/trunk/debian
Mathieu Malaterre
malat at alioth.debian.org
Wed Apr 11 13:24:44 UTC 2012
Author: malat
Date: 2012-04-11 13:24:44 +0000 (Wed, 11 Apr 2012)
New Revision: 10373
Modified:
trunk/packages/vxl/trunk/debian/README.Debian
trunk/packages/vxl/trunk/debian/README.source
trunk/packages/vxl/trunk/debian/changelog
trunk/packages/vxl/trunk/debian/control
trunk/packages/vxl/trunk/debian/copyright
trunk/packages/vxl/trunk/debian/rules
Log:
rework on vxl
Modified: trunk/packages/vxl/trunk/debian/README.Debian
===================================================================
--- trunk/packages/vxl/trunk/debian/README.Debian 2012-04-11 11:47:05 UTC (rev 10372)
+++ trunk/packages/vxl/trunk/debian/README.Debian 2012-04-11 13:24:44 UTC (rev 10373)
@@ -1,3 +1,5 @@
When building vxl from source, if you have opencl installed on your system
the build system actually automatically detects those libs and will try to build
them
+
+ -- Mathieu Malaterre <malat at debian.org> Wed, 11 Apr 2012 10:21:29 +0200
Modified: trunk/packages/vxl/trunk/debian/README.source
===================================================================
--- trunk/packages/vxl/trunk/debian/README.source 2012-04-11 11:47:05 UTC (rev 10372)
+++ trunk/packages/vxl/trunk/debian/README.source 2012-04-11 13:24:44 UTC (rev 10373)
@@ -1,6 +1,3 @@
-This packages uses a patch system. Please read
-/usr/share/doc/quilt/README.source for more informations.
-
To prevent conflicts with other libraries, common library name have been renamed.
In particular:
Modified: trunk/packages/vxl/trunk/debian/changelog
===================================================================
--- trunk/packages/vxl/trunk/debian/changelog 2012-04-11 11:47:05 UTC (rev 10372)
+++ trunk/packages/vxl/trunk/debian/changelog 2012-04-11 13:24:44 UTC (rev 10373)
@@ -1,3 +1,14 @@
+vxl (1.14.0-16) UNRELEASED; urgency=low
+
+ * Use my @d.o alias
+ * Remove DMUA flag, not required
+ * Set LDFLAGS to remove lintian warnings
+ * Update d/copyright to use dep5
+ * Bump Std-Vers to 3.9.3, no changes needed
+ * Explicitly prefer libtiff5-dev in d/control
+
+ -- Mathieu Malaterre <malat at debian.org> Wed, 11 Apr 2012 10:21:29 +0200
+
vxl (1.14.0-15) unstable; urgency=low
* Remove inclusion of doxygen.cmake. Closes: #656922
Modified: trunk/packages/vxl/trunk/debian/control
===================================================================
--- trunk/packages/vxl/trunk/debian/control 2012-04-11 11:47:05 UTC (rev 10372)
+++ trunk/packages/vxl/trunk/debian/control 2012-04-11 13:24:44 UTC (rev 10373)
@@ -3,15 +3,14 @@
Section: science
Priority: optional
Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
-DM-Upload-Allowed: yes
-Uploaders: Mathieu Malaterre <mathieu.malaterre at gmail.com>,
+Uploaders: Mathieu Malaterre <malat at debian.org>,
Andreas Tille <tille at debian.org>
-Build-Depends: debhelper (>= 8), cmake (>= 2.4.5), libtiff-dev,
+Build-Depends: debhelper (>= 8), cmake (>= 2.4.5), libtiff5-dev,
libdcmtk2-dev, libpng-dev, libjpeg-dev, zlib1g-dev, libexpat-dev, python-dev,
libgeotiff-dev, libcoin60-dev, libdc1394-22-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
libqt4-dev, libxerces-c-dev, libglu-dev, libqt4-opengl-dev,
libmpeg2-4-dev, libswscale-dev, libavformat-dev, libavcodec-dev
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3
Vcs-Browser: http://anonscm.debian.org/viewvc/debian-med/trunk/packages/vxl/trunk/
Vcs-Svn: svn://svn.debian.org/debian-med/trunk/packages/vxl/trunk/
Modified: trunk/packages/vxl/trunk/debian/copyright
===================================================================
--- trunk/packages/vxl/trunk/debian/copyright 2012-04-11 11:47:05 UTC (rev 10372)
+++ trunk/packages/vxl/trunk/debian/copyright 2012-04-11 13:24:44 UTC (rev 10373)
@@ -1,4 +1,4 @@
-Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat
+Format-Specification: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Debianized-By: Mathieu Malaterre <mathieu.malaterre at gmail.com>
Debianized-Date: Wed, 30 Sep 2009 14:07:28 +0200
Original-Source: http://vxl.sourceforge.net
@@ -13,49 +13,49 @@
All Rights Reserved
Reproduction rights limited as described below.
License: BSD-like
-Permission to use, copy, modify, distribute, and sell this software
-and its documentation for any purpose is hereby granted without fee,
-provided that (i) the above copyright notice and this permission
-notice appear in all copies of the software and related documentation,
-(ii) the name TargetJr Consortium (represented by GE CRD), may not be
-used in any advertising or publicity relating to the software without
-the specific, prior written permission of GE CRD, and (iii) any
-modifications are clearly marked and summarized in a change history
-log.
+ Permission to use, copy, modify, distribute, and sell this software
+ and its documentation for any purpose is hereby granted without fee,
+ provided that (i) the above copyright notice and this permission
+ notice appear in all copies of the software and related documentation,
+ (ii) the name TargetJr Consortium (represented by GE CRD), may not be
+ used in any advertising or publicity relating to the software without
+ the specific, prior written permission of GE CRD, and (iii) any
+ modifications are clearly marked and summarized in a change history
+ log.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS" AND WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
+ WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+ IN NO EVENT SHALL THE TARGETJR CONSORTIUM BE LIABLE FOR ANY SPECIAL,
+ INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND OR ANY
+ DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+ WHETHER OR NOT ADVISED OF THE POSSIBILITY OF SUCH DAMAGES, OR ON
+ ANY THEORY OF LIABILITY ARISING OUT OF OR IN CONNECTION WITH THE
+ USE OR PERFORMANCE OF THIS SOFTWARE.
-THE SOFTWARE IS PROVIDED "AS IS" AND WITHOUT WARRANTY OF ANY KIND,
-EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
-WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
-IN NO EVENT SHALL THE TARGETJR CONSORTIUM BE LIABLE FOR ANY SPECIAL,
-INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND OR ANY
-DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-WHETHER OR NOT ADVISED OF THE POSSIBILITY OF SUCH DAMAGES, OR ON
-ANY THEORY OF LIABILITY ARISING OUT OF OR IN CONNECTION WITH THE
-USE OR PERFORMANCE OF THIS SOFTWARE.
-
Files: contrib/rpl/rgrl/rgrl_copyright.h
Copyright:
Copyright (c) 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:
-
+ .
* Redistributions of source code must retain the above copyright notice,
this list of conditions and the following disclaimer.
-
+ .
* Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.
-
+ .
* Neither the name of Rensselaer Polytechnic Institute nor the names
of any of the authors and contributors may be used to endorse or promote
products derived from this software without specific prior written
permission.
-
+ .
* Modified source versions must be plainly marked as such, and must not be
misrepresented as being the original software.
-
+ .
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER AND CONTRIBUTORS ``AS IS''
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -75,17 +75,17 @@
Graz University of Technology, Austria.
License:
This file is part of VRweb.
-
+ .
VRweb is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2, or (at your option)
any later version.
-
+ .
VRweb is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
-
+ .
You should have received a copy of the GNU General Public License
along with VRweb; see the file LICENCE. If not, write to the
Free Software Foundation, Inc., 59 Temple Place - Suite 330,
@@ -98,11 +98,11 @@
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.
-
+ .
Permission is granted to anyone to use this software for any purpose,
including commercial applications, and to alter it and redistribute it
freely, subject to the following restrictions:
-
+ .
1. The origin of this software must not be misrepresented; you must not
claim that you wrote the original software. If you use this software
in a product, an acknowledgment in the product documentation would be
@@ -128,10 +128,10 @@
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
@@ -142,24 +142,24 @@
Files: core/vul/vul_ios_state.h
Copyright:
- Copyright 2002, 2005 Daryle Walker
+ Copyright 2002, 2005 Daryle Walker
License:
Boost Software License - Version 1.0 - August 17th, 2003
-
+ .
Permission is hereby granted, free of charge, to any person or organization
obtaining a copy of the software and accompanying documentation covered by
this license (the "Software") to use, reproduce, display, distribute,
execute, and transmit the Software, and to prepare derivative works of the
Software, and to permit third-parties to whom the Software is furnished to
do so, all subject to the following:
-
+ .
The copyright notices in the Software and this entire statement, including
the above license grant, this restriction and the following disclaimer,
must be included in all copies of the Software, in whole or in part, and
all derivative works of the Software, unless such copies or derivative
works are solely in the form of machine-executable object code generated by
a source language processor.
-
+ .
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, TITLE AND NON-INFRINGEMENT. IN NO EVENT
@@ -173,21 +173,21 @@
Copyright 2006-2009 Brad King, Chuck Stewart
License: BSL (v1.0)
Boost Software License - Version 1.0 - August 17th, 2003
-
+ .
Permission is hereby granted, free of charge, to any person or organization
obtaining a copy of the software and accompanying documentation covered by
this license (the "Software") to use, reproduce, display, distribute,
execute, and transmit the Software, and to prepare derivative works of the
Software, and to permit third-parties to whom the Software is furnished to
do so, all subject to the following:
-
+ .
The copyright notices in the Software and this entire statement, including
the above license grant, this restriction and the following disclaimer,
must be included in all copies of the Software, in whole or in part, and
all derivative works of the Software, unless such copies or derivative
works are solely in the form of machine-executable object code generated by
a source language processor.
-
+ .
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, TITLE AND NON-INFRINGEMENT. IN NO EVENT
@@ -203,19 +203,17 @@
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.
-
- --
-
+ .
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
@@ -224,7 +222,6 @@
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
DEALINGS IN THE SOFTWARE.
-
Files: contrib/brl/b3p/minizip/*
Copyright:
Copyright (C) 1998-2005 Gilles Vollant
@@ -232,11 +229,11 @@
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.
-
+ .
Permission is granted to anyone to use this software for any purpose,
including commercial applications, and to alter it and redistribute it
freely, subject to the following restrictions:
-
+ .
1. The origin of this software must not be misrepresented; you must not
claim that you wrote the original software. If you use this software
in a product, an acknowledgment in the product documentation would be
@@ -264,21 +261,21 @@
Copyright 2007 Peter Dimov
License: BSL (v1.0)
Boost Software License - Version 1.0 - August 17th, 2003
-
+ .
Permission is hereby granted, free of charge, to any person or organization
obtaining a copy of the software and accompanying documentation covered by
this license (the "Software") to use, reproduce, display, distribute,
execute, and transmit the Software, and to prepare derivative works of the
Software, and to permit third-parties to whom the Software is furnished to
do so, all subject to the following:
-
+ .
The copyright notices in the Software and this entire statement, including
the above license grant, this restriction and the following disclaimer,
must be included in all copies of the Software, in whole or in part, and
all derivative works of the Software, unless such copies or derivative
works are solely in the form of machine-executable object code generated by
a source language processor.
-
+ .
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, TITLE AND NON-INFRINGEMENT. IN NO EVENT
@@ -287,10 +284,9 @@
ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
DEALINGS IN THE SOFTWARE.
-
Files: debian/*
Copyright:
- Copyright 2009, Mathieu Malaterre <mathieu.malaterre at gmail.com>
+ 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 2012-04-11 11:47:05 UTC (rev 10372)
+++ trunk/packages/vxl/trunk/debian/rules 2012-04-11 13:24:44 UTC (rev 10373)
@@ -3,6 +3,7 @@
DPKG_EXPORT_BUILDFLAGS = 1
-include /usr/share/dpkg/buildflags.mk
+export LDFLAGS=-Wl,--as-needed
VER_FULL = $(shell dpkg-parsechangelog | grep '^Version' | cut -d' ' -f2 | cut -f1 -d-)
SOVERSION = $(shell echo $(VER_FULL) | cut -f1-2 -d.)
@@ -13,9 +14,9 @@
DEBIAN_SRC_TAR = vxl_$(VER_FULL).orig.tar.gz
# CMAKE_SKIP_RPATH=OFF is required when BUILD_TESTING=ON
-CMAKE_FLAGS = \
+CMAKE_EXTRA_FLAGS = \
-DCMAKE_INSTALL_PREFIX:PATH=/usr \
- -DCMAKE_SKIP_RPATH:BOOL=ON \
+ -DCMAKE_SKIP_RPATH:BOOL=OFF \
-DBUILD_SHARED_LIBS:BOOL=ON \
-DVXL_USING_NATIVE_ZLIB:BOOL=ON \
-DVXL_USING_NATIVE_JPEG:BOOL=ON \
@@ -37,7 +38,7 @@
-DBUILD_CORE_UTILITIES:BOOL=ON \
-DBUILD_CORE_VIDEO:BOOL=ON \
-DBUILD_EXAMPLES:BOOL=OFF \
- -DBUILD_TESTING:BOOL=OFF
+ -DBUILD_TESTING:BOOL=ON
pkg_lib = libvxl$(SOVERSION)
pkg_dev = libvxl$(VER_MAJOR)-dev
@@ -51,7 +52,7 @@
rm -f $(CURDIR)/contrib/brl/bpro/bprb/Templates/bprb_parameters+unsigned-.cxx
# remove duplicate from bvxm_voxel_grid+bsta_num_obs+bsta_mixture_fixed+bsta_num_obs+bsta_gauss_f1-.3---.cxx
rm -f $(CURDIR)/contrib/brl/bseg/bvxm/grid/Templates/bvxm_voxel_grid+bsta_num_obs+bsta_mixture_fixed+bsta_num_obs+bsta_gaussian_sphere+float.1--.3---.cxx
- dh_auto_configure -- $(CMAKE_FLAGS)
+ dh_auto_configure -- $(CMAKE_EXTRA_FLAGS)
override_dh_lintian:
echo "$(pkg_lib): package-name-doesnt-match-sonames" > debian/$(pkg_lib).lintian-overrides
@@ -63,11 +64,5 @@
dh_install -p$(pkg_dev) --autodest debian/tmp/usr/include
dh_install -p$(pkg_dev) --autodest debian/tmp/usr/share/vxl/cmake/*.cmake
-$(UPSTREAM_SRC).zip:
- wget http://voxel.dl.sourceforge.net/sourceforge/vxl/$@
-
-get-orig-source: $(UPSTREAM_SRC).zip
- unzip -q $(UPSTREAM_SRC).zip
- GZIP="--best --no-name" tar czf $(DEBIAN_SRC_TAR) $(DEBIAN_SRC_DIR)
- rm -rf $(DEBIAN_SRC_DIR)
- rm $(UPSTREAM_SRC).zip
+get-orig-source:
+ uscan --verbose --force-download --repack
More information about the debian-med-commit
mailing list