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

Mike Gabriel sunweaver at debian.org
Sun Jan 3 08:14:43 UTC 2016


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

sunweaver pushed a commit to branch master
in repository caja-dropbox.

commit 47c08d1ee1da236aceda43d2efda605272cc4582
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sat Jan 2 12:15:58 2016 +0100

    debian/patches: Drop 0001_adjust-caja-ext-dir.patch. Applied upstream.
---
 debian/changelog                              | 12 ++----------
 debian/patches/0001_adjust-caja-ext-dir.patch | 21 ---------------------
 debian/patches/series                         |  1 -
 3 files changed, 2 insertions(+), 32 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5063f19..87140a4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,14 +1,6 @@
-caja-dropbox (1.10.0-1) UNRELEASED; urgency=medium
+caja-dropbox (1.12.0-1) unstable; urgency=medium
 
   [ Vangelis Mouhtsis ]
   * Initial release. (Closes: #761901).
 
-  [ Martin Wimpress ]
-  * debian/source:
-    + Drop lintian-overrides, no longer relevant.
-  * debian/patches:
-    + Correct typo in series.
-
- -- Vangelis Mouhtsis <vangelis at gnugr.org>  Sat, 20 Sep 2014 17:35:17 +0300
-
-
+ -- Mike Gabriel <sunweaver at debian.org>  Sat, 02 Jan 2016 12:14:23 +0100
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

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



More information about the pkg-mate-commits mailing list