From 27fbf6735222a6e7768b03c195b33fe9e0c382e7 Mon Sep 17 00:00:00 2001
From: R4SAS <r4sas@i2pmail.org>
Date: Tue, 26 Jun 2018 18:07:06 +0300
Subject: [PATCH] add systemd configs, change build info, update changelog

---
 debian/changelog    |  5 +++--
 debian/control      |  6 ++----
 debian/i2pd.service |  1 +
 debian/i2pd.tmpfile |  2 ++
 debian/rules        | 10 +++++-----
 5 files changed, 13 insertions(+), 11 deletions(-)
 create mode 100644 debian/i2pd.service
 create mode 100644 debian/i2pd.tmpfile

diff --git a/debian/changelog b/debian/changelog
index 1b87e73c..230dd9a8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,12 @@
-i2pd (2.19.0-pre1) unstable; urgency=low
+i2pd (2.19.0-1) unstable; urgency=low
 
   * updated to version 2.19.0/0.9.35
   * update manpage (1)
   * update docfiles
   * fixes in systemd unit (#1089, #1142, #1154, #1155)
+  * package now building with systemd support
 
- -- R4SAS <r4sas@i2pmail.org>  Wed, 20 Jun 2018 02:11:00 +0000
+ -- R4SAS <r4sas@i2pmail.org>  Tue, 26 Jun 2018 15:00:00 +0000
 
 i2pd (2.18.0-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 76d753d4..8ef0b08c 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: i2pd
 Section: net
 Priority: optional
 Maintainer: R4SAS <r4sas@i2pmail.org>
-Build-Depends: debhelper (>= 9), dpkg-dev (>= 1.16.1~), gcc (>= 4.7) | clang (>= 3.3), libboost-system-dev (>= 1.46), libboost-date-time-dev (>= 1.46), libboost-filesystem-dev (>= 1.46), libboost-program-options-dev (>= 1.46), libminiupnpc-dev, libssl-dev, zlib1g-dev, dh-apparmor
+Build-Depends: debhelper (>= 9), dpkg-dev (>= 1.17.2~), gcc (>= 4.7) | clang (>= 3.3), libboost-system-dev (>= 1.46), libboost-date-time-dev (>= 1.46), libboost-filesystem-dev (>= 1.46), libboost-program-options-dev (>= 1.46), libminiupnpc-dev, libssl-dev, zlib1g-dev
 Standards-Version: 3.9.6
 Homepage: http://i2pd.website/
 Vcs-Git: git://github.com/PurpleI2P/i2pd.git
@@ -11,8 +11,7 @@ Vcs-Browser: https://github.com/PurpleI2P/i2pd
 Package: i2pd
 Architecture: any
 Pre-Depends: adduser
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Suggests: tor, privoxy, apparmor
+Depends: ${shlibs:Depends}, ${misc:Depends}, lsb-base,
 Description: Full-featured C++ implementation of I2P client.
  I2P (Invisible Internet Protocol) is a universal anonymous network layer. All
  communications over I2P are anonymous and end-to-end encrypted, participants
@@ -25,7 +24,6 @@ Architecture: any
 Priority: extra
 Section: debug
 Depends: i2pd (= ${binary:Version}), ${misc:Depends}
-Suggests: gdb
 Description: i2pd debugging symbols
  I2P (Invisible Internet Protocol) is a universal anonymous network layer. All
  communications over I2P are anonymous and end-to-end encrypted, participants
diff --git a/debian/i2pd.service b/debian/i2pd.service
new file mode 100644
index 00000000..ca477e3b
--- /dev/null
+++ b/debian/i2pd.service
@@ -0,0 +1 @@
+../i2pd.service
\ No newline at end of file
diff --git a/debian/i2pd.tmpfile b/debian/i2pd.tmpfile
new file mode 100644
index 00000000..6cd19112
--- /dev/null
+++ b/debian/i2pd.tmpfile
@@ -0,0 +1,2 @@
+d /var/run/i2pd 0755 i2pd i2pd - -
+d /var/log/i2pd 0755 i2pd i2pd - -
diff --git a/debian/rules b/debian/rules
index 4654ae6c..53244c56 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,14 +5,14 @@
 #export DH_VERBOSE=1
 
 DEB_BUILD_MAINT_OPTIONS=hardening=+bindnow
-DPKG_EXPORT_BUILDFLAGS = 1
-include /usr/share/dpkg/buildflags.mk
-CXXFLAGS+=$(CPPFLAGS)
-PREFIX=/usr
+#DPKG_EXPORT_BUILDFLAGS = 1
+#include /usr/share/dpkg/buildflags.mk
+#CXXFLAGS+=$(CPPFLAGS)
+#PREFIX=/usr
 
 %:
 	dh $@ --parallel
-	dh_apparmor --profile-name=usr.sbin.i2pd -pi2pd
+	#dh_apparmor --profile-name=usr.sbin.i2pd -pi2pd
 
 override_dh_strip:
 	dh_strip --dbg-package=i2pd-dbg