fix merge conflicts

debian/changelog

+parrot-interface (3.11+parrot2) testing; urgency=medium
+
+  * Import changes from git
+
+ -- Lorenzo "Palinuro" Faletra <palinuro@parrotsec.org>  Tue, 14 Feb 2017 13:08:13 +0100
+
 parrot-interface (3.11+parrot1) testing; urgency=medium
 
   * Include mate-applets
@@ -20,6 +26,19 @@ parrot-interface (3.10+parrot0) testing; urgency=medium
 
  -- Lisetta "Sheireen" Ferrero <sheireen@parrotsec.org>  Wed, 04 Jan 2017 15:03:49 +0300
 
+parrot-interface (3.10+parrot0) testing; urgency=medium
+
+  * replace kdm with lightdm-parrot
+  * add missing mate dependencies
+
+ -- Lorenzo "Palinuro" Faletra <palinuro@parrotsec.org>  Sat, 24 Dec 2016 01:01:30 +0100
+
+parrot-interface (3.9+parrot6) testing; urgency=medium
+
+  * include mate-applets and mate-sensors-applet
+
+ -- Lorenzo "Palinuro" Faletra <palinuro@parrotsec.org>  Wed, 21 Dec 2016 22:59:54 +0100
+
 parrot-interface (3.9+parrot5) testing; urgency=medium
 
   * Remove parrot-welcome (we need to rewrite it)

debian/control

 Source: parrot-interface
 Priority: optional
 Maintainer: Parrot Devel Team <parrot-devel@lists.parrotsec.org>
-Uploaders: Lorenzo "Palinuro" Faletra <palinuro@frozenbox.org>,
-           Lisetta "Sheireen" Ferrero <sheireen@frozenbox.org>
+Uploaders: Lorenzo "Palinuro" Faletra <palinuro@parrotsec.org>,
+           Lisetta "Sheireen" Ferrero <sheireen@parrotsec.org>
 Standards-Version: 3.9.8
 Section: info
 Build-Depends: debhelper (>= 9)
@@ -14,7 +14,7 @@ Architecture: all
 Depends: xinit, xorg, parrot-interface-common, parrot-mate | parrot-xfce | parrot-lxde | parrot-kde | parrot-gnome
 Suggests: parrot-interface-full
 Description: Parrot interface metapackage
- metapackage that installs the graphic interface selected by frozenbox dev team
+ metapackage that installs the graphic interface
 
 Package: parrot-interface-common
 Architecture: all
@@ -24,7 +24,7 @@ Suggests: parrot-interface-full
 Breaks: iceweasel-frozenmod
 Replaces: iceweasel-frozenmod, firefox-esr, firefox, iceweasel
 Description: Parrot interface metapackage
- metapackage that installs the graphic interface selected by frozenbox dev team
+ metapackage that installs the graphic interface
 
 Package: parrot-interface-full
 Architecture: all
@@ -42,7 +42,7 @@ Description: GNOME based Parrot desktop
 Package: parrot-kde
 Architecture: all
 Depends: parrot-interface-common, kde-plasma-desktop, plasma-desktop
-Recommends: task-kde-desktop, kdm
+Recommends: lightdm-parrot
 Description: KDE based Parrot desktop
  This metapackage installs a minimalistic KDE desktop on Parrot Security OS.
 
@@ -56,10 +56,10 @@ Description: LXDE based Parrot destop
 Package: parrot-mate
 Architecture: all
 Depends: mate-core, parrot-interface-common
-Recommends: atril, breeze-cursor-theme, caja-gksu, caja-image-converter, caja-open-terminal, caja-sendto, caja-share, caja, engrampa, eom, ffmpegthumbnailer, gnumeric, mate-applets, mate-indicator-applet, mate-media, mate-netspeed, mate-notification-daemon, mate-power-manager, mate-screensaver, mate-sensors-applet, mate-system-monitor, mate-system-tools, gtk3-engines-breeze, gtk3-engines-oxygen, mate-user-share, mate-utils, mozo, network-manager-gnome | wicd, pluma
+Recommends: atril, breeze-cursor-theme, caja-gksu, caja-image-converter, caja-open-terminal, caja-sendto, caja-share, caja, engrampa, eom, ffmpegthumbnailer, gnumeric, mate-applets, mate-applet-topmenu, mate-indicator-applet, mate-media, mate-menu, mate-netspeed, mate-notification-daemon, mate-optimus, mate-polkit-bin, mate-power-manager, mate-screensaver, mate-sensors-applet, mate-sensors-applet-nvidia, mate-system-monitor, mate-system-tools, mate-sensors-applet, mate-tweak, gtk3-engines-breeze, gtk3-engines-oxygen, mate-user-share, mate-utils, mozo, network-manager-gnome | wicd, pluma
 Suggests: parrot-interface-full
 Description: Parrot interface metapackage
- metapackage that installs the graphic interface selected by frozenbox dev team
+ metapackage that installs the graphic interface
 
 Package: parrot-xfce
 Architecture: all