[caja-dropbox] 03/04: debian/patches: Drop 0001_adjust-caja-ext-dir.patch. Applied upstream.

[Martin Wimpress]

This is an automated email from the git hooks/post-receive script.

flexiondotorg-guest pushed a commit to branch debian/experimental
in repository caja-dropbox.

commit 627b77127656796a40ebef3a2f2342bfe1baea26
Author: Martin Wimpress <code at flexion.org>
Date:   Tue Nov 10 01:16:18 2015 +0000

    debian/patches: Drop 0001_adjust-caja-ext-dir.patch. Applied upstream.
---
 debian/patches/0001_adjust-caja-ext-dir.patch | 21 ---------------------
 debian/patches/series                         |  1 -
 debian/rules                                  |  6 ++++--
 3 files changed, 4 insertions(+), 24 deletions(-)

diff --git a/debian/patches/0001_adjust-caja-ext-dir.patch b/debian/patches/0001_adjust-caja-ext-dir.patch
deleted file mode 100644
index 3848623..0000000
--- a/debian/patches/0001_adjust-caja-ext-dir.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From cb83ff2b71f4cfc5ddc3719fb7c7cc4b806b7eda Mon Sep 17 00:00:00 2001
-From: Monsta <monsta at inbox.ru>
-Date: Sun, 14 Jun 2015 15:53:14 +0000
-Subject: adjust the default caja extensions dir
-
----
-diff --git a/configure.ac b/configure.ac
-index a0ac406..970326e 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -88,7 +88,7 @@ else
-     CAJA_EXTENSION_DIR=`$PKG_CONFIG --variable=extensiondir libcaja-extension`
- fi
- if test -z "$CAJA_EXTENSION_DIR"; then
--    CAJA_EXTENSION_DIR='${exec_prefix}/lib/caja/extension-1.0'
-+    CAJA_EXTENSION_DIR='${exec_prefix}/lib/caja/extensions-2.0'
- fi
- 
- AC_MSG_RESULT([${CAJA_EXTENSION_DIR}])
---
-cgit 
diff --git a/debian/patches/series b/debian/patches/series
index 248b488..2457b86 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-0001_adjust-caja-ext-dir.patch
 1001_unlink-before-extract.patch
 1002_do-not-hardcode-dropboxd-path.patch
 1003_dropbox-update.patch
diff --git a/debian/rules b/debian/rules
index e729ed4..f32ace8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,13 +8,15 @@ DHFLAGS=--parallel
 override_dh_auto_configure:
 	NOCONFIGURE=1 ./autogen.sh
 	dh_auto_configure $(DHFLAGS) -- \
-	                             --disable-silent-rules
+		--disable-static \
+		--disable-silent-rules
 
 override_dh_makeshlibs:
 	# Don't generate a shlibs file for the plugin
 	dh_makeshlibs -X/usr/lib/caja/
 
-override_dh_install:
+override_dh_auto_install:
+	dh_auto_install
 	# Drop useless files
 	rm -f debian/caja-dropbox/usr/lib/*/caja/extensions-*/libcaja-dropbox.a
 	rm -f debian/caja-dropbox/usr/lib/*/caja/extensions-*/libcaja-dropbox.la

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mate/caja-dropbox.git