[caja] 10/10: Merge branch 'master' of ssh://git.debian.org/git/pkg-mate/caja

[Vangelis Mouhtsis]

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

gnugr-guest pushed a commit to branch master
in repository caja.

commit 36b844c0a1b65f776cff55f2feca04111f10adbd
Merge: 97934a0 5584a01
Author: Vangelis Mouhtsis <vangelis at gnugr.org>
Date:   Mon Jul 24 16:31:41 2017 +0300

    Merge branch 'master' of ssh://git.debian.org/git/pkg-mate/caja

 debian/changelog | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --cc debian/changelog
index 7168890,fede101..62f2338
--- a/debian/changelog
+++ b/debian/changelog
@@@ -9,22 -9,13 +9,24 @@@ caja (1.18.3-0parrot1) testing; urgency
    * debian/caja.install: Remove obsolete usr/lib/caja/
    * debian/copyright: Update copyright attributions.
    * debian/control: Dependencies updated for MATE 1.18.
+   * debian/control: Drop dependency on libunique3 (Closes: #827234)
    * debian/patches: Add 0001_return_custom_icons.patch.
    * debian/patches: Drop 0001_return_custom_icons.patch. Applied upstream.
-   * debian/patches: Drop 0000_do-not-show-property-browser-in-menu.patch. Obsolete.
+   * debian/patches: Drop 0000_do-not-show-property-browser-in-menu.patch.
+     Obsolete.
  
 - -- Aron Xu <aron at debian.org>  Wed, 21 Jun 2017 20:15:08 +0800
 +  [ Vangelis Mouhtsis ]
 +  * New upstream release.
 +  * debian/compat:
 +    + Update compat version.
 +  * debian/control:
 +    + Bump debhelper version to (>= 10.3~).
 +  * debian/rules:
 +    + Add new block for override_dh_missing.
 +  * debian/control:
 +    + Bump Standards-Version: to 4.0.0. No changes needed.
 +
 + -- Vangelis Mouhtsis <vangelis at gnugr.org>  Fri, 30 Jun 2017 10:45:40 +0300
  
  caja (1.16.6-1) unstable; urgency=medium
  

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