From 9732e3f9bc88e7d2eada6c281adff6f16dca03e0 Mon Sep 17 00:00:00 2001
From: Andrew Nelless <andrew@symless.com>
Date: Tue, 9 May 2017 11:21:51 +0100
Subject: [PATCH] Revert "Configure debian package directory"

This reverts commit 17abdefd20f0e2046b81d3d33cbe45e85c0fb200.
---
 CMakeLists.txt                     | 5 +----
 debian/changelog                   | 5 +++++
 {dist/deb => debian}/compat        | 0
 {dist/deb => debian}/control       | 0
 {dist/deb => debian}/copyright     | 0
 {dist/deb => debian}/rules         | 0
 {dist/deb => debian}/source/format | 0
 dist/deb/changelog.in              | 5 -----
 8 files changed, 6 insertions(+), 9 deletions(-)
 create mode 100644 debian/changelog
 rename {dist/deb => debian}/compat (100%)
 rename {dist/deb => debian}/control (100%)
 rename {dist/deb => debian}/copyright (100%)
 rename {dist/deb => debian}/rules (100%)
 rename {dist/deb => debian}/source/format (100%)
 delete mode 100644 dist/deb/changelog.in

diff --git a/CMakeLists.txt b/CMakeLists.txt
index bee3e36a..3afd4521 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -406,15 +406,12 @@ endif()
 #
 if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
     configure_files (${CMAKE_CURRENT_SOURCE_DIR}/dist/rpm ${CMAKE_BINARY_DIR}/rpm)
-    configure_files (${CMAKE_CURRENT_SOURCE_DIR}/dist/deb ${CMAKE_BINARY_DIR}/debian)
-
+    install(FILES res/synergy.svg DESTINATION share/icons)
     if("${VERSION_MAJOR}" STREQUAL "2") 
         install(FILES res/synergy2.desktop DESTINATION share/applications)
     else()
         install(FILES res/synergy.desktop DESTINATION share/applications)
     endif()
-
-    install(FILES res/synergy.svg DESTINATION share/icons)
 endif()
 
 else()
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 00000000..aba1da70
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,5 @@
+synergy (1.9.0~beta1) UNRELEASED; urgency=medium
+
+  * Initial release.
+
+ -- Symless Ltd <engineering@symless.com>  Thu, 27 Apr 2017 13:50:32 +0000
diff --git a/dist/deb/compat b/debian/compat
similarity index 100%
rename from dist/deb/compat
rename to debian/compat
diff --git a/dist/deb/control b/debian/control
similarity index 100%
rename from dist/deb/control
rename to debian/control
diff --git a/dist/deb/copyright b/debian/copyright
similarity index 100%
rename from dist/deb/copyright
rename to debian/copyright
diff --git a/dist/deb/rules b/debian/rules
similarity index 100%
rename from dist/deb/rules
rename to debian/rules
diff --git a/dist/deb/source/format b/debian/source/format
similarity index 100%
rename from dist/deb/source/format
rename to debian/source/format
diff --git a/dist/deb/changelog.in b/dist/deb/changelog.in
deleted file mode 100644
index 008253f2..00000000
--- a/dist/deb/changelog.in
+++ /dev/null
@@ -1,5 +0,0 @@
-synergy (@SYNERGY_VERSION@~@SYNERGY_VERSION_STAGE@) unstable; urgency=medium
-
-  * Initial release.
-
- -- Symless Ltd <engineering@symless.com>  @SYNERGY_RELEASE_DATE@