From 687175f3cc143463e49fc9afc1b1168e07315c5f Mon Sep 17 00:00:00 2001
From: Rohan Garg <rohan@kde.org>
Date: Fri, 17 Oct 2014 12:56:20 +0200
Subject: [PATCH] Use additional flags to build calamares

Make sure we ship our own settings.conf
---
 debian/calamares.install |  2 ++
 debian/control           |  3 +-
 debian/rules             | 25 ++--------------
 debian/settings.conf     | 65 ++++++++++++++++++++++++++++++++++++++++
 4 files changed, 72 insertions(+), 23 deletions(-)
 create mode 100644 debian/calamares.install
 create mode 100644 debian/settings.conf

diff --git a/debian/calamares.install b/debian/calamares.install
new file mode 100644
index 0000000..ff05d8a
--- /dev/null
+++ b/debian/calamares.install
@@ -0,0 +1,2 @@
+usr/*
+debian/settings.conf /etc/calamares/
diff --git a/debian/control b/debian/control
index c1b33ae..a3d5e7a 100644
--- a/debian/control
+++ b/debian/control
@@ -19,7 +19,8 @@ Build-Depends: debhelper (>= 9), cmake,
  gettext,
  libyaml-cpp-dev,
  pkg-config,
- libatasmart-dev
+ libatasmart-dev,
+ pkg-kde-tools
 Standards-Version: 3.9.5
 Homepage: https://github.com/calamares/calamares
 Vcs-Git: https://github.com/calamares/calamares-debian.git
diff --git a/debian/rules b/debian/rules
index 50a875f..e65d275 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,26 +1,7 @@
 #!/usr/bin/make -f
-# See debhelper(7) (uncomment to enable)
-# output every command that modifies files on the build system.
-#DH_VERBOSE = 1
 
-# see EXAMPLES in dpkg-buildflags(1) and read /usr/share/dpkg/*
-DPKG_EXPORT_BUILDFLAGS = 1
-include /usr/share/dpkg/default.mk
-
-# see FEATURE AREAS in dpkg-buildflags(1)
-#export DEB_BUILD_MAINT_OPTIONS = hardening=+all
-
-# see ENVIRONMENT in dpkg-buildflags(1)
-# package maintainers to append CFLAGS
-#export DEB_CFLAGS_MAINT_APPEND  = -Wall -pedantic
-# package maintainers to append LDFLAGS
-#export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
-
-
-# main packaging script based on dh7 syntax
 %:
-	dh $@ --dbg-package=calamares-dbg
-
-
-
+	dh $@ --dbg-package=calamares-dbg --with kf5
 
+override_dh_auto_configure:
+	dh_auto_configure -- -DWITH_PARTITIONMANAGER=1
diff --git a/debian/settings.conf b/debian/settings.conf
new file mode 100644
index 0000000..8d5b42a
--- /dev/null
+++ b/debian/settings.conf
@@ -0,0 +1,65 @@
+# Configuration file for Calamares
+# Syntax is YAML 1.2
+---
+# Modules can be job modules (with different interfaces) and QtWidgets view modules.
+# They could all be placed in a number of different paths.
+# "local" is LIBDIR/calamares/modules with settings in SHARE/calamares/modules
+modules-search: [ local, /path/to/dir/with/more/modules ]
+
+# We define the module names in the order they should show up (QtWidget view modules,
+# with one or more pages) OR be executed if enqueued (all other modules).
+# Pages can also enqueue jobs for delayed execution in the order specified for the
+# install phase.
+
+# Phase 1 - prepare.
+# View modules are shown as UI pages, jobs from job modules are executed immediately in
+# the background.
+# Jobs should be executed sparingly (if at all) in this phase.
+prepare:
+- greeting
+- locale
+- keyboard
+- prepare
+- partition
+- users
+- summary
+
+# Phase 2 - install.
+# View modules are not shown. Only the view modules shown in the previous phase are
+# allowed, their names should be added here as placeholders to specify the order in
+# which view module jobs should be enqueued. Job modules are also allowed.
+install:
+#- dummyprocess
+#- dummypython
+- partition
+- mount
+- unpackfs
+- fstab
+- locale
+- keyboard
+# Not required for Debian
+#- initcpiocfg
+#- initcpio
+- users
+- networkcfg
+- hwclock
+- services
+- grubcfg
+- grub
+- umount
+
+# Phase 3 - postinstall.
+# View modules are shown as UI pages, jobs from job modules are executed immediately in
+# the background.
+# Jobs should be executed sparingly (if at all) in this phase.
+postinstall: #TODO: actually use this
+- finished
+
+
+# A branding component is a directory, either in SHARE/calamares/branding or in
+# /etc/calamares/branding (the latter takes precedence). The directory must contain a
+# YAML file branding.desc which may reference additional resources (such as images) as
+# paths relative to the current directory.
+# Only the name of the branding component (directory) should be specified here, Calamares
+# then takes care of finding it and loading the contents.
+branding: default
\ No newline at end of file