[caja] 01/01: debian/changelog: New upstream release.

[Vangelis Mouhtsis]

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

gnugr-guest pushed a commit to branch parrotsec/testing
in repository caja.

commit 975168a73d37b89d1fa18c7fdf0f976c1c4fbb27
Merge: 64e56d7 524133b
Author: Vangelis Mouhtsis <vangelis at gnugr.org>
Date:   Thu Jun 22 14:07:02 2017 +0300

    debian/changelog: New upstream release.

 debian/caja.install                                |  1 -
 debian/changelog                                   | 39 ++++++++++++++++++++++
 debian/control                                     |  7 ++--
 debian/copyright                                   |  5 ---
 ...0000_do-not-show-property-browser-in-menu.patch | 24 -------------
 debian/patches/series                              |  1 -
 debian/rules                                       |  3 +-
 7 files changed, 45 insertions(+), 35 deletions(-)

diff --cc debian/changelog
index d6b24da,6c05f0c..f40d033
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,39 +1,47 @@@
++<<<<<<< HEAD
 +caja (1.18.0-1parrot0) testing; urgency=medium
 +
 +  * New upstream release.
 +
 + -- Vangelis Mouhtsis <gnugr at parrotsec.org>  Tue, 04 Apr 2017 21:35:14 +0300
++=======
+ caja (1.18.3-1) UNRELEASED; urgency=medium
+ 
+   [ Aron Xu ]
+   * New upstream release.
+ 
+   [ Martin Wimpress ]
+   * debian/control: Dependencies updated for MATE 1.17.
+   * debian/rules: Remove obsolete --with-gtk=3.0
+   * debian/caja.install: Remove obsolete usr/lib/caja/
+   * debian/copyright: Update copyright attributions.
+   * debian/control: Dependencies updated for MATE 1.18.
+   * 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.
+ 
+  -- Aron Xu <aron at debian.org>  Wed, 21 Jun 2017 20:15:08 +0800
+ 
+ caja (1.16.6-1) unstable; urgency=medium
+ 
+   * New upstream release. (Closes: #862155).
+   * Issues solved between 1.16.2 and 1.16.5:
+     - Caja's background and emblems dialog works again. (Closes: #828158).
+     - Add ability to get feedback from Orca when additional icons are
+       selected/deselected. (Closes: #757851).
+     - In icon and compact view, fix scrolling and renaming in large folders
+       (Closes: #836352, #826261).
+   * Issues solved between 1.16.5 and 1.16.6:
+     - Show correct right-click menu after making file/folder selection
+     - Make custom icons (like folder-color extension) work in list view
+     - Open With dialog: force icon size to avoid huge icons with GTK+3
+     - Load different CSS for desktop with GTK+ 3.14 (fixes black text
+       under desktop icons with some themes like Adwaita)
+   * debian/control:
+     + Versioned B-D bump of libmate-desktop-dev (to >= 1.16.2)
+ 
+  -- Mike Gabriel <sunweaver at debian.org>  Fri, 28 Apr 2017 22:41:10 +0200
++>>>>>>> master
  
  caja (1.16.2-2) unstable; urgency=medium
  
diff --cc debian/control
index fcabedf,17ef270..ae36f9e
--- a/debian/control
+++ b/debian/control
@@@ -19,6 -18,7 +19,10 @@@ Build-Depends: debhelper (>= 9)
                 libglib2.0-dev,
                 libgtk-3-dev,
                 libmate-desktop-dev (>= 1.18),
++<<<<<<< HEAD
++=======
+                libnotify-dev,
++>>>>>>> master
                 libpango1.0-dev,
                 libselinux1-dev [linux-any],
                 libstartup-notification0-dev,

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