[SCM] engrampa Debian package branch, wheezy-bpo, updated. debian/1.8.0+dfsg1+4-5-g6ac3a18

[Mike Gabriel]

Gitweb-URL: http://git.debian.org/?p=pkg-mate/engrampa.git;a=commitdiff;h=dcc2102

The following commit has been merged in the wheezy-bpo branch:
commit dcc210278fbf8cf231095e30d71d81d0a44a9a07
Merge: 6c7c052899297c65a822a89c9ea55b4371499762 61181895c74a106a18aac232f9e3fec89dbe1358
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Fri May 30 09:01:58 2014 +0200

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

 debian/changelog | 13 ++++++++++++-
 debian/control   |  3 ++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --cc debian/changelog
index 548d719,d7a50be..ad9b298
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,14 +1,20 @@@
- engrampa (1.8.0+dfsg1-3~bpo70+1) wheezy-backports; urgency=low
++engrampa (1.8.0+dfsg1-4~bpo70+1) UNRELEASED; urgency=low
 +
 +  * Upload to wheezy-backports.
 +
 + -- Mike Gabriel <sunweaver at debian.org>  Thu, 08 May 2014 01:10:22 +0200
 +
+ engrampa (1.8.0+dfsg1-4) unstable; urgency=low
+ 
+   [ Vangelis Mouhtsis ]
+   * debian/control:
+     + Add D (bin:package engrampa): caja-common. This issue is being addressed
+       upstream, with the goal that engrampa can run without caja components
+       installed. A removal of the dependency in a future package upload
+       is very likely. (Closes: #748194).
+ 
+  -- Mike Gabriel <sunweaver at debian.org>  Mon, 19 May 2014 09:00:39 +0200
+ 
  engrampa (1.8.0+dfsg1-3) unstable; urgency=low
  
    [ Mike Gabriel ]

-- 
engrampa Debian package