-work on packaging

7 files changed, 27 insertions, 12 deletions

diff --git a/contrib/Makefile.inc b/contrib/Makefile.inc
index a563ef4a1..c737a07f8 100644
--- a/contrib/Makefile.inc
+++ b/contrib/Makefile.inc
@@ -8,8 +8,7 @@ BUILDCOMMON_SHLIB_FILES = \
     build-common/sh/lib.sh/existence_python.sh \
     build-common/sh/lib.sh/msg.sh \
     build-common/sh/lib.sh/progname.sh \
-    build-common/sh/lib.sh/version_gnunet.sh \
-    build-common/LICENSE
+    build-common/sh/lib.sh/version_gnunet.sh
 
 BUILDCOMMON_CONF_FILES = \
     build-common/conf/.dir-locals.el \
diff --git a/debian/changelog b/debian/changelog
index 525ac5f9c..588fa4cf7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,9 @@
 gnunet (0.14.0) unstable; urgency=medium
 
+  * Split libgnunet from main gnunet package.
+  * Set option to log to /var/log/gnunet.log for logrotate to work as configured.
   * Import into downstream repo.
-  
+
  -- Christian Grothoff <grothoff@gnu.org>  Tue 29 Dec 2020 12:02:10 AM CET
 
 gnunet (0.13.3-1) unstable; urgency=medium
@@ -9,7 +11,7 @@ gnunet (0.13.3-1) unstable; urgency=medium
   * New upstream version 0.13.3.
   * Maintainer changed to Thomas Liang (Closes: #964314).
 
- -- Thomas Liang <rt1omas@protonmail.com>  Sat, 19 Sep 2020 21:27:20 +0800 
+ -- Thomas Liang <rt1omas@protonmail.com>  Sat, 19 Sep 2020 21:27:20 +0800
 
 gnunet (0.13.1-1) unstable; urgency=medium
 
diff --git a/debian/etc/gnunet.conf b/debian/etc/gnunet.conf
index c14ab5918..dc0528cf3 100644
--- a/debian/etc/gnunet.conf
+++ b/debian/etc/gnunet.conf
@@ -6,3 +6,4 @@ GNUNET_RUNTIME_DIR = /var/run/gnunet/
 [arm]
 START_SYSTEM_SERVICES = YES
 START_USER_SERVICES = NO
+OPTIONS = -l /var/log/gnunet.log
diff --git a/debian/gnunet.install b/debian/gnunet.install
index aa6f22054..d3426b454 100644
--- a/debian/gnunet.install
+++ b/debian/gnunet.install
@@ -1,7 +1,10 @@
 etc/gnunet.conf
 usr/bin/
 usr/lib/*/gnunet/
-usr/share/
+usr/share/man/
+usr/share/info/
+usr/share/doc/gnunet/
+usr/share/gnunet/
 usr/lib/x86_64-linux-gnu/gnunet/nss/libnss_gns.so.2 /usr/lib/x86_64-linux-gnu/
 usr/lib/x86_64-linux-gnu/gnunet/nss/libnss_gns4.so.2 /usr/lib/x86_64-linux-gnu/
 usr/lib/x86_64-linux-gnu/gnunet/nss/libnss_gns6.so.2 /usr/lib/x86_64-linux-gnu/
diff --git a/debian/gnunet.logrotate b/debian/gnunet.logrotate
index 3b8a013dd..a3bf71be6 100644
--- a/debian/gnunet.logrotate
+++ b/debian/gnunet.logrotate
@@ -1,4 +1,4 @@
-/var/log/gnunetd/gnunetd.log {
+/var/log/gnunet/gnunet.log {
         weekly
         size=100k
         rotate 7
diff --git a/debian/libgnunet.install b/debian/libgnunet.install
index bfd61d628..14b47188c 100644
--- a/debian/libgnunet.install
+++ b/debian/libgnunet.install
@@ -1,2 +1,7 @@
 usr/lib/*/*.so.*
-usr/share/
+usr/share/locale/
+usr/share/doc/libgnunet/
+usr/share/gnunet/config.d/
+usr/bin/gnunet-bugreport
+usr/bin/gnunet-ecc
+usr/bin/gnunet-config
diff --git a/debian/rules b/debian/rules
index 778479140..bf4373572 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,16 +15,16 @@ override_dh_auto_configure-indep:
 override_dh_auto_build-indep:
 
 override_dh_auto_test:
-        # Disabling test suite, incomplete
+# Disabling test suite, incomplete
 
 override_dh_auto_install-arch:
         dh_auto_install
-        
-        # Create config file
+
+# Create config file
         mkdir -p debian/tmp/etc
         cp debian/etc/gnunet.conf debian/tmp/etc/
-        
-        # Removing useless files
+
+# Removing useless files
         rm -f debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/*.la \
                 debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/gnunet/*.la \
                 debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/gnunet/nss/*.la \
@@ -45,3 +45,8 @@ override_dh_auto_clean:
         dh_auto_clean
         rm -rf contrib/gnunet_janitor.py contrib/gnunet_pyexpect.py libltdl/ \
                 src/integration-tests/*.py
+
+# Remove files already present in libgnunet from main gnunet package
+override_dh_install:
+        dh_install
+        cd debian/libgnunet; find . -type f -exec rm -f ../gnunet/{} \;