Merge branch 'development' into 'master'

hamara-packages/1.0/hamara-meta/debian/changelog

+hamara-meta (6.0-13) namaste; urgency=medium
+
+  * Added vinagre
+  * Added cheese
+
+ -- Hamara Master Signing Key (Master Key) <master@hamaralinux.org>  Fri, 20 Mar 2015 15:37:00 +0100
+
+
+
 hamara-meta (6.0-12) namaste; urgency=medium
 
   * Added gnome-core package

hamara-packages/1.0/hamara-meta/debian/control

@@ -26,7 +26,7 @@ Description: Hamara codecs metapackage
 Package: hamara-base
 Architecture: all
 Priority: optional
-Depends: bc, dc, dmraid, jfsutils, reiserfsprogs, reiser4progs, xfsprogs, libnss-mdns, laptop-detect, ssh, acpi-support, acpid, alsa-base, alsa-utils, anacron, avahi-daemon, avahi-autoipd, avahi-utils, ca-certificates, consolekit, doc-base, screen, aptitude, at, busybox-static, cpio, cron, dmidecode, dnsutils, dosfstools, ed, file, ftp, hdparm, info, iptables, language-selector-common, logrotate, lshw, lsof, ltrace, man-db, mime-support, parted, nano, pciutils, psmisc, rsync, strace, time, usbutils, wget, dvd+rw-tools, wireless-tools, pcmciautils, ecryptfs-utils, apparmor, apparmor-utils, mdadm, btrfs-tools, cryptsetup
+Depends: bc, dc, dmraid, jfsutils, reiserfsprogs, reiser4progs, xfsprogs, libnss-mdns, laptop-detect, ssh, acpi-support, acpid, alsa-base, alsa-utils, anacron, avahi-daemon, avahi-autoipd, avahi-utils, ca-certificates, consolekit, doc-base, screen, aptitude, at, busybox-static, cpio, cron, dmidecode, dnsutils, dosfstools, ed, file, ftp, hdparm, info, iptables, language-selector-common, logrotate, lshw, lsof, ltrace, man-db, mime-support, parted, nano, pciutils, psmisc, rsync, strace, time, usbutils, wget, dvd+rw-tools, wireless-tools, pcmciautils, ecryptfs-utils, apparmor, apparmor-utils, mdadm, btrfs-tools, cryptsetup, gcc
 Recommends: unzip, zip, beep, nmap, unp, debfoster, bash-completion, gddrescue, modemmanager, wvdial
 Description: Hamara base metapackage.
  Dependency list for Hamara base installation.
@@ -60,7 +60,7 @@ Description: Hamara base metapackage.
 Package: hamara
 Architecture: all
 Priority: optional
-Depends: casper, lupin-casper, grub-pc, aptdaemon, gdm, hamara-wallpapers, xorg, gnome-menus, alsa-base, alsa-utils, anacron, at-spi2-core, baobab, bc, brasero, bash-completion, ca-certificates, dconf-editor, eog, evince, file-roller, fonts-cantarell, fonts-dejavu-core, fonts-freefont-ttf, foomatic-db, gcr, gdm, gedit, genisoimage, ghostscript-x, gjs, gnome-calculator, gnome-color-manager, gnome-contacts, gnome-control-center, gnome-disk-utility, gnome-documents, gnome-font-viewer, gnome-icon-theme-extras, gnome-icon-theme-full, gnome-icon-theme-symbolic, gnome-keyring, gnome-menus, gnome-online-accounts, gnome-screenshot, gnome-session, gnome-settings-daemon, gnome-shell, gnome-shell-extensions, gnome-sushi, gnome-system-log, gnome-system-monitor, gnome-terminal, gnome-themes-standard, gnome-tweak-tool, gnome-video-effects, gnome-system-tools, gsettings-desktop-schemas, gstreamer0.10-alsa, gstreamer0.10-pulseaudio, gstreamer1.0-alsa, gstreamer1.0-pulseaudio, gucharmap, gvfs-backends-goa, gvfs-bin, inputattach, itstool, libatk-adaptor, libnotify-bin, libnss-myhostname, libpam-systemd, libsasl2-modules, libxp6, memtest86+, mutter, nautilus, nautilus-sendto, network-manager, openprinting-ppds, printer-driver-pnm2ppa, pulseaudio, rfkill, seahorse, simple-scan, software-properties-gtk, ssh-askpass-gnome, system-config-printer-gnome, tracker, ttf-ubuntu-font-family, source-sans-pro, ubuntu-drivers-common, hamara-keyring, hamara-gnome-default-settings, plymouth-theme-hamara-gnome-logo, plymouth-theme-hamara-gnome-text, ubuntu-release-upgrader-gtk, unzip, update-manager, update-notifier, vino, wireless-tools, wpasupplicant, xdg-user-dirs, xdg-user-dirs-gtk, xdiagnose, xkb-data, xorg, yelp, yelp-tools, yelp-xsl, zenity, zip, zsync, synaptic, lvm2, gnome-core, cups-pk-helper, openjdk-7-jre 
+Depends: casper, lupin-casper, grub-pc, aptdaemon, gdm, hamara-wallpapers, xorg, gnome-menus, alsa-base, alsa-utils, anacron, at-spi2-core, baobab, bc, brasero, bash-completion, ca-certificates, dconf-editor, eog, evince, file-roller, fonts-cantarell, fonts-dejavu-core, fonts-freefont-ttf, foomatic-db, gcr, gdm, gedit, genisoimage, ghostscript-x, gjs, gnome-calculator, gnome-color-manager, gnome-contacts, gnome-control-center, gnome-disk-utility, gnome-documents, gnome-font-viewer, gnome-icon-theme-extras, gnome-icon-theme-full, gnome-icon-theme-symbolic, gnome-keyring, gnome-menus, gnome-online-accounts, gnome-screenshot, gnome-session, gnome-settings-daemon, gnome-shell, gnome-shell-extensions, gnome-sushi, gnome-system-log, gnome-system-monitor, gnome-terminal, gnome-themes-standard, gnome-tweak-tool, gnome-video-effects, gnome-system-tools, gsettings-desktop-schemas, gstreamer0.10-alsa, gstreamer0.10-pulseaudio, gstreamer1.0-alsa, gstreamer1.0-pulseaudio, gucharmap, gvfs-backends-goa, gvfs-bin, inputattach, itstool, libatk-adaptor, libnotify-bin, libnss-myhostname, libpam-systemd, libsasl2-modules, libxp6, memtest86+, mutter, nautilus, nautilus-sendto, network-manager, openprinting-ppds, printer-driver-pnm2ppa, pulseaudio, rfkill, seahorse, simple-scan, software-properties-gtk, ssh-askpass-gnome, system-config-printer-gnome, tracker, ttf-ubuntu-font-family, source-sans-pro, ubuntu-drivers-common, hamara-keyring, hamara-gnome-default-settings, plymouth-theme-hamara-gnome-logo, plymouth-theme-hamara-gnome-text, ubuntu-release-upgrader-gtk, unzip, update-manager, update-notifier, vino, wireless-tools, wpasupplicant, xdg-user-dirs, xdg-user-dirs-gtk, xdiagnose, xkb-data, xorg, yelp, yelp-tools, yelp-xsl, zenity, zip, zsync, synaptic, lvm2, gnome-core, cups-pk-helper, openjdk-7-jre, vinagre, cheese
 Recommends: samba, vino, nautilus-open-terminal, gnome-screensaver, libreoffice-style-galaxy, libreoffice-style-tango, libreoffice-gnome, libreoffice-calc, libreoffice-impress, libreoffice-writer, bogofilter, totem, totem-mozilla, totem-plugins, pitivi, bluez, bluez-cups, bluez-alsa, bluez-gstreamer, evolution, evolution-plugins, evolution-indicator, gvfs-bin, espeak, espeak-data, inputattach, mousetweaks, usb-creator-gtk, ooo-thumbnailer, seahorse, ssh-askpass-gnome, gnome-session-canberra, libcanberra-pulse, mozilla-plugin-gnash, gucharmap, evince, file-roller, gcalctool, brasero, brasero-cdrkit, transmission-gtk, simple-scan, oggconvert, aisleriot, gnome-sudoku, gnomine, liferea, plymouth-theme-hamara-logo, plymouth-theme-hamara-text, gthumb, pidgin, pidgin-plugin-pack, pidgin-libnotify, deja-dup, python-indicate, python-libproxy, gnome-orca, libgail-3-0, libgail-common, gnome-accessibility-themes, at-spi2-core, libglib2.0-bin, gnome-accessibility-themes, libatk-adaptor, onboard, python-gobject-cairo, gimp, rhythmbox-mozilla, rhythmbox-plugin-cdrecorder, rhythmbox-plugins, python-mako
 Suggests: casper, ubiquity, grub-pc, ubiquity-frontend-gtk, gparted, language-pack-en, language-pack-es, language-pack-gnome-en, language-pack-gnome-es, libreoffice-l10n-es, libreoffice-help-es, libreoffice-help-en-us, hyphen-en-us, mythes-en-us, lupin-casper, ubiquity-slideshow-hamara, aspell, aspell-en, aspell-es, dictionaries-common, language-pack-en, language-pack-en-base, language-pack-gnome-en, language-pack-gnome-en-base, wamerican, wbritish, wspanish
 Description: Hamara meta package (desktop edition)

hamara-packages/changelog.sh

 #!/bin/sh
 
-export DEBEMAIL=trisquel-devel@listas.trisquel.info
-export DEBFULLNAME="Trisquel GNU/Linux developers"
+export DEBEMAIL=master@hamaralinux.org
+export DEBFULLNAME="Hamara Master Signing Key (Master Key)"
 
 CURRENTVERSION=$(head -n1 debian/changelog|sed 's/.*(//g; s/).*//g'|awk -F '-' '{print $1}')
 CURRENTSUBVERSION=$(head -n1 debian/changelog|sed 's/.*(//g; s/).*//g'|awk -F '-' '{print $2}')