[vlfeat] 44/44: patch rebase
Dima Kogan
dima at secretsauce.net
Wed Sep 16 21:05:34 UTC 2015
This is an automated email from the git hooks/post-receive script.
dkogan-guest pushed a commit to branch master
in repository vlfeat.
commit 981f66a73ac443953c89de1a454a1199cdf7ab4f
Author: Dima Kogan <dima at secretsauce.net>
Date: Mon Aug 31 00:20:58 2015 -0700
patch rebase
---
...po-in-the-Makefile-using-default-CPPFLAGS.patch | 2 +-
...0002-removed-bogus-commas-in-the-Makefile.patch | 28 ++++-----------
...0007-removed-architecture-detection-logic.patch | 42 +++++++++++++++-------
...gle-adsense-and-google-analytics-from-the.patch | 41 ++++++++-------------
...SE2-and-AVX-to-work-on-Debian-s-wide-arra.patch | 2 +-
debian/patches/0013-removed-stray-html-tag.patch | 21 +++++++++++
debian/patches/series | 1 +
7 files changed, 76 insertions(+), 61 deletions(-)
diff --git a/debian/patches/0001-Fixed-a-typo-in-the-Makefile-using-default-CPPFLAGS.patch b/debian/patches/0001-Fixed-a-typo-in-the-Makefile-using-default-CPPFLAGS.patch
index d09f8a0..309db03 100644
--- a/debian/patches/0001-Fixed-a-typo-in-the-Makefile-using-default-CPPFLAGS.patch
+++ b/debian/patches/0001-Fixed-a-typo-in-the-Makefile-using-default-CPPFLAGS.patch
@@ -7,7 +7,7 @@ Subject: Fixed a typo in the Makefile, using default CPPFLAGS
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
-index 9b6b7ec..12b14ed 100644
+index 9f0655a..8322467 100644
--- a/Makefile
+++ b/Makefile
@@ -150,7 +150,7 @@ endif
diff --git a/debian/patches/0002-removed-bogus-commas-in-the-Makefile.patch b/debian/patches/0002-removed-bogus-commas-in-the-Makefile.patch
index 0191762..3615746 100644
--- a/debian/patches/0002-removed-bogus-commas-in-the-Makefile.patch
+++ b/debian/patches/0002-removed-bogus-commas-in-the-Makefile.patch
@@ -3,28 +3,14 @@ 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(-)
+ 6 files changed, 14 insertions(+), 14 deletions(-)
-diff --git a/Makefile b/Makefile
-index 12b14ed..afe6b57 100644
---- a/Makefile
-+++ b/Makefile
-@@ -324,7 +324,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 81c878b..9e73f29 100644
--- a/make/bin.mak
@@ -89,23 +75,23 @@ index 22c3039..4732b64 100644
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 88f5ab9..c64a2b4 100644
+index ce3ac9b..d6bf0de 100644
--- a/make/doc.mak
+++ b/make/doc.mak
-@@ -287,7 +287,7 @@ doc/index.html: $(webdoc_src) $(doc-dir) \
+@@ -299,7 +299,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
+ no_dep_targets += doc-clean doc-archclean doc-distclean
VERSION: vl/generic.h
diff --git a/make/matlab.mak b/make/matlab.mak
-index d9a6a73..5550ce4 100644
+index 4dde699..f6e6fe0 100644
--- a/make/matlab.mak
+++ b/make/matlab.mak
-@@ -172,8 +172,8 @@ endif
+@@ -210,8 +210,8 @@ endif
# Build
# --------------------------------------------------------------------
@@ -116,7 +102,7 @@ index d9a6a73..5550ce4 100644
no_dep_targets += mex-dir mex-info mex-test
no_dep_targets += mex-clean mex-distclean mex-archclean
-@@ -288,8 +288,8 @@ m_lnk += $(addprefix toolbox/noprefix/, \
+@@ -324,8 +324,8 @@ m_lnk += $(addprefix toolbox/noprefix/, \
vpath vl_%.m $(shell find $(VLDIR)/toolbox -type d)
diff --git a/debian/patches/0007-removed-architecture-detection-logic.patch b/debian/patches/0007-removed-architecture-detection-logic.patch
index 111ffba..a541137 100644
--- a/debian/patches/0007-removed-architecture-detection-logic.patch
+++ b/debian/patches/0007-removed-architecture-detection-logic.patch
@@ -8,12 +8,12 @@ detection was seeing a 64-bit system for some reason
Makefile | 64 ++++-----------------------------------------------------
make/bin.mak | 18 ----------------
make/dll.mak | 22 --------------------
- make/matlab.mak | 51 ---------------------------------------------
+ make/matlab.mak | 62 -------------------------------------------------------
make/octave.mak | 8 --------
- 5 files changed, 4 insertions(+), 159 deletions(-)
+ 5 files changed, 4 insertions(+), 170 deletions(-)
diff --git a/Makefile b/Makefile
-index afe6b57..4fc9531 100644
+index 8322467..2f23c6f 100644
--- a/Makefile
+++ b/Makefile
@@ -105,12 +105,6 @@ all:
@@ -103,7 +103,7 @@ index afe6b57..4fc9531 100644
# --------------------------------------------------------------------
# Functions
-@@ -344,7 +289,6 @@ info:
+@@ -348,7 +293,6 @@ info:
$(call echo-var,PROFILE)
$(call echo-var,DEBUG)
$(call echo-var,VER)
@@ -175,16 +175,37 @@ index 772946e..80c3ef5 100644
# --------------------------------------------------------------------
# Build
diff --git a/make/matlab.mak b/make/matlab.mak
-index 5550ce4..be899bc 100644
+index f6e6fe0..e4d6ebf 100644
--- a/make/matlab.mak
+++ b/make/matlab.mak
-@@ -97,60 +97,9 @@ $(if $(VERB),-v,) \
+@@ -43,21 +43,7 @@ info: mex-info matlab-info
+ # Obtain MATLAB version
+ # --------------------------------------------------------------------
+
+-ifeq ($(ARCH),maci)
+-MEX_SUFFIX := mexmaci
+-endif
+-
+-ifeq ($(ARCH),maci64)
+-MEX_SUFFIX := mexmaci64
+-endif
+-
+-ifeq ($(ARCH),glnx86)
+ MEX_SUFFIX := mexglx
+-endif
+-
+-ifeq ($(ARCH),glnxa64)
+-MEX_SUFFIX := mexa64
+-endif
+
+ MEX_BINDIR := toolbox/mex/$(MEX_SUFFIX)
+
+@@ -141,56 +127,8 @@ $(if $(VERB),-v,) \
$(if $(DEBUG),-g,-O) \
$(if $(PROFILE),-g -O,)
-# Mac OS X on Intel 32 bit processor
-ifeq ($(ARCH),maci)
--MEX_SUFFIX := mexmaci
-MEX_FLAGS += CC='$(CC)'
-MEX_FLAGS += LD='$(CC)'
-# a hack to support recent Xcode/clang/GCC versions on old MATLABs
@@ -204,7 +225,6 @@ index 5550ce4..be899bc 100644
-
-# Mac OS X on Intel 64 bit processor
-ifeq ($(ARCH),maci64)
--MEX_SUFFIX := mexmaci64
-MEX_FLAGS += -largeArrayDims
-MEX_FLAGS += CC='$(CC)'
-MEX_FLAGS += LD='$(CC)'
@@ -224,21 +244,19 @@ index 5550ce4..be899bc 100644
-
-# Linux on 32 bit processor
-ifeq ($(ARCH),glnx86)
- MEX_SUFFIX := mexglx
MEX_FLAGS += CFLAGS='$$CFLAGS $(call escape,$(STD_CFLAGS))'
MEX_FLAGS += LDFLAGS='$$LDFLAGS $(call escape,$(STD_LDFLAGS))'
-endif
-
-# Linux on 64 bit processorm
-ifeq ($(ARCH),glnxa64)
--MEX_SUFFIX := mexa64
-MEX_FLAGS += -largeArrayDims
-MEX_FLAGS += CFLAGS='$$CFLAGS $(call escape,$(STD_CFLAGS))'
-MEX_FLAGS += LDFLAGS='$$LDFLAGS $(call escape,$(STD_LDFLAGS))'
-endif
- MEX_BINDIR := toolbox/mex/$(MEX_SUFFIX)
-
+ # For efficiency reasons, immediately expand this variable once
+ MEX_FLAGS := $(MEX_FLAGS)
diff --git a/make/octave.mak b/make/octave.mak
index 4939c4d..8cb42db 100644
--- a/make/octave.mak
diff --git a/debian/patches/0008-Removed-google-adsense-and-google-analytics-from-the.patch b/debian/patches/0008-Removed-google-adsense-and-google-analytics-from-the.patch
index 8057d3e..9d11cff 100644
--- a/debian/patches/0008-Removed-google-adsense-and-google-analytics-from-the.patch
+++ b/debian/patches/0008-Removed-google-adsense-and-google-analytics-from-the.patch
@@ -1,32 +1,29 @@
From: Dima Kogan <dima at secretsauce.net>
Date: Sun, 22 Dec 2013 12:47:04 -0800
Subject: Removed google adsense and google analytics from the docs
-Last-Update: 2014-11-13 (Anton Gladky <gladk at debian.org>)
This violated the user's privacy:
http://lintian.debian.org/tags/privacy-breach-google-adsense.html
---
- docsrc/vlfeat-website-template.xml | 33 ---------------------------------
- 1 file changed, 33 deletions(-)
+ docsrc/vlfeat-website-template.xml | 37 -------------------------------------
+ 1 file changed, 37 deletions(-)
-Index: vlfeat-0.9.19+dfsg0/docsrc/vlfeat-website-template.xml
-===================================================================
---- vlfeat-0.9.19+dfsg0.orig/docsrc/vlfeat-website-template.xml
-+++ vlfeat-0.9.19+dfsg0/docsrc/vlfeat-website-template.xml
-@@ -52,45 +52,10 @@
- }
- });
+diff --git a/docsrc/vlfeat-website-template.xml b/docsrc/vlfeat-website-template.xml
+index 57b378f..dd65ca0 100644
+--- a/docsrc/vlfeat-website-template.xml
++++ b/docsrc/vlfeat-website-template.xml
+@@ -54,47 +54,10 @@
</script>
-- <script type="text/javascript"
-- src="http://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML"/>
+ <script type="text/javascript"
+ src="http://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML"/>
-
- <!-- Google Custom Search -->
- <script>
- (function() {
- var cx = '003215582122030917471:oq23albfeam';
- var gcse = document.createElement('script'); gcse.type = 'text/javascript'; gcse.async = true;
-- gcse.src = (document.location.protocol == 'https:' ? 'https:' : 'http:') +
+- gcse.src = (document.location.protocol == 'https' ? 'https:' : 'http:') +
- '//www.google.com/cse/cse.js?cx=' + cx;
- var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(gcse, s);
- })();
@@ -50,7 +47,11 @@ Index: vlfeat-0.9.19+dfsg0/docsrc/vlfeat-website-template.xml
- <div id="header-section">
- <div id="header">
- <!-- Google CSE Search Box -->
-- <div class="gcse-searchbox-only" id="google" data-resultsUrl="http://www.vlfeat.org/search.html"></div>
+- <div class="searchbox">
+- <gcse:searchbox-only resultsUrl="http://www.vlfeat.org/search.html"
+- autoCompleteMaxCompletions="5"
+- autoCompleteMatchType="any"/>
+- </div>
- <h1><a class="plain" href="%pathto:home;"><span id="vlfeat">VLFeat</span><span id="dotorg">.org</span></a></h1>
- </div>
- <div id="sidebar"> <!-- Navigation Start -->
@@ -60,15 +61,3 @@ Index: vlfeat-0.9.19+dfsg0/docsrc/vlfeat-website-template.xml
<div id="headbanner-section">
<div id="headbanner">
%path;
-Index: vlfeat-0.9.19+dfsg0/docsrc/doxygen.conf
-===================================================================
---- vlfeat-0.9.19+dfsg0.orig/docsrc/doxygen.conf
-+++ vlfeat-0.9.19+dfsg0/docsrc/doxygen.conf
-@@ -1428,7 +1428,6 @@ MATHJAX_FORMAT = HTML-CSS
- # Content Delivery Network so you can quickly see the result without installing
- # MathJax. However, it is strongly recommended to install a local copy of
- # MathJax from http://www.mathjax.org before deployment.
--# The default value is: http://cdn.mathjax.org/mathjax/latest.
- # This tag requires that the tag USE_MATHJAX is set to YES.
-
- MATHJAX_RELPATH = http://www.mathjax.org/mathjax
diff --git a/debian/patches/0009-I-disable-SSE2-and-AVX-to-work-on-Debian-s-wide-arra.patch b/debian/patches/0009-I-disable-SSE2-and-AVX-to-work-on-Debian-s-wide-arra.patch
index 59557d0..a78e361 100644
--- a/debian/patches/0009-I-disable-SSE2-and-AVX-to-work-on-Debian-s-wide-arra.patch
+++ b/debian/patches/0009-I-disable-SSE2-and-AVX-to-work-on-Debian-s-wide-arra.patch
@@ -7,7 +7,7 @@ Subject: I disable SSE2 and AVX to work on Debian's wide array of arches
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Makefile b/Makefile
-index 4fc9531..fd061d6 100644
+index 2f23c6f..953d040 100644
--- a/Makefile
+++ b/Makefile
@@ -96,8 +96,8 @@ SHELL = /bin/bash
diff --git a/debian/patches/0013-removed-stray-html-tag.patch b/debian/patches/0013-removed-stray-html-tag.patch
new file mode 100644
index 0000000..d88d397
--- /dev/null
+++ b/debian/patches/0013-removed-stray-html-tag.patch
@@ -0,0 +1,21 @@
+From: Dima Kogan <dima at secretsauce.net>
+Date: Tue, 15 Sep 2015 15:21:08 -0700
+Subject: removed stray html tag
+
+---
+ docsrc/tutorials/encode.html | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/docsrc/tutorials/encode.html b/docsrc/tutorials/encode.html
+index bdd8f8c..da0a2d7 100644
+--- a/docsrc/tutorials/encode.html
++++ b/docsrc/tutorials/encode.html
+@@ -11,7 +11,7 @@ interface.</p>
+
+ <p>These encoding serve a similar purposes: summarizing in a vectorial
+ statistic a number of local feature descriptors
+-(e.g. SIFT</a>). Similarly to bag of visual
++(e.g. SIFT). Similarly to bag of visual
+ words, they assign local descriptor to elements in a visual
+ dictionary, obtained with vector quantization (KMeans) in the case of
+ VLAD or a Gaussian Mixture Models for Fisher
diff --git a/debian/patches/series b/debian/patches/series
index 4051855..468a5b0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,3 +10,4 @@
0010-I-no-longer-try-to-generate-x86-specific-code-on-non.patch
0011-Handling-new-target-of-mkoctfile-M-.-Closes-756222.patch
0012-octave-mex-compiler-now-looks-for-headers-in.patch
+0013-removed-stray-html-tag.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/vlfeat.git
More information about the debian-science-commits
mailing list