From 2b1f0e8a90ac7bcf7a64edd4500f8add14e6032e Mon Sep 17 00:00:00 2001
From: Michael James Gratton <mike@vee.net>
Date: Sun, 20 May 2018 20:36:56 +1000
Subject: [PATCH] More dependency cleanup.

* debian/control: Remove version numbers from packages that aren't
  strictly required.

* meson.build: Fix dup sqlite3 dep, sort primary deps.
---
 debian/control | 68 +++++++++++++++++++++++++-------------------------
 meson.build    |  7 +++---
 2 files changed, 37 insertions(+), 38 deletions(-)

diff --git a/debian/control b/debian/control
index 4381e976..d8cbf667 100644
--- a/debian/control
+++ b/debian/control
@@ -4,49 +4,49 @@ Priority: optional
 Maintainer: Michael Gratton <mike@vee.net>
 Build-Depends: debhelper (>= 8),
  desktop-file-utils,
- itstool (>= 2.0),
- libcanberra-dev (>= 0.28),
- libenchant-dev (>= 1.6.0),
- libgcr-3-dev (>= 3.10.1),
+ itstool,
+ libcanberra-dev,
+ libenchant-dev,
+ libgcr-3-dev,
  libgee-0.8-dev,
- libgirepository1.0-dev (>= 1.32.0),
- libglib2.0-dev (>= 2.42.0),
- libgmime-2.6-dev (>= 2.6.14),
- libgtk-3-dev (>= 3.14.0),
- libmessaging-menu-dev (>= 12.10.2),
- libnotify-dev (>=0.7.5),
- libsecret-1-dev (>= 0.11),
- libsoup2.4-dev (>= 2.48),
- libsqlite3-dev (>= 3.7.4),
- libunity-dev (>= 5.12.0),
- libunwind-dev (>= 1.1),
- libwebkit2gtk-4.0-dev (>= 2.10),
- libxml2-dev (>= 2.7.8),
+ libgirepository1.0-dev,
+ libglib2.0-dev (>= 2.54.0),
+ libgmime-2.6-dev (>= 2.6.17),
+ libgtk-3-dev (>= 3.22.26),
+ libmessaging-menu-dev,
+ libnotify-dev,
+ libsecret-1-dev,
+ libsoup2.4-dev,
+ libsqlite3-dev (>= 3.12),
+ libunity-dev,
+ libunwind-dev,
+ libwebkit2gtk-4.0-dev (>= 2.20),
+ libxml2-dev,
  meson (>= 0.41),
- valac (>=0.26)
+ valac (>=0.38)
 Standards-Version: 3.8.3
 Homepage: https://wiki.gnome.org/Apps/Geary
 
 Package: geary
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends},
- libcanberra0 (>= 0.28),
- libenchant1c2a (>= 1.6.0),
- libgcr-base-3-1 (>= 3.10.1),
- libgcr-ui-3-1 (>= 3.10.1),
+ libcanberra0,
+ libenchant1c2a,
+ libgcr-base-3-1,
+ libgcr-ui-3-1,
  libgee-0.8-2,
- libglib2.0-0 (>= 2.42.0),
- libgmime-2.6-0 (>= 2.6.14),
- libgtk-3-0 (>= 3.14.0),
- libmessaging-menu0 (>= 12.10.2),
- libnotify4 (>= 0.7.5),
- libsecret-1-0 (>= 0.11),
- libsoup2.4-1 (>= 2.48),
- libsqlite3-0 (>= 3.7.4),
- libunity9 (>= 5.12.0),
- libunwind8 (>= 1.1),
- libwebkit2gtk-4.0-37 (>= 2.10),
- libxml2 (>= 2.7.8),
+ libglib2.0-0 (>= 2.56.0),
+ libgmime-2.6-0 (>= 2.6.17),
+ libgtk-3-0 (>= 3.22.26),
+ libmessaging-menu0,
+ libnotify4,
+ libsecret-1-0,
+ libsoup2.4-1,
+ libsqlite3-0 (>= 3.12),
+ libunity9,
+ libunwind8,
+ libwebkit2gtk-4.0-37 (>= 2.20),
+ libxml2
 Description: Email application
  Geary is an email application built around conversations, for the
  GNOME 3 desktop. It allows you to read, find and send email with a
diff --git a/meson.build b/meson.build
index 2bb4239c..219fbcd5 100644
--- a/meson.build
+++ b/meson.build
@@ -45,10 +45,10 @@ target_webkit = '2.20'
 
 # Primary deps
 glib = dependency('glib-2.0', version: '>=' + target_glib)
-gtk = dependency('gtk+-3.0', version: '>=' + target_gtk)
-webkit2gtk = dependency('webkit2gtk-4.0', version: '>=' + target_webkit)
-sqlite = dependency('sqlite3', version: '>= 3.7.4')
 gmime = dependency('gmime-2.6', version: '>= 2.6.17')
+gtk = dependency('gtk+-3.0', version: '>=' + target_gtk)
+sqlite = dependency('sqlite3', version: '>= 3.12')
+webkit2gtk = dependency('webkit2gtk-4.0', version: '>=' + target_webkit)
 
 # Secondary deps - keep sorted alphabetically
 enchant = dependency('enchant', version: '>= 1.6')
@@ -70,7 +70,6 @@ libunwind_dep = dependency('libunwind', version: '>= 1.1')
 libunwind_generic_dep = dependency('libunwind-generic', version: '>= 1.1')
 libxml = dependency('libxml-2.0', version: '>= 2.7.8')
 posix = valac.find_library('posix')
-sqlite = dependency('sqlite3', version: '>= 3.12')
 webkit2gtk_dep = dependency('webkit2gtk-4.0', version: '>=' + target_webkit)
 webkit2gtk_web_extension_dep = dependency('webkit2gtk-web-extension-4.0', version: '>=' + target_webkit)