[SCM] caja Debian package branch, wheezy-bpo, updated. debian/1.8.1-2-3-gd87761b

[Mike Gabriel]

Gitweb-URL: http://git.debian.org/?p=pkg-mate/caja.git;a=commitdiff;h=49655e8

The following commit has been merged in the wheezy-bpo branch:
commit 49655e81dd6a05b4afc6ea1862bbcee14b603569
Merge: fa014f4041406289b41af037db91f18af3c54ba9 42749589af6dafd82a0b83a085902f99044f5a22
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Thu Jun 12 08:08:11 2014 +0200

    Merge branch 'master' into wheezy-bpo
    
    Conflicts (resolved by Mike Gabriel):
    	debian/changelog

 debian/changelog | 17 +++++++++++++++++
 debian/control   |  2 +-
 debian/rules     |  2 +-
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --cc debian/changelog
index e9e2355,7843ae7..fec8a9a
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,14 +1,26 @@@
++caja (1.8.1-2~bpo70+1) UNRELEASED; urgency=low
++
++  * Upload to wheezy-backports.
++
++ -- Mike Gabriel <sunweaver at debian.org>  Wed, 30 Apr 2014 15:57:42 +0200
++
+ caja (1.8.1-2) unstable; urgency=low
+ 
+   [ Vangelis Mouhtsis ]
+   * debian/rules:
+     + Replace on dh_install --list-missing -> --fail-missing.
+   * debian/control:
+     + Add [linux-any] in build-depends as needed to make package
+       build on non-Linux Debian variants. (Closes: #749490).
+ 
+  -- Mike Gabriel <sunweaver at debian.org>  Fri, 30 May 2014 13:22:08 +0200
+ 
 +caja (1.8.1-1~bpo70+1) wheezy-backports; urgency=low
 +
 +  * Upload to wheezy-backports.
 +
 + -- Mike Gabriel <sunweaver at debian.org>  Wed, 30 Apr 2014 15:57:42 +0200
 +
  caja (1.8.1-1) unstable; urgency=low
  
    * New upstream release.

-- 
caja Debian package