Import Debian changes 2.0.0+dfsg-0vanir1debian/2.0.0+dfsg-0vanir1

barrier (2.0.0+dfsg-0vanir1) unstable; urgency=medium

  * Initial release.

14 files changed, 148 insertions, 17 deletions

diff --git a/debian/barrier.examples b/debian/barrier.examples
new file mode 100644
index 0000000..ebfff63
--- /dev/null
+++ b/debian/barrier.examples
@@ -0,0 +1,2 @@
+doc/barrier.conf.example
+doc/barrier.conf.example-basic
diff --git a/debian/barrier.install b/debian/barrier.install
new file mode 100644
index 0000000..20f434a
--- /dev/null
+++ b/debian/barrier.install
@@ -0,0 +1 @@
+debian/gen_ssl_pem.sh /usr/share/barrier
diff --git a/debian/barrier.manpages b/debian/barrier.manpages
new file mode 100644
index 0000000..0cacebb
--- /dev/null
+++ b/debian/barrier.manpages
@@ -0,0 +1,2 @@
+doc/barrierc.1
+doc/barriers.1
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 0000000..cd31559
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,5 @@
+barrier (2.0.0+dfsg-0vanir1) unstable; urgency=medium
+
+  * Initial release.
+
+ -- Unit 193 <unit193@ubuntu.com>  Tue, 24 Apr 2018 16:43:36 -0400
diff --git a/debian/compat b/debian/compat
index ec63514..b4de394 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-9
+11
diff --git a/debian/control b/debian/control
index 192dff0..ec6ffbb 100644
--- a/debian/control
+++ b/debian/control
@@ -1,17 +1,38 @@
 Source: barrier
-Section: utils
+Section: x11
 Priority: optional
-Standards-Version: 3.9.7
+Maintainer: Unit 193 <unit193@ubuntu.com>
+Build-Depends: debhelper (>= 11),
+ cmake,
+ libavahi-compat-libdnssd-dev,
+ libcurl4-openssl-dev | libcurl-dev,
+ libgtest-dev,
+ libice-dev,
+ libsm-dev,
+ libssl-dev,
+ libxi-dev,
+ libxinerama-dev,
+ libxrandr-dev,
+ libxtst-dev,
+ qtbase5-dev
+Standards-Version: 4.1.4
 Homepage: https://github.com/debauchee/barrier/
-Maintainer: Debauchee Open Source Group <todo@mail.com>
+Vcs-Browser: https://loki.unit193.net/cgit/users/unit193/barrier.git
+Vcs-Git: https://loki.unit193.net/cgit/users/unit193/barrier.git
 
 Package: barrier
-Architecture: amd64
-Section: utils
-Priority: optional
-Depends: ${shlibs:Depends},
-         ${misc:Depends}
-Description: Keyboard and mouse sharing solution
- Barrier allows you to share one mouse and keyboard between multiple computers.
- Work seamlessly across Windows, macOS and Linux.
-Homepage: https://github.com/debauchee/barrier/
+Architecture: any
+Depends: ${misc:Depends}, ${shlibs:Depends}, openssl
+Description: Share mouse, keyboard and clipboard over the network
+ Barrier lets you easily share a single mouse and keyboard between
+ multiple computers with different operating systems, each with its
+ own display, without special hardware.  It's intended for users
+ with multiple computers on their desk since each system uses its
+ own display.
+ .
+ Redirecting the mouse and keyboard is as simple as moving the mouse
+ off the edge of your screen.  Barrier also merges the clipboards of
+ all the systems into one, allowing cut-and-paste between systems.
+ Furthermore, it synchronizes screen savers so they all start and stop
+ together and, if screen locking is enabled, only one screen requires
+ a password to unlock them all.
diff --git a/debian/copyright b/debian/copyright
index d448129..b9be24b 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,5 +1,57 @@
 Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: Barrier
 Source: https://github.com/debauchee/barrier/
