From 44b4e339612b459a8665f3a727ef1ded04b21dce Mon Sep 17 00:00:00 2001
From: Alf Gaida <agaida@siduction.org>
Date: Fri, 15 Dec 2017 00:49:30 +0100
Subject: [PATCH] Cleanup debian/*

* Bumped Standards to 4.1.2, no changes needed
* Move config to /usr/share/pcmanfm-qt/lxqt
* Removed branch from VCS fields
* Removed debian/gbp.conf
---
 debian/changelog                 | 11 ++++++++++-
 debian/control                   |  4 ++--
 debian/gbp.conf                  |  8 --------
 debian/patches/move-config.patch | 15 +++++++++++++++
 debian/patches/series            |  1 +
 debian/source/options            |  2 +-
 6 files changed, 29 insertions(+), 12 deletions(-)
 delete mode 100644 debian/gbp.conf
 create mode 100644 debian/patches/move-config.patch
 create mode 100644 debian/patches/series

diff --git a/debian/changelog b/debian/changelog
index c5e24ba..89ad88b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,15 @@
+pcmanfm-qt (0.12.0-3) unstable; urgency=medium
+
+  * Bumped Standards to 4.1.2, no changes needed
+  * Move config to /usr/share/pcmanfm-qt/lxqt
+  * Removed branch from VCS fields
+  * Removed debian/gbp.conf
+
+ -- Alf Gaida <agaida@siduction.org>  Fri, 15 Dec 2017 00:49:17 +0100
+
 pcmanfm-qt (0.12.0-2) unstable; urgency=medium
 
-  * Transition to unstable 
+  * Transition to unstable
 
  -- Alf Gaida <agaida@siduction.org>  Tue, 05 Dec 2017 01:51:44 +0100
 
diff --git a/debian/control b/debian/control
index 8f208b0..673c642 100644
--- a/debian/control
+++ b/debian/control
@@ -18,8 +18,8 @@ Build-Depends: debhelper (>= 10),
                libx11-dev,
                lxqt-build-tools (>= 0.4.0)
 Standards-Version: 4.1.1
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-lxqt/pcmanfm-qt.git/?h=debian/sid
-Vcs-Git: https://anonscm.debian.org/git/pkg-lxqt/pcmanfm-qt.git -b debian/sid
+Vcs-Browser: https://anonscm.debian.org/cgit/pkg-lxqt/pcmanfm-qt.git
+Vcs-Git: https://anonscm.debian.org/git/pkg-lxqt/pcmanfm-qt.git
 Homepage: https://github.com/lxde/pcmanfm-qt
 
 Package: pcmanfm-qt
diff --git a/debian/gbp.conf b/debian/gbp.conf
deleted file mode 100644
index 7a9f00a..0000000
--- a/debian/gbp.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-[DEFAULT]
-debian-branch = debian/sid
-upstream-branch = upstream/latest
-pristine-tar = True
-
-[import-orig]
-# Use git cherrypick -n upstream instead.
-merge = False
diff --git a/debian/patches/move-config.patch b/debian/patches/move-config.patch
new file mode 100644
index 0000000..c1f1ad7
--- /dev/null
+++ b/debian/patches/move-config.patch
@@ -0,0 +1,15 @@
+Author: Alf Gaida <agaida@siduction.org>
+Description: Move config
+
+ diff --git a/config/CMakeLists.txt b/config/CMakeLists.txt
+ index e9cfe75..c86bfb3 100644
+--- a/config/CMakeLists.txt
++++ b/config/CMakeLists.txt
+@@ -3,6 +3,6 @@
+ configure_file(pcmanfm-qt/lxqt/settings.conf.in pcmanfm-qt/lxqt/settings.conf @ONLY)
+ install(FILES
+     "${CMAKE_CURRENT_BINARY_DIR}/pcmanfm-qt/lxqt/settings.conf"
+-    DESTINATION "${LXQT_ETC_XDG_DIR}/pcmanfm-qt/lxqt"
++    DESTINATION "${CMAKE_INSTALL_DATADIR}/pcmanfm-qt/lxqt"
+     COMPONENT Runtime
+ )
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..8d85b0d
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+move-config.patch
diff --git a/debian/source/options b/debian/source/options
index efee896..62e7187 100644
--- a/debian/source/options
+++ b/debian/source/options
@@ -1 +1 @@
-tar-ignore = .gitignore
+tar-ignore = ".gitignore"