Author: malat-guest Date: 2011-10-13 16:23:18 +0000 (Thu, 13 Oct 2011) New Revision: 8144
Modified: trunk/packages/vxl/trunk/debian/changelog trunk/packages/vxl/trunk/debian/compat trunk/packages/vxl/trunk/debian/control trunk/packages/vxl/trunk/debian/rules Log: cleanup vxl Modified: trunk/packages/vxl/trunk/debian/changelog =================================================================== --- trunk/packages/vxl/trunk/debian/changelog 2011-10-13 15:21:30 UTC (rev 8143) +++ trunk/packages/vxl/trunk/debian/changelog 2011-10-13 16:23:18 UTC (rev 8144) @@ -1,6 +1,8 @@ vxl (1.14.0-10) UNRELEASED; urgency=low * Fix compilation on alpha. Closes: #643643 + * Redo d/rules + * Compiles DC1394 plugin only on linux-any -- Mathieu Malaterre <[email protected]> Wed, 28 Sep 2011 12:13:03 +0200 Modified: trunk/packages/vxl/trunk/debian/compat =================================================================== --- trunk/packages/vxl/trunk/debian/compat 2011-10-13 15:21:30 UTC (rev 8143) +++ trunk/packages/vxl/trunk/debian/compat 2011-10-13 16:23:18 UTC (rev 8144) @@ -1 +1 @@ -7 +8 Modified: trunk/packages/vxl/trunk/debian/control =================================================================== --- trunk/packages/vxl/trunk/debian/control 2011-10-13 15:21:30 UTC (rev 8143) +++ trunk/packages/vxl/trunk/debian/control 2011-10-13 16:23:18 UTC (rev 8144) @@ -5,13 +5,13 @@ Maintainer: Debian Med Packaging Team <[email protected]> DM-Upload-Allowed: yes Uploaders: Mathieu Malaterre <[email protected]> -Build-Depends: cdbs (>= 0.4.49), quilt, debhelper (>= 7), cmake (>= 2.4.5), libtiff-dev, +Build-Depends: debhelper (>= 8), quilt, cmake (>= 2.4.5), libtiff-dev, libdcmtk2-dev, libpng-dev, libjpeg-dev, zlib1g-dev, libexpat-dev, python-dev, - libgeotiff-dev, libcoin60-dev, libavifile-0.7-dev, libdc1394-22-dev, + libgeotiff-dev, libcoin60-dev, libavifile-0.7-dev, libdc1394-22-dev [linux-any], libqt4-dev, libxerces-c-dev, libglu-dev, libqt4-opengl-dev, libmpeg2-4-dev, libswscale-dev, libavformat-dev, libavcodec-dev Standards-Version: 3.9.2 -Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/vxl/trunk/?rev=0&sc=0 +Vcs-Browser: http://anonscm.debian.org/viewvc/debian-med/trunk/packages/vxl/trunk/ Vcs-Svn: svn://svn.debian.org/svn/debian-med/trunk/packages/vxl/trunk/ Package: libvxl1.14 @@ -39,4 +39,3 @@ . This package contains the development files needed to build your own VXL applications. - Modified: trunk/packages/vxl/trunk/debian/rules =================================================================== --- trunk/packages/vxl/trunk/debian/rules 2011-10-13 15:21:30 UTC (rev 8143) +++ trunk/packages/vxl/trunk/debian/rules 2011-10-13 16:23:18 UTC (rev 8144) @@ -1,49 +1,19 @@ #!/usr/bin/make -f - -# Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/makefile.mk -include /usr/share/cdbs/1/rules/patchsys-quilt.mk +DPKG_EXPORT_BUILDFLAGS = 1 +-include /usr/share/dpkg/buildflags.mk -VER_MAJOR = 1 -VER_MINOR = 14 -VER_PATCH = 0 +VER_FULL = $(shell dpkg-parsechangelog | grep '^Version' | cut -d' ' -f2 | cut -f1 -d-) +SOVERSION = $(shell $(VER_FULL) | cut -f1-2 -d.) -VER_FULL = $(VER_MAJOR).$(VER_MINOR).$(VER_PATCH) -SOVERSION = $(VER_MAJOR).$(VER_MINOR) - UPSTREAM_SRC = vxl-$(VER_FULL) DEBIAN_SRC_DIR = vxl-$(VER_FULL) DEBIAN_SRC_TAR = vxl_$(VER_FULL).orig.tar.gz -pkg_lib = libvxl$(SOVERSION) -pkg_dev = libvxl$(VER_MAJOR)-dev -#pkg_examples = vxl$(VER_MAJOR)-examples - -DEB_BUILDDIR = $(CURDIR)/Build -DEB_DESTDIR = $(CURDIR)/debian/tmp -DEB_MAKE_INSTALL_TARGET = install DESTDIR=$(DEB_DESTDIR) - -ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) - NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) - DEB_MAKE_BUILD_TARGET = -j$(NUMJOBS) all -endif - -clean:: - rm -rf $(DEB_BUILDDIR) - -common-configure-arch:: - # 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 - cd $(DEB_BUILDDIR) && cmake \ +CMAKE_FLAGS = \ -DCMAKE_INSTALL_PREFIX:PATH=/usr \ -DCMAKE_SKIP_RPATH:BOOL=ON \ - -DCMAKE_BUILD_TYPE:STRING=RELEASE \ - -DCMAKE_VERBOSE_MAKEFILE=$(DH_VERBOSE) \ -DBUILD_SHARED_LIBS:BOOL=ON \ -DVXL_USING_NATIVE_ZLIB:BOOL=ON \ -DVXL_USING_NATIVE_JPEG:BOOL=ON \ @@ -66,22 +36,36 @@ -DBUILD_CORE_UTILITIES:BOOL=ON \ -DBUILD_CORE_VIDEO:BOOL=ON \ -DBUILD_EXAMPLES:BOOL=OFF \ - -DBUILD_TESTING:BOOL=ON \ - .. + -DBUILD_TESTING:BOOL=ON -common-build-arch:: +pkg_lib = libvxl$(SOVERSION) +pkg_dev = libvxl$(VER_MAJOR)-dev +#pkg_examples = vxl$(VER_MAJOR)-examples + +%: + dh $@ --buildsystem=cmake --parallel + +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 -install/$(pkg_lib):: +override_dh_install: dh_install -p$(pkg_lib) debian/tmp/usr/lib/lib*.so.* usr/lib - -install/$(pkg_dev):: dh_install -p$(pkg_dev) debian/tmp/usr/lib/lib*.so usr/lib 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 +# dh_installchangelogs -k CHANGES.txt + $(UPSTREAM_SRC).zip: wget http://voxel.dl.sourceforge.net/sourceforge/vxl/$@ @@ -89,3 +73,4 @@ 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 _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
