Commit 619f7b90 authored by Lorenzo "Palinuro" Faletra's avatar Lorenzo "Palinuro" Faletra
Browse files

fix merge conflicts

parents 29299c22 903a8a36
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 parrot-interface (3.11+parrot1) testing; urgency=medium
* Include mate-applets * Include mate-applets
...@@ -20,6 +26,19 @@ parrot-interface (3.10+parrot0) testing; urgency=medium ...@@ -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 -- 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 parrot-interface (3.9+parrot5) testing; urgency=medium
* Remove parrot-welcome (we need to rewrite it) * Remove parrot-welcome (we need to rewrite it)
......
Source: parrot-interface Source: parrot-interface
Priority: optional Priority: optional
Maintainer: Parrot Devel Team <parrot-devel@lists.parrotsec.org> Maintainer: Parrot Devel Team <parrot-devel@lists.parrotsec.org>
Uploaders: Lorenzo "Palinuro" Faletra <palinuro@frozenbox.org>, Uploaders: Lorenzo "Palinuro" Faletra <palinuro@parrotsec.org>,
Lisetta "Sheireen" Ferrero <sheireen@frozenbox.org> Lisetta "Sheireen" Ferrero <sheireen@parrotsec.org>
Standards-Version: 3.9.8 Standards-Version: 3.9.8
Section: info Section: info
Build-Depends: debhelper (>= 9) Build-Depends: debhelper (>= 9)
...@@ -14,7 +14,7 @@ Architecture: all ...@@ -14,7 +14,7 @@ Architecture: all
Depends: xinit, xorg, parrot-interface-common, parrot-mate | parrot-xfce | parrot-lxde | parrot-kde | parrot-gnome Depends: xinit, xorg, parrot-interface-common, parrot-mate | parrot-xfce | parrot-lxde | parrot-kde | parrot-gnome
Suggests: parrot-interface-full Suggests: parrot-interface-full
Description: Parrot interface metapackage 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 Package: parrot-interface-common
Architecture: all Architecture: all
...@@ -24,7 +24,7 @@ Suggests: parrot-interface-full ...@@ -24,7 +24,7 @@ Suggests: parrot-interface-full
Breaks: iceweasel-frozenmod Breaks: iceweasel-frozenmod
Replaces: iceweasel-frozenmod, firefox-esr, firefox, iceweasel Replaces: iceweasel-frozenmod, firefox-esr, firefox, iceweasel
Description: Parrot interface metapackage 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 Package: parrot-interface-full
Architecture: all Architecture: all
...@@ -42,7 +42,7 @@ Description: GNOME based Parrot desktop ...@@ -42,7 +42,7 @@ Description: GNOME based Parrot desktop
Package: parrot-kde Package: parrot-kde
Architecture: all Architecture: all
Depends: parrot-interface-common, kde-plasma-desktop, plasma-desktop Depends: parrot-interface-common, kde-plasma-desktop, plasma-desktop
Recommends: task-kde-desktop, kdm Recommends: lightdm-parrot
Description: KDE based Parrot desktop Description: KDE based Parrot desktop
This metapackage installs a minimalistic KDE desktop on Parrot Security OS. This metapackage installs a minimalistic KDE desktop on Parrot Security OS.
...@@ -56,10 +56,10 @@ Description: LXDE based Parrot destop ...@@ -56,10 +56,10 @@ Description: LXDE based Parrot destop
Package: parrot-mate Package: parrot-mate
Architecture: all Architecture: all
Depends: mate-core, parrot-interface-common 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 Suggests: parrot-interface-full
Description: Parrot interface metapackage Description: Parrot interface metapackage
metapackage that installs the graphic interface selected by frozenbox dev team metapackage that installs the graphic interface
Package: parrot-xfce Package: parrot-xfce
Architecture: all Architecture: all
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment