debian packaging: always require -gnome3 for unity integration

packaging/build_deb.sh

@@ -62,4 +62,4 @@ mkdir -p "$DIST"
 cp -a -t "$DIST" ../solaar_$VERSION*
 cp -a -t "$DIST" ../solaar-*_$VERSION* || true
 cd "$DIST"
-cp -av -t ../../../packages/ * || true
+#cp -av -t ../../../packages/ * || true

packaging/build_ppa.sh

@@ -8,7 +8,5 @@ DISTRIBUTION=ubuntu
 DIST_RELEASE=precise
 DEBIAN_FILES_EXTRA="$PWD/packaging/ubuntu"
 BUILD_EXTRA=ppa1
-DEBUILD_ARGS="-S -sa"
+DEBUILD_ARGS="-sa $@"
 . packaging/build_deb.sh
-
-dput solaar-snapshots-ppa solaar_*_source.changes

packaging/debian/changelog

@@ -1,6 +1,6 @@
-solaar (0.8.8.2-7) UNRELEASED; urgency=low
+solaar (0.8.9.2-3) UNRELEASED; urgency=low
 
   * Debian packaging scripts, supports ubuntu ppa as well.
 
- -- Daniel Pavel <daniel.pavel@gmail.com>  Mon, 20 May 2013 16:24:25 +0300
+ -- Daniel Pavel <daniel.pavel@gmail.com>  Thu, 06 Jun 2013 10:51:10 +0200
 

packaging/debian/control

@@ -15,9 +15,9 @@ Package: solaar
 Architecture: all
 Depends: ${misc:Depends}, udev (>= 175), passwd | adduser,
  ${python:Depends}, python-pyudev (>= 0.13), python-gi (>= 3.2), gir1.2-gtk-3.0 (>= 3.4),
- ${DesktopIconTheme}, ${DistroDepends}
-Recommends: gir1.2-notify-0.7, ${DistroRecommends}
-Suggests: ${DistroSuggests}
+ ${DesktopIconTheme}
+Recommends: gir1.2-notify-0.7
+Suggests: solaar-gnome3 (= ${source:Version})
 Description: Logitech Unifying Receiver peripherals manager for Linux
  Solaar is a Linux device manager for Logitech's Unifying Receiver peripherals.
  It is able to pair/unpair devices to the receiver, and for some devices read
@@ -27,7 +27,8 @@ Package: solaar-gnome3
 Architecture: all
 Section: gnome
 Depends: ${misc:Depends}, solaar (= ${source:Version}),
- gir1.2-appindicator3-0.1, gnome-shell (>= 3.4) | unity (>= 5.10)
+ gir1.2-appindicator3-0.1, gnome-shell (>= 3.4) | unity (>= 5.10),
+ ${GnomeIconTheme}
 Enhances: solaar
 Description: gnome-shell/Unity integration for Solaar
  Solaar is a Linux device manager for Logitech's Unifying Receiver peripherals.

packaging/debian/substvars.extra

@@ -1,4 +1,2 @@
 DesktopIconTheme=gnome-icon-theme | oxygen-icon-theme
-DistroDepends=
-DistroRecommends=
-DistroSuggests=gir1.2-appindicator3-0.1
+GnomeIconTheme=gnome-icon-theme

packaging/ubuntu/substvars.extra

@@ -1,4 +1,2 @@
 DesktopIconTheme=gnome-icon-theme-full | oxygen-icon-theme-complete
-DistroDepends=gir1.2-appindicator3-0.1, gnome-shell (>= 3.4) | unity (>= 5.10)
-DistroRecommends=
-DistroSuggests=
+GnomeIconTheme=gnome-icon-theme-full

packaging/upload_ppa.sh

@@ -0,0 +1,9 @@
+#!/bin/sh
+
+set -e
+
+cd "$(dirname "$0")"
+
+./build_ppa.sh -S
+
+dput solaar-snapshots-ppa solaar_*_source.changes