From dd120c1367b9838064869a8ed4198f4707dd34ce Mon Sep 17 00:00:00 2001
From: Jonathan Carter <jcc@debian.org>
Date: Mon, 21 May 2018 01:41:53 -0400
Subject: [PATCH] New upstream release

---
 .gitignore               |  4 ++++
 debian/changelog         |  8 ++++++++
 debian/control           |  2 +-
 debian/lintian-overrides | 13 ++++++-------
 4 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/.gitignore b/.gitignore
index 26e8ff8..2f36a5d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,6 +21,7 @@ __pycache__
 *.pro.user
 *.pro.user.*
 *.moc
+*.qmlc
 moc_*.cpp
 qrc_*.cpp
 ui_*.h
@@ -46,3 +47,6 @@ CMakeLists.txt.user
 
 # Backup files
 *~
+
+# Kate
+*.kate-swp
diff --git a/debian/changelog b/debian/changelog
index cc2382b..b1044e8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+calamares (3.2.0-1) unstable; urgency=medium
+
+  * New upstream release
+  * Add btrfs-progs to recommends
+  * Update lintian-overrides
+
+ -- Jonathan Carter <jcc@debian.org>  Fri, 18 May 2018 10:36:44 +0200
+
 calamares (3.1.13-1) unstable; urgency=medium
 
   * New upstream release
diff --git a/debian/control b/debian/control
index be08488..7d0d0ad 100644
--- a/debian/control
+++ b/debian/control
@@ -44,7 +44,7 @@ Vcs-Git: https://salsa.debian.org/qt-kde-team/kde-extras/calamares.git
 Package: calamares
 Architecture: linux-any
 Depends: os-prober, ${misc:Depends}, ${shlibs:Depends}
-Recommends: squashfs-tools
+Recommends: squashfs-tools, btrfs-progs
 Description: distribution-independent installer framework
  Calamares is a distribution-independent installer framework.
  .
diff --git a/debian/lintian-overrides b/debian/lintian-overrides
index 950356b..b67c55e 100644
--- a/debian/lintian-overrides
+++ b/debian/lintian-overrides
@@ -1,18 +1,17 @@
 # These are hooks that is incorperated in initramfs and does not need to be executable by itself.
-calamares: script-not-executable usr/lib/calamares/modules/initramfscfg/encrypt_hook
-calamares: script-not-executable usr/lib/calamares/modules/initramfscfg/encrypt_hook_nokey
+calamares: script-not-executable
 
 # This is a false-alarm. This file does not contain licensing information,
 # instead, it's a configuration file for licence options in the installer.
 calamares: extra-license-file usr/share/calamares/modules/license.conf
 
 # Private libraries, so no -dev packages or symbol files
-calamares: non-dev-pkg-with-shlib-symlink usr/lib/libcalamaresui.so.3.1.13 usr/lib/libcalamaresui.so
-calamares: non-dev-pkg-with-shlib-symlink usr/lib/libcalamares.so.3.1.13 usr/lib/libcalamares.so
-calamares: no-symbols-control-file usr/lib/libcalamaresui.so.3.1.13
-calamares: no-symbols-control-file usr/lib/libcalamares.so.3.1.13
-calamares: package-name-doesnt-match-sonames libcalamares3.1.13 libcalamaresui3.1.13
+calamares: non-dev-pkg-with-shlib-symlink
+calamares: no-symbols-control-file
+calamares: package-name-doesnt-match-sonames
 
 # Debian live media relies on sudo so this message isn't needed
 calamares: desktop-command-not-in-package usr/share/applications/calamares.desktop sudo
 
+# Odd false alarm
+calamares: spelling-error-in-binary usr/bin/calamares Iif If