Author: malat-guest Date: 2011-10-16 16:49:07 +0000 (Sun, 16 Oct 2011) New Revision: 8163
Modified: trunk/packages/vxl/trunk/debian/changelog trunk/packages/vxl/trunk/debian/patches/fix_alphacomp.patch trunk/packages/vxl/trunk/debian/patches/series trunk/packages/vxl/trunk/debian/rules Log: working on alpha compilation Modified: trunk/packages/vxl/trunk/debian/changelog =================================================================== --- trunk/packages/vxl/trunk/debian/changelog 2011-10-15 20:45:37 UTC (rev 8162) +++ trunk/packages/vxl/trunk/debian/changelog 2011-10-16 16:49:07 UTC (rev 8163) @@ -1,3 +1,9 @@ +vxl (1.14.0-11) UNRELEASED; urgency=low + + * Fix another compilation issue on alpha + + -- Mathieu Malaterre <[email protected]> Sun, 16 Oct 2011 18:48:04 +0200 + vxl (1.14.0-10) unstable; urgency=low * Fix compilation on alpha. Closes: #643643 Modified: trunk/packages/vxl/trunk/debian/patches/fix_alphacomp.patch =================================================================== --- trunk/packages/vxl/trunk/debian/patches/fix_alphacomp.patch 2011-10-15 20:45:37 UTC (rev 8162) +++ trunk/packages/vxl/trunk/debian/patches/fix_alphacomp.patch 2011-10-16 16:49:07 UTC (rev 8163) @@ -1,7 +1,7 @@ Index: vxl-1.14.0/v3p/Qv/QvDict.cxx =================================================================== ---- vxl-1.14.0.orig/v3p/Qv/QvDict.cxx 2011-09-28 12:12:46.000000000 +0200 -+++ vxl-1.14.0/v3p/Qv/QvDict.cxx 2011-09-28 12:12:51.000000000 +0200 +--- vxl-1.14.0.orig/v3p/Qv/QvDict.cxx 2003-10-15 20:23:46.000000000 +0200 ++++ vxl-1.14.0/v3p/Qv/QvDict.cxx 2011-10-16 18:30:08.000000000 +0200 @@ -9,7 +9,7 @@ # endif #else @@ -11,3 +11,16 @@ # elif defined(__CYGWIN__) # include <sys/types.h> /* for intptr_t on Cygwin */ # elif defined(__BORLANDC__) +Index: vxl-1.14.0/core/vul/vul_url.cxx +=================================================================== +--- vxl-1.14.0.orig/core/vul/vul_url.cxx 2011-10-16 18:30:24.000000000 +0200 ++++ vxl-1.14.0/core/vul/vul_url.cxx 2011-10-16 18:30:34.000000000 +0200 +@@ -27,7 +27,7 @@ + # include <sys/socket.h> + # include <netinet/in.h> // htons() + # ifdef __alpha +-# include <fp.h> // htons() [ on e.g. DEC alpha, htons is in machine/endian.h ] ++//# include <fp.h> // htons() [ on e.g. DEC alpha, htons is in machine/endian.h ] + # endif + # define SOCKET int + Modified: trunk/packages/vxl/trunk/debian/patches/series =================================================================== --- trunk/packages/vxl/trunk/debian/patches/series 2011-10-15 20:45:37 UTC (rev 8162) +++ trunk/packages/vxl/trunk/debian/patches/series 2011-10-16 16:49:07 UTC (rev 8163) @@ -7,3 +7,4 @@ renamelibs.patch fixcomp.patch fix_alphacomp.patch +debian-changes-1.14.0-10 Modified: trunk/packages/vxl/trunk/debian/rules =================================================================== --- trunk/packages/vxl/trunk/debian/rules 2011-10-15 20:45:37 UTC (rev 8162) +++ trunk/packages/vxl/trunk/debian/rules 2011-10-16 16:49:07 UTC (rev 8163) @@ -46,15 +46,16 @@ %: dh $@ --buildsystem=cmake --parallel +override_dh_auto_configure: + dh_auto_configure -- $(CMAKE_FLAGS) + pre-build: + echo "runnning pre-build" # remove duplicate from bprb_parameters+unsigned_int-.cxx 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 -override_dh_auto_configure: - dh_auto_configure -- $(CMAKE_FLAGS) - override_dh_lintian: echo "$(pkg_lib): package-name-doesnt-match-sonames" > debian/$(pkg_lib).lintian-overrides dh_lintian @@ -65,8 +66,6 @@ dh_install -p$(pkg_dev) --autodest debian/tmp/usr/include dh_install -p$(pkg_dev) --autodest debian/tmp/usr/share/vxl/cmake/*.cmake -# dh_installchangelogs -k CHANGES.txt - $(UPSTREAM_SRC).zip: wget http://voxel.dl.sourceforge.net/sourceforge/vxl/$@ _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
