update debian packaging files

Signed-off-by: R4SAS <[email protected]>

Author: r4sas

debian/i2pd.openrc contrib/openrc/i2pd.openrcdebian/i2pd.openrc renamed to contrib/openrc/i2pd.openrc

@@ -1 +1 @@
-10
+9

debian/i2pd.upstart contrib/upstart/i2pd.upstartdebian/i2pd.upstart renamed to contrib/upstart/i2pd.upstart

@@ -3,30 +3,16 @@ Section: net
 Priority: optional
 Maintainer: r4sas <[email protected]>
 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
+Standards-Version: 3.9.8
 Homepage: http://i2pd.website/
 Vcs-Git: git://github.com/PurpleI2P/i2pd.git
 Vcs-Browser: https://github.com/PurpleI2P/i2pd
 
 Package: i2pd
 Architecture: any
-Pre-Depends: adduser
+Pre-Depends: ${misc:Pre-Depends}, adduser
 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
  don't reveal their real IP addresses.
- .
- This package contains the full-featured C++ implementation of I2P router.
-
-Package: i2pd-dbg
-Architecture: any
-Priority: extra
-Section: debug
-Depends: i2pd (= ${binary:Version}), ${misc:Depends}
-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
- don't reveal their real IP addresses.
- .
- This package contains symbols required for debugging.

debian/compat

@@ -6,13 +6,6 @@ Files: *
 Copyright: 2013-2020 PurpleI2P
 License: BSD-3-clause
 
-Files: qt/i2pd_qt/android/src/org/kde/necessitas/ministro/IMinistro.aidl
-       qt/i2pd_qt/android/src/org/kde/necessitas/ministro/IMinistroCallback.aidl
-       qt/i2pd_qt/android/src/org/qtproject/qt5/android/bindings/QtActivity.java
-       qt/i2pd_qt/android/src/org/qtproject/qt5/android/bindings/QtApplication.java
-Copyright: 2011-2013 BogDan Vatra <[email protected]>
-License: BSD-2-Clause
-
 Files: debian/*
 Copyright: 2013-2015 Kill Your TV <[email protected]>
            2014-2016 hagen <[email protected]>
@@ -49,28 +42,6 @@ License: BSD-3-clause
  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.
 
-License: BSD-2-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.
- .
- 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.
-
 License: GPL-2+
  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

debian/control

@@ -1,5 +1 @@
 README.md
-contrib/i2pd.conf
-contrib/subscriptions.txt
-contrib/tunnels.conf
-contrib/tunnels.d

debian/copyright

@@ -1,5 +1,5 @@
 i2pd usr/sbin/
-contrib/i2pd.conf      etc/i2pd/
+contrib/i2pd.conf etc/i2pd/
 contrib/tunnels.conf etc/i2pd/
 contrib/subscriptions.txt etc/i2pd/
 contrib/certificates/ usr/share/i2pd/

debian/docs

@@ -12,7 +12,6 @@ case "$1" in
     # Create user and group as a system user.
     if getent passwd $I2PDUSER > /dev/null 2>&1; then
       groupadd -f $I2PDUSER || true
-      usermod -s "/bin/false" -e 1 $I2PDUSER > /dev/null || true
     else
       adduser --system --quiet --group --home $I2PDHOME $I2PDUSER
     fi
@@ -23,7 +22,7 @@ case "$1" in
     chmod 640 $LOGFILE
     chown -f ${I2PDUSER}:adm $LOGFILE
     mkdir -p -m0750 $I2PDHOME
-    chown -f -R -P ${I2PDUSER}:${I2PDUSER} ${I2PDHOME}
+    chown -f -P ${I2PDUSER}:${I2PDUSER} ${I2PDHOME}
   ;;
   abort-upgrade|abort-remove|abort-deconfigure)
     echo "Aborting upgrade"

debian/i2pd.dirs

@@ -1,22 +1,16 @@
 #!/usr/bin/make -f
-# -*- makefile -*-
-
-# Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-DEB_BUILD_MAINT_OPTIONS=hardening=+bindnow
-#DPKG_EXPORT_BUILDFLAGS = 1
-#include /usr/share/dpkg/buildflags.mk
-#CXXFLAGS+=$(CPPFLAGS)
-#PREFIX=/usr
 
-%:
-	dh $@ --parallel
-#	dh_apparmor --profile-name=usr.sbin.i2pd -pi2pd
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+
+
+include /usr/share/dpkg/architecture.mk
 
-override_dh_strip:
-	dh_strip --dbg-package=i2pd-dbg
+export DEB_CXXFLAGS_MAINT_APPEND  = -Wall -pedantic -O3
 
-## uncomment this if you have "missing info" problem when building package
-#override_dh_shlibdeps:
-#	dh_shlibdeps --dpkg-shlibdeps-params=--ignore-missing-info
+export DEB_LDFLAGS_MAINT_APPEND =
+
+
+%:
+	dh $@ --parallel