-Disclaimer: This package is not part of the Debian project as it contains closed source proprietary components
-Copyright: Copyright (C) 2018 Debauchee Open Source Group
+Comment: Bundled libraries were removed
+Files-Excluded:
+ ext
+
+Files: *
+Copyright: 2002-2014 Chris Schoeneman
+           2008-2014 Nick Bolton
+           2012-2016 Synergy Si Ltd.
+           2018 Debauchee Open Source Group
+License: GPL-2 with OpenSSL exception
+ This package is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; version 2 of the License.
+ .
+ This program is released under the GPL with the additional exemption
+ that compiling, linking, and/or using OpenSSL is allowed.
+ .
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <https://www.gnu.org/licenses/>
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
+
+Files: debian/*
+Copyright: 2018 Unit 193 <unit193@ubuntu.com>
+License: BSD-3-Clause
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ 1. Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the
+    documentation and/or other materials provided with the distribution.
+ 3. Neither the name of the copyright holder nor the names of its contributors
+    may be used to endorse or promote products derived from this software
+    without specific prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
+ A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE HOLDERS OR
+ CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
+ EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
+ PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
+ PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF 
+ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING 
+ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
+ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/debian/docs b/debian/docs
new file mode 100644
index 0000000..b43bf86
--- /dev/null
+++ b/debian/docs
@@ -0,0 +1 @@
+README.md
diff --git a/debian/gbp.conf b/debian/gbp.conf
new file mode 100644
index 0000000..5474c60
--- /dev/null
+++ b/debian/gbp.conf
@@ -0,0 +1,3 @@
+[DEFAULT]
+pristine-tar = True
+sign-tags = True
diff --git a/debian/gen_ssl_pem.sh b/debian/gen_ssl_pem.sh
new file mode 100755
index 0000000..92d2e6e
--- /dev/null
+++ b/debian/gen_ssl_pem.sh
@@ -0,0 +1,24 @@
+#!/bin/sh
+
+# These defaults were extracted from Barrier source file:
+# src/gui/src/SslCertificate.cpp
+#
+# A private key and certificate is generated in the profile
+# directory (~/.barrier/SSL/Barrier.pem). Then a fingerprint
+# is generated that can be used to verify the client is
+# connecting to the correct server
+# (~/.barrier/SSL/Fingerprints/Local.txt)
+
+umask 177
+if hash syntool 2>/dev/null; then
+    if hash openssl 2>/dev/null; then
+        mkdir -p "$(syntool --get-profile-dir)/SSL" && openssl req -x509 -nodes -days 365 -subj '/CN=Barrier' -newkey rsa:4096 -keyout "$(syntool --get-profile-dir)/SSL/Synergy.pem" -out "$(syntool --get-profile-dir)/SSL/Synergy.pem" && mkdir -p "$(syntool --get-profile-dir)/SSL/Fingerprints/" &&  openssl x509 -fingerprint -sha1 -noout -in "$(syntool --get-profile-dir)/SSL/Synergy.pem" | cut -d= -f2 > "$(syntool --get-profile-dir)/SSL/Fingerprints/Local.txt"
+    else
+        echo "openssl not found in path"
+    fi
+    echo "Server Fingerprint:"
+    cat "$(syntool --get-profile-dir)/SSL/Fingerprints/Local.txt"
+else
+    echo "syntool not found in path"
+fi
+
diff --git a/debian/rules b/debian/rules
index 64ddd45..c3d7b43 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,18 @@
 #!/usr/bin/make -f
+# -*- makefile -*-
+
+# Uncomment this to turn on verbose mode.
+# export DH_VERBOSE=1
+
+DPKG_EXPORT_BUILDFLAGS = 1
+include /usr/share/dpkg/buildflags.mk
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
+
+export BARRIER_VERSION_STAGE=Release
 
 %:
-	dh $@ --buildsystem=cmake --builddirectory=build -Pbuild/debian --parallel
+	dh $@ --builddirectory=builddir
 
+override_dh_auto_configure:
+	dh_auto_configure -- -DBARRIER_REVISION=00000000
diff --git a/debian/source/format b/debian/source/format
index 89ae9db..163aaf8 100644
--- a/debian/source/format
+++ b/debian/source/format
@@ -1 +1 @@
-3.0 (native)
+3.0 (quilt)
diff --git a/debian/upstream/metadata b/debian/upstream/metadata
new file mode 100644
index 0000000..e3b2d74
--- /dev/null
+++ b/debian/upstream/metadata
@@ -0,0 +1,4 @@
+Changelog: https://github.com/debauchee/barrier/blob/master/ChangeLog
+Repository: https://github.com/debauchee/barrier/
+Bug-Database: https://github.com/debauchee/barrier/issues
+Bug-Submit: https://github.com/debauchee/barrier/issues/new
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 0000000..947e736
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,3 @@
+version=3
+opts="dversionmangle=s/\+dfsg$//,repacksuffix=+dfsg" \
+https://github.com/debauchee/barrier/releases .*/v?([\d\.]+)\.tar\.(?:bz2|gz|xz)