debian/0000755000000000000000000000000012302755337007175 5ustar debian/libvlfeat-dev.docs0000644000000000000000000000000712256126162012564 0ustar README debian/copyright0000644000000000000000000000322112256126162011122 0ustar Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Source: http://www.vlfeat.org Upstream-Contact: Andrea Vedaldi, Upstream-Name: VLFeat Files: * Copyright: 2007-2011 Andrea Vedaldi 2007-2011 Brian Fulkerson 2012-2013 The VLFeat Team License: BSD Files: debian/* Copyright: 2013 Dima Kogan License: BSD License: BSD Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. 2. 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. . THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. debian/libvlfeat-dev.examples0000644000000000000000000000002312256126162013450 0ustar src/*.[ch] src/*.1 debian/changelog0000644000000000000000000000254612302755337011056 0ustar vlfeat (0.9.17+dfsg0-6build1) trusty; urgency=medium * Rebuild for octave 3.8. -- Matthias Klose Mon, 24 Feb 2014 23:50:55 +0000 vlfeat (0.9.17+dfsg0-6) unstable; urgency=low * Bug fix: "Do not compress the example *.m files", thanks to Rafael Laboissiere (Closes: #734049). -- Dima Kogan Sun, 12 Jan 2014 01:56:11 -0800 vlfeat (0.9.17+dfsg0-5) unstable; urgency=low * vlfeat is now Multi-arch:same -- Dima Kogan Sat, 28 Dec 2013 00:15:39 -0800 vlfeat (0.9.17+dfsg0-4) unstable; urgency=low * Build fixes to work on a wider array of machines: - No longer using SSE or AVX, since the target may not have those - No longer building x86-specific code on non-x86 boxes -- Dima Kogan Mon, 23 Dec 2013 13:35:09 -0800 vlfeat (0.9.17+dfsg0-3) unstable; urgency=low * libvlfeat-doc no longer ships intermediate build files -- Dima Kogan Sun, 22 Dec 2013 21:02:49 -0800 vlfeat (0.9.17+dfsg0-2) unstable; urgency=low * Stripped Google Adsense and Google custom search from the packaged docs -- Dima Kogan Sun, 22 Dec 2013 12:54:16 -0800 vlfeat (0.9.17+dfsg0-1) unstable; urgency=low * Initial Debian release (Closes: #576124) -- Dima Kogan Wed, 06 Nov 2013 22:55:35 -0800 debian/libvlfeat-doc.doc-base0000644000000000000000000000042012256126162013277 0ustar Document: vlfeat Title: VLFeat Manual Author: Andrea Vedaldi and Brian Fulkerson Abstract: VLFeat: computer vision library for C and GNU Octave Section: Programming Format: HTML Index: /usr/share/doc/libvlfeat-doc/doc/index.html Files: /usr/share/doc/libvlfeat-doc/doc/* debian/octave-vlfeat.examples0000644000000000000000000000000512256126162013464 0ustar apps debian/libvlfeat-dev.install0000755000000000000000000000012412256126162013305 0ustar #!/usr/bin/dh-exec vl/*.h /usr/include/vl/ libvl*.so usr/lib/${DEB_HOST_MULTIARCH} debian/compat0000644000000000000000000000000212256126162010367 0ustar 9 debian/patches/0000755000000000000000000000000012256126162010620 5ustar debian/patches/0004-removed-unneeded-RPATH-from-the-.mex-files.patch0000644000000000000000000000145312256126162022013 0ustar From: Dima Kogan Date: Thu, 7 Nov 2013 10:43:21 -0800 Subject: removed unneeded RPATH from the .mex files --- make/octave.mak | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/make/octave.mak b/make/octave.mak index 0211428..8f72472 100644 --- a/make/octave.mak +++ b/make/octave.mak @@ -52,16 +52,6 @@ endif ifeq ($(ARCH),maci64) endif -# Linux on 32 bit processor -ifeq ($(ARCH),glnx86) -OCTAVE_MEX_FLAGS += -Wl,--rpath,\\\$$ORIGIN/ -endif - -# Linux on 64 bit processorm -ifeq ($(ARCH),glnxa64) -OCTAVE_MEX_FLAGS += -Wl,--rpath,\\\$$ORIGIN/ -endif - # -------------------------------------------------------------------- # Build # -------------------------------------------------------------------- debian/patches/0009-I-disable-SSE2-and-AVX-to-work-on-Debian-s-wide-arra.patch0000644000000000000000000000100712256126162023227 0ustar From: Dima Kogan Date: Mon, 23 Dec 2013 13:34:04 -0800 Subject: I disable SSE2 and AVX to work on Debian's wide array of arches --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index d6b20fd..ad0158f 100644 --- a/Makefile +++ b/Makefile @@ -90,8 +90,8 @@ SHELL = /bin/bash all: # Select which features to disable -# DISABLE_SSE2=yes -# DISABLE_AVX=yes +DISABLE_SSE2=yes +DISABLE_AVX=yes # DISABLE_THREADS=yes # DISABLE_OPENMP=yes debian/patches/0003-the-DSO-now-has-an-SONAME.patch0000644000000000000000000000136012256126162016352 0ustar From: Dima Kogan Date: Wed, 6 Nov 2013 22:44:35 -0800 Subject: the DSO now has an SONAME --- make/dll.mak | 2 ++ 1 file changed, 2 insertions(+) diff --git a/make/dll.mak b/make/dll.mak index 032b386..c6cffea 100644 --- a/make/dll.mak +++ b/make/dll.mak @@ -19,6 +19,7 @@ info: dll-info # -------------------------------------------------------------------- DLL_NAME = vl +API_VERSION := 0 DLL_CFLAGS = $(STD_CFLAGS) DLL_CFLAGS += -fvisibility=hidden -fPIC -DVL_BUILD_DLL -pthread @@ -115,6 +116,7 @@ $(BINDIR)/lib$(DLL_NAME).so : $(dll_obj) $(^) \ $(DLL_LDFLAGS) \ $(if $(DISABLE_OPENMP),,-fopenmp) \ + -Wl,-soname,lib$(DLL_NAME).so.$(API_VERSION) \ -o $(@) dll-clean: debian/patches/0007-removed-architecture-detection-logic.patch0000644000000000000000000001572412256126162021426 0ustar From: Dima Kogan Date: Fri, 22 Nov 2013 14:19:13 -0800 Subject: removed architecture detection logic This isn't needed on debian, and builds were failing on i386 machines since the detection was seeing a 64-bit system for some reason --- Makefile | 58 ++------------------------------------------------------- make/bin.mak | 18 ------------------ make/dll.mak | 22 ---------------------- make/matlab.mak | 28 ---------------------------- make/octave.mak | 8 -------- 5 files changed, 2 insertions(+), 132 deletions(-) diff --git a/Makefile b/Makefile index fd2f5db..d6b20fd 100644 --- a/Makefile +++ b/Makefile @@ -99,12 +99,6 @@ all: # Error Messages # -------------------------------------------------------------------- -err_no_arch = -err_no_arch +=$(shell echo "** Unknown host architecture '$(UNAME)'. This identifier" 1>&2) -err_no_arch +=$(shell echo "** was obtained by running 'uname -sm'. Edit the Makefile " 1>&2) -err_no_arch +=$(shell echo "** to add the appropriate configuration." 1>&2) -err_no_arch +=config - err_internal =$(shell echo Internal error) err_internal +=internal @@ -116,22 +110,7 @@ err_spaces +=spaces # Auto-detect architecture # -------------------------------------------------------------------- -Darwin_PPC_ARCH := mac -Darwin_Power_Macintosh_ARCH := mac -Darwin_i386_ARCH := maci64 -Darwin_x86_64_ARCH := maci64 -Linux_i386_ARCH := glnx86 -Linux_i686_ARCH := glnx86 -Linux_unknown_ARC := glnx86 -Linux_x86_64_ARCH := glnxa64 - -UNAME := $(shell uname -sm) -ARCH ?= $($(shell echo "$(UNAME)" | tr \ _)_ARCH) - -# sanity check -ifeq ($(ARCH),) -die:=$(error $(err_no_arch)) -endif +ARCH := debian ifneq ($(VLDIR),$(shell echo "$(VLDIR)" | sed 's/ //g')) die:=$(error $(err_spaces)) @@ -160,44 +139,12 @@ STD_LDFLAGS = $(LDFLAGS) # Architecture specific ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# Mac OS X Intel 32 -ifeq ($(ARCH),maci) -#SDKROOT ?= $(shell xcode-select -print-path)/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk -SDKROOT ?= $(shell xcodebuild -version -sdk macosx | sed -n '/^Path\:/p' | sed 's/^Path: //') -MACOSX_DEPLOYMENT_TARGET ?= 10.4 -STD_CFLAGS += -m32 -isysroot $(SDKROOT) -mmacosx-version-min=$(MACOSX_DEPLOYMENT_TARGET) -STD_LDFLAGS += -Wl,-syslibroot,$(SDKROOT) -mmacosx-version-min=$(MACOSX_DEPLOYMENT_TARGET) -DISABLE_AVX ?= yes -CC = gcc -endif - -# Mac OS X Intel 64 -ifeq ($(ARCH),maci64) -#SDKROOT ?= $(shell xcode-select -print-path)/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk -SDKROOT ?= $(shell xcodebuild -version -sdk macosx | sed -n '/^Path\:/p' | sed 's/^Path: //') -MACOSX_DEPLOYMENT_TARGET ?= 10.4 -STD_CFLAGS += -m64 -isysroot $(SDKROOT) -mmacosx-version-min=$(MACOSX_DEPLOYMENT_TARGET) -STD_LDFLAGS += -Wl,-syslibroot,$(SDKROOT) -mmacosx-version-min=$(MACOSX_DEPLOYMENT_TARGET) -DISABLE_AVX ?= yes # GCC 4.2 need for OpenMP does not support -mavx -CC = gcc -endif - -# Linux-32 -ifeq ($(ARCH),glnx86) # Target compatibility with GLIBC 2.3.4 # 1) _GNU_SOURCE avoids using isoc99_fscanf, limiting binray portability to recent GLIBC. # 2) -fno-stack-protector avoids using a feature requiring GLBIC 2.4 -STD_CFLAGS += -m32 -D_GNU_SOURCE -fno-stack-protector -STD_LDFLAGS += -m32 -Wl,--rpath,\$$ORIGIN/ -Wl,--as-needed -lpthread -lm -CC ?= gcc -endif - -# Linux-64 -ifeq ($(ARCH),glnxa64) STD_CFLAGS += -D_GNU_SOURCE -fno-stack-protector -STD_LDFLAGS += -Wl,--rpath,\$$ORIGIN/ -Wl,--as-needed -lpthread -lm +STD_LDFLAGS += -Wl,--as-needed -lpthread -lm CC ?= gcc -endif # -------------------------------------------------------------------- # Functions @@ -317,7 +264,6 @@ info: $(call echo-var,PROFILE) $(call echo-var,DEBUG) $(call echo-var,VER) - $(call echo-var,ARCH) $(call echo-var,CC) $(call echo-var,STD_CFLAGS) $(call echo-var,STD_LDFLAGS) diff --git a/make/bin.mak b/make/bin.mak index a0cfa6e..14d7105 100644 --- a/make/bin.mak +++ b/make/bin.mak @@ -21,24 +21,6 @@ info: bin-info BIN_CFLAGS = $(STD_CFLAGS) -I$(VLDIR) BIN_LDFLAGS = $(STD_LDFLAGS) -L$(BINDIR) -lvl -# Mac OS X Intel 32 -ifeq ($(ARCH),maci) -endif - -# Mac OS X Intel 64 -ifeq ($(ARCH),maci64) -endif - -# Linux-32 -ifeq ($(ARCH),glnx86) -BIN_LDFLAGS += -Wl,--rpath,\$$ORIGIN/ -endif - -# Linux-64 -ifeq ($(ARCH),glnxa64) -BIN_LDFLAGS += -Wl,--rpath,\$$ORIGIN/ -endif - # -------------------------------------------------------------------- # Build # -------------------------------------------------------------------- diff --git a/make/dll.mak b/make/dll.mak index c6cffea..03da24b 100644 --- a/make/dll.mak +++ b/make/dll.mak @@ -32,29 +32,7 @@ DLL_LDFLAGS += -lm -lpthread BINDIR = bin/$(ARCH) -# Mac OS X on Intel 32 bit processor -ifeq ($(ARCH),maci) -DLL_SUFFIX := dylib -DLL_LDFLAGS += -m32 -endif - -# Mac OS X on Intel 64 bit processor -ifeq ($(ARCH),maci64) -DLL_SUFFIX := dylib -DLL_LDFLAGS += -m64 -endif - -# Linux-32 -ifeq ($(ARCH),glnx86) DLL_SUFFIX := so -DLL_LDFLAGS += -m32 -endif - -# Linux-64 -ifeq ($(ARCH),glnxa64) -DLL_SUFFIX := so -DLL_LDFLAGS += -m64 -endif # -------------------------------------------------------------------- # Build diff --git a/make/matlab.mak b/make/matlab.mak index 7288c8c..e95075e 100644 --- a/make/matlab.mak +++ b/make/matlab.mak @@ -42,35 +42,7 @@ MEX_FLAGS += $(if $(DEBUG), -g, -O) MEX_FLAGS += $(if $(PROFILE), -O -g,) MEX_FLAGS += CFLAGS='$$CFLAGS $(STD_CFLAGS)' -# Mac OS X on Intel 32 bit processor -ifeq ($(ARCH),maci) -MEX_SUFFIX := mexmaci -MEX_FLAGS += LDFLAGS='$$LDFLAGS $(STD_LDFLAGS)' -MEX_FLAGS += CC='$(CC)' -MEX_FLAGS += LD='$(CC)' -endif - -# Mac OS X on Intel 64 bit processor -ifeq ($(ARCH),maci64) -MEX_SUFFIX := mexmaci64 -MEX_FLAGS += -largeArrayDims -MEX_FLAGS += LDFLAGS='$$LDFLAGS $(STD_LDFLAGS)' -MEX_FLAGS += CC='$(CC)' -MEX_FLAGS += LD='$(CC)' -endif - -# Linux on 32 bit processor -ifeq ($(ARCH),glnx86) MEX_SUFFIX := mexglx -MEX_FLAGS += LDFLAGS='$$LDFLAGS $(STD_LDFLAGS) -Wl,--rpath,\\\$$ORIGIN/' -endif - -# Linux on 64 bit processorm -ifeq ($(ARCH),glnxa64) -MEX_SUFFIX := mexa64 -MEX_FLAGS += -largeArrayDims -MEX_FLAGS += LDFLAGS='$$LDFLAGS $(STD_LDFLAGS) -Wl,--rpath,\\\$$ORIGIN/' -endif MEX_BINDIR := toolbox/mex/$(MEX_SUFFIX) diff --git a/make/octave.mak b/make/octave.mak index 2d2f2b2..14dffbd 100644 --- a/make/octave.mak +++ b/make/octave.mak @@ -48,14 +48,6 @@ OCTAVE_MEX_CFLAGS += $(if $(PROFILE), -O -g,) OCTAVE_MEX_CFLAGS += $(STD_CFLAGS) OCTAVE_MEX_LDFLAGS = -# Mac OS X on Intel 32 bit processor -ifeq ($(ARCH),maci) -endif - -# Mac OS X on Intel 64 bit processor -ifeq ($(ARCH),maci64) -endif - # -------------------------------------------------------------------- # Build # -------------------------------------------------------------------- debian/patches/0006-the-mex-.d-file-generator-now-works.-It-has-include-.patch0000644000000000000000000000214412256126162023637 0ustar From: Dima Kogan Date: Thu, 7 Nov 2013 12:47:04 -0800 Subject: the mex .d file generator now works. It has include-path issues --- make/octave.mak | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/make/octave.mak b/make/octave.mak index 3f44465..2d2f2b2 100644 --- a/make/octave.mak +++ b/make/octave.mak @@ -41,7 +41,8 @@ info: octave-mex-info OCTAVE_MEX_SUFFIX := mex OCTAVE_MEX_BINDIR := toolbox/mex/octave/$(MEX_SUFFIX) OCTAVE_MEX_FLAGS = -L$(BINDIR) -lvl -OCTAVE_MEX_CFLAGS = -I$(VLDIR)/toolbox +OCTAVE_MEX_INC := -I$(VLDIR) -I$(VLDIR)/toolbox +OCTAVE_MEX_CFLAGS = $(OCTAVE_MEX_INC) OCTAVE_MEX_CFLAGS += $(if $(DEBUG), -g, -O) OCTAVE_MEX_CFLAGS += $(if $(PROFILE), -O -g,) OCTAVE_MEX_CFLAGS += $(STD_CFLAGS) @@ -85,7 +86,7 @@ octave-mex-all: $(octave_mex_tgt) matlab-noprefix $(eval $(call gendir, octave-mex, $(OCTAVE_MEX_BINDIR))) $(OCTAVE_MEX_BINDIR)/%.d : %.c $(octave-mex-dir) - $(call C,MKOCTFILE) $(OCTAVE_MEX_FLAGS) -M "$(<)" + $(call C,MKOCTFILE) $(OCTAVE_MEX_INC) -M "$(<)" @mv "$(<:.c=.d)" $(OCTAVE_MEX_BINDIR) $(octave_mex_dll) : $(dll_tgt) debian/patches/0010-I-no-longer-try-to-generate-x86-specific-code-on-non.patch0000644000000000000000000000144612256126162023656 0ustar From: Dima Kogan Date: Mon, 23 Dec 2013 13:34:33 -0800 Subject: I no longer try to generate x86-specific code on non-x86 boxes --- vl/host.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/vl/host.c b/vl/host.c index ef97cdc..a9654f0 100644 --- a/vl/host.c +++ b/vl/host.c @@ -441,6 +441,8 @@ _vl_cpuid (vl_int32* info, int function) #endif +#if defined(VL_ARCH_IX86) || defined(VL_ARCH_X64) || defined(VL_ARCH_IA64) + void _vl_x86cpu_info_init (VlX86CpuInfo *self) { @@ -488,6 +490,8 @@ _vl_x86cpu_info_to_string_copy (VlX86CpuInfo const *self) return string ; } +#endif + /** ------------------------------------------------------------------ ** @brief Human readable static library configuration ** @return a new string with the static configuration. debian/patches/0001-environmental-CFLAGS-LDFLAGS-CPPFLAGS-are-now-used.patch0000644000000000000000000000167512256126162022621 0ustar From: Dima Kogan Date: Wed, 6 Nov 2013 22:30:54 -0800 Subject: environmental CFLAGS, LDFLAGS, CPPFLAGS are now used This patch fixes a typo and pulls in the variables --- Makefile | 2 +- make/dll.mak | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 5584e2a..2d4aaac 100644 --- a/Makefile +++ b/Makefile @@ -144,7 +144,7 @@ endif VLDIR ?= . LIBTOOL ?= libtool -STD_CLFAGS = $(CFLAGS) +STD_CFLAGS = $(CFLAGS) $(CPPFLAGS) STD_CFLAGS += -std=c99 STD_CFLAGS += -Wall -Wextra diff --git a/make/dll.mak b/make/dll.mak index b386c62..314fc59 100644 --- a/make/dll.mak +++ b/make/dll.mak @@ -26,6 +26,7 @@ DLL_CFLAGS += $(call if-like,%_sse2,$*, $(if $(DISABLE_SSE2),,-msse2)) DLL_CFLAGS += $(call if-like,%_avx,$*, $(if $(DISABLE_AVX),,-mavx)) DLL_CFLAGS += $(if $(DISABLE_OPENMP),,-fopenmp) +DLL_LDFLAGS = $(STD_LDFLAGS) DLL_LDFLAGS += -lm -lpthread BINDIR = bin/$(ARCH) debian/patches/series0000644000000000000000000000105112256126162012032 0ustar 0001-environmental-CFLAGS-LDFLAGS-CPPFLAGS-are-now-used.patch 0002-removed-bogus-commas-in-the-Makefile.patch 0003-the-DSO-now-has-an-SONAME.patch 0004-removed-unneeded-RPATH-from-the-.mex-files.patch 0005-octave-make-clean-now-works-properly.patch 0006-the-mex-.d-file-generator-now-works.-It-has-include-.patch 0007-removed-architecture-detection-logic.patch 0008-Removed-google-adsense-and-google-analytics-from-the.patch 0009-I-disable-SSE2-and-AVX-to-work-on-Debian-s-wide-arra.patch 0010-I-no-longer-try-to-generate-x86-specific-code-on-non.patch debian/patches/0002-removed-bogus-commas-in-the-Makefile.patch0000644000000000000000000001165012256126162021153 0ustar From: Dima Kogan Date: Wed, 6 Nov 2013 22:54:40 -0800 Subject: removed bogus commas in the Makefile --- Makefile | 2 +- make/bin.mak | 4 ++-- make/dist.mak | 10 +++++----- make/dll.mak | 2 +- make/doc.mak | 2 +- make/matlab.mak | 8 ++++---- make/octave.mak | 2 +- 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/Makefile b/Makefile index 2d4aaac..fd2f5db 100644 --- a/Makefile +++ b/Makefile @@ -297,7 +297,7 @@ include make/octave.mak include make/doc.mak include make/dist.mak -.PHONY: clean, archclean, distclean, info, help +.PHONY: clean archclean distclean info help no_dep_targets += clean archclean distclean info help clean: diff --git a/make/bin.mak b/make/bin.mak index 58e1f0c..a0cfa6e 100644 --- a/make/bin.mak +++ b/make/bin.mak @@ -56,8 +56,8 @@ deps += $(bin_dep) arch_bins += $(bin_tgt) comm_bins += -.PHONY: bin-all, bin-info -.PHONY: bin-clean, bin-archclean, bin-distclean +.PHONY: bin-all bin-info +.PHONY: bin-clean bin-archclean bin-distclean no_dep_targets += bin-dir bin-clean bin-archclean bin-distclean no_dep_targets += bin-info diff --git a/make/dist.mak b/make/dist.mak index c663841..a4f84aa 100644 --- a/make/dist.mak +++ b/make/dist.mak @@ -31,8 +31,8 @@ HOST := vlfeat-admin:vlfeat.org/sandbox # Build source package # -------------------------------------------------------------------- -.PHONY: dist-src, dist-src-clean, dist-src-info -no_dep_targets += dist-src, dist-src-clean, dist-src-info +.PHONY: dist-src dist-src-clean dist-src-info +no_dep_targets += dist-src dist-src-clean dist-src-info dist-src: COPYFILE_DISABLE=1 \ @@ -68,8 +68,8 @@ dist-src-info: # # dist-src: Packs the commit vXX.XX.XX. -.PHONY: dist-bin, dist-bin-release, dist-bin-commit, dist-bin-info -.PHONY: dist-bin-clean, dist-bin-archclean, dist-bin-distclean +.PHONY: dist-bin dist-bin-release dist-bin-commit dist-bin-info +.PHONY: dist-bin-clean dist-bin-archclean dist-bin-distclean no_dep_targets += dist-bin dist-bin-release dist-bin-commit dist-bin-info no_dep_targets += dist-bin-clean dist-bin-archclean dist-bin-distclean @@ -192,7 +192,7 @@ dist-bin-info: # Post packages on the web # -------------------------------------------------------------------- -.PHONY: post, post-doc +.PHONY: post post-doc post: $(RSYNC) \ diff --git a/make/dll.mak b/make/dll.mak index 314fc59..032b386 100644 --- a/make/dll.mak +++ b/make/dll.mak @@ -75,7 +75,7 @@ comm_bins += deps += $(dll_dep) .PHONY: dll -.PHONY: dll-all, dll-clean, dll-archclean, dll-distclean +.PHONY: dll-all dll-clean dll-archclean dll-distclean .PHONY: dll-info no_dep_targets += dll-dir dll-clean dll-archclean dll-distclean no_dep_targets += dll-info diff --git a/make/doc.mak b/make/doc.mak index ac5ec8b..a0b96f9 100644 --- a/make/doc.mak +++ b/make/doc.mak @@ -287,7 +287,7 @@ doc/index.html: $(webdoc_src) $(doc-dir) \ # Maintenance and others # -------------------------------------------------------------------- -.PHONY: doc-clean, doc-archclean, doc-distclean +.PHONY: doc-clean doc-archclean doc-distclean no_dep_targets := doc-clean doc-archclean doc-distclean VERSION: vl/generic.h diff --git a/make/matlab.mak b/make/matlab.mak index 65b37b8..7288c8c 100644 --- a/make/matlab.mak +++ b/make/matlab.mak @@ -89,8 +89,8 @@ endif # Build # -------------------------------------------------------------------- -.PHONY: mex-all, mex-dir, mex-info, mex-test -.PHONY: mex-clean, mex-distclean, mex-archclean +.PHONY: mex-all mex-dir mex-info mex-test +.PHONY: mex-clean mex-distclean mex-archclean no_dep_targets += mex-dir mex-info mex-test no_dep_targets += mex-clean mex-distclean mex-archclean @@ -199,8 +199,8 @@ m_lnk += $(addprefix toolbox/noprefix/, \ vpath vl_%.m $(shell find $(VLDIR)/toolbox -type d) -.PHONY: matlab-all, matlab-noprefix, matlab-info -.PHONY: matlab-clean, matlab-archclean, matlab-distclean +.PHONY: matlab-all matlab-noprefix matlab-info +.PHONY: matlab-clean matlab-archclean matlab-distclean no_dep_targets += matlab-all matlab-noprefix matlab-info no_dep_targets += matlab-clean matlab-archclean matlab-distclean diff --git a/make/octave.mak b/make/octave.mak index f7f2f10..0211428 100644 --- a/make/octave.mak +++ b/make/octave.mak @@ -66,7 +66,7 @@ endif # Build # -------------------------------------------------------------------- -.PHONY: octave-all, octave-mex-all, octave-mex-dir, octave-info +.PHONY: octave-all octave-mex-all octave-mex-dir octave-info .PHONY: octave-clean octave-archclean octave-distclean no_dep_targets += octave-info no_dep_targets += octave-clean octave-archclean octave-distclean debian/patches/0008-Removed-google-adsense-and-google-analytics-from-the.patch0000644000000000000000000000416312256126162024243 0ustar From: Dima Kogan Date: Sun, 22 Dec 2013 12:47:04 -0800 Subject: Removed google adsense and google analytics from the docs This violated the user's privacy: http://lintian.debian.org/tags/privacy-breach-google-adsense.html --- docsrc/vlfeat-website-template.xml | 30 ------------------------------ 1 file changed, 30 deletions(-) diff --git a/docsrc/vlfeat-website-template.xml b/docsrc/vlfeat-website-template.xml index a83a6ab..68b8516 100644 --- a/docsrc/vlfeat-website-template.xml +++ b/docsrc/vlfeat-website-template.xml @@ -51,40 +51,10 @@ - - - -
- -
%path; debian/patches/0005-octave-make-clean-now-works-properly.patch0000644000000000000000000000262012256126162021315 0ustar From: Dima Kogan Date: Thu, 7 Nov 2013 11:21:57 -0800 Subject: octave 'make clean' now works properly Two fixes: 1. 'make clean' now always cleans up octave stuff, even if octave builds are off. This works to clean up from previous runs 2. octave now cleans up its .o files --- make/octave.mak | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/make/octave.mak b/make/octave.mak index 8f72472..3f44465 100644 --- a/make/octave.mak +++ b/make/octave.mak @@ -28,10 +28,13 @@ endif ifdef OCTAVE_ENABLE all: octave-mex-all +endif + +# cleaning rules are defined even if OCTAVE_ENABLE is off, so that we can clean +# up previous build products clean: octave-mex-clean archclean: octave-mex-archclean distclean: octave-mex-distclean -endif info: octave-mex-info @@ -65,6 +68,7 @@ octave_mex_src := $(shell find $(VLDIR)/toolbox -name "*.c") octave_mex_tgt := $(addprefix $(OCTAVE_MEX_BINDIR)/,\ $(notdir $(mex_src:.c=.$(OCTAVE_MEX_SUFFIX)) ) ) octave_mex_dep := $(octave_mex_tgt:.$(OCTAVE_MEX_SUFFIX)=.d) +octave_mex_obj := $(notdir $(mex_src:.c=.o)) octave_mex_dll := $(OCTAVE_MEX_BINDIR)/lib$(DLL_NAME).$(DLL_SUFFIX) ifdef OCTAVE_ENABLE @@ -113,7 +117,7 @@ octave-mex-info: @echo octave-mex-clean: - rm -f $(octave_mex_dep) + rm -f $(octave_mex_dep) $(octave_mex_obj) octave-mex-archclean: octave-clean rm -f $(octave_mex_tgt) debian/libvlfeat-doc.examples0000644000000000000000000000002312256126162013437 0ustar src/*.[ch] src/*.1 debian/libvlfeat-doc.docs0000644000000000000000000000000412256126162012550 0ustar doc debian/control0000644000000000000000000000655212257504220010600 0ustar Source: vlfeat Section: science Priority: optional Build-Depends: debhelper (>= 9), dh-exec, liboctave-dev, octave-pkg-dev (>= 1.0.0), transfig, ghostscript, inkscape, texlive-latex-base, imagemagick, python2.7, doxygen, rsync Maintainer: Debian Science Maintainers Uploaders: Dima Kogan Standards-Version: 3.9.4 Homepage: http://www.vlfeat.org Vcs-Git: git://anonscm.debian.org/debian-science/packages/vlfeat.git Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-science/packages/vlfeat.git Package: libvlfeat0 Section: libs Architecture: any Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends} Description: Computer vision library focussing on visual features and clustering VLFeat implements popular computer vision algorithms including SIFT, MSER, k-means, hierarchical k-means, agglomerative information bottleneck, and quick shift. It is written in C for efficiency and compatibility, with interfaces in GNU octave for ease of use, and detailed documentation throughout Package: libvlfeat-dev Section: libdevel Architecture: any Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} Depends: ${misc:Depends}, libvlfeat0 (= ${binary:Version}) Recommends: libvlfeat-doc Description: Computer vision library focussing on visual features and clustering VLFeat implements popular computer vision algorithms including SIFT, MSER, k-means, hierarchical k-means, agglomerative information bottleneck, and quick shift. It is written in C for efficiency and compatibility, with interfaces in GNU octave for ease of use, and detailed documentation throughout . Development files Package: libvlfeat0-dbg Section: debug Priority: extra Architecture: any Multi-Arch: same Depends: ${misc:Depends}, libvlfeat0 (= ${binary:Version}) Description: Computer vision library focussing on visual features and clustering VLFeat implements popular computer vision algorithms including SIFT, MSER, k-means, hierarchical k-means, agglomerative information bottleneck, and quick shift. It is written in C for efficiency and compatibility, with interfaces in GNU octave for ease of use, and detailed documentation throughout . Debug symbols Package: libvlfeat-doc Section: doc Architecture: all Depends: ${misc:Depends} Description: Computer vision library focussing on visual features and clustering VLFeat implements popular computer vision algorithms including SIFT, MSER, k-means, hierarchical k-means, agglomerative information bottleneck, and quick shift. It is written in C for efficiency and compatibility, with interfaces in GNU octave for ease of use, and detailed documentation throughout . Documentation Package: octave-vlfeat Section: libs Priority: extra Architecture: any Pre-Depends: ${misc:Pre-Depends} Multi-Arch: same Depends: ${shlibs:Depends}, ${misc:Depends}, libvlfeat0 (>= ${binary:Version}), ${octave:Depends} Recommends: libvlfeat-doc Description: Computer vision library focussing on visual features and clustering VLFeat implements popular computer vision algorithms including SIFT, MSER, k-means, hierarchical k-means, agglomerative information bottleneck, and quick shift. It is written in C for efficiency and compatibility, with interfaces in GNU octave for ease of use, and detailed documentation throughout . GNU Octave interface debian/rules0000755000000000000000000000537012264462776010273 0ustar #!/usr/bin/make -f # -*- makefile -*- # grab the version from the debian changelog VERSION := $(shell sed -n 's/.*(\([0-9\.]*[0-9]\).*).*/\1/;; p; q;' debian/changelog) # grab the API version from the library SONAME API_VERSION = $(shell objdump -p bin/*/libvl.so | perl -ne 'if(/^\s+SONAME\s+libvl.so./p) {print $${^POSTMATCH}; exit;}') %: dh $@ override_dh_auto_build: make MKOCTFILE=`which mkoctfile` VERB=1 CFLAGS+=-g all doc override_dh_auto_install: $(addprefix install/,data $(wildcard toolbox/*)) cp bin/*/libvl.so libvl.so.$(VERSION) ln -fs libvl.so.$(VERSION) libvl.so ln -fs libvl.so.$(VERSION) libvl.so.$(API_VERSION) override_dh_gencontrol: dh_gencontrol -- -V"octave:Depends=octave(>=`octave-config --print VERSION`)" override_dh_strip: strip_mex dh_strip --dbg-package=libvlfeat0-dbg override_dh_installdocs: dh_installdocs -Xbuild/ override_dh_auto_clean: dh_auto_clean rm -f libvl.so* # The rest is all for octave. There's some CDBS infrastructure to automate this, # but it's designed for octave-only source packages. I have both in one source, # so I can't use it include /usr/share/octave/debian/defs.make # I want to take all the *.m in toolbox/xxx/ for all xxx except mex and # noprefix. I want to take only some particular toolbox/*.m. There are many # other files strewn around that I want to ignore. This is somewhat # convoluted... OCTAVE_MPATH := debian/octave-vlfeat$(MDIR)/vlfeat/toolbox OCTAVE_BINPATH := debian/octave-vlfeat$(OCTDIR)/vlfeat/toolbox OCTAVE_PHONY_TARGETS := $(addprefix install/,data $(wildcard toolbox/*) toolbox/mex toolbox/noprefix) .PHONY: $(OCTAVE_PHONY_TARGETS) OCT_TARGET=$(@:install/%=%) $(addprefix install/toolbox/, vl_harris.m vl_help.m vl_root.m): install -d $(OCTAVE_MPATH) install -m 0644 $(OCT_TARGET) $(OCTAVE_MPATH) # installing the .mex files with executable bits set to let dh_shlibdeps index # them. I remove these bits as soon as dh_shlibdeps does its thing install/toolbox/mex: install -d $(OCTAVE_BINPATH) install -m 0755 $(OCT_TARGET)/*/*/*.mex $(OCTAVE_BINPATH) override_dh_shlibdeps: dh_shlibdeps chmod 0644 $(OCTAVE_BINPATH)/*.mex override_dh_compress: dh_compress -X.m $(filter-out %.m install/data install/toolbox/mex install/toolbox/noprefix,$(OCTAVE_PHONY_TARGETS)): if [ -d $(OCT_TARGET) ]; then \ install -d $(OCTAVE_MPATH); \ install -d $(OCTAVE_MPATH)/$(notdir $(OCT_TARGET)); \ install -m 0644 $(OCT_TARGET)/*.m $(OCTAVE_MPATH)/$(notdir $(OCT_TARGET)); \ fi install/data: install -d $(OCTAVE_MPATH)/../data install -m 0644 data/* $(OCTAVE_MPATH)/../data # dh_strip doesn't see the .mex files as needing stripping, so I do it myself .PHONY: strip_mex strip_mex: strip --remove-section=.comment --remove-section=.note --strip-unneeded $(OCTAVE_BINPATH)/*.mex debian/source/0000755000000000000000000000000012256126162010471 5ustar debian/source/format0000644000000000000000000000001412256126162011677 0ustar 3.0 (quilt) debian/README.source0000644000000000000000000000042012256126162011344 0ustar The SIFT implementation was removed from the source due to patent issues. References to it have been removed from the toplevel demo script (vl_demo.m) and the toplevel documentation file (index.html) -- Dima Kogan , Thu, 7 Nov 2013 17:30:40 -0800 debian/gbp.conf0000644000000000000000000000007112256126162010606 0ustar [DEFAULT] upstream-tag =v%(version)s pristine-tar = True debian/libvlfeat0.lintian-overrides0000644000000000000000000000034212256126162014600 0ustar # package has the full name of the project: vlfeat however upstream generally # calls their library "libvl.so". I want to be in-line with upstream, so I # retain this discrepancy libvlfeat0: package-name-doesnt-match-sonames debian/libvlfeat0.install0000755000000000000000000000007612256126162012617 0ustar #!/usr/bin/dh-exec libvl*.so.* usr/lib/${DEB_HOST_MULTIARCH} debian/watch0000644000000000000000000000021312256126162010216 0ustar version = 3 opts=dversionmangle=s/(?:\+dfsg|\+repack).*$// \ https://github.com/vlfeat/vlfeat/tags .*/vlfeat/archive/v(\d[\d\.]+).tar.gz