diff options
author | Christian Grothoff <christian@grothoff.org> | 2020-12-29 13:43:34 +0100 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2020-12-29 13:43:34 +0100 |
commit | 8dca171ad616800dc8b5632a872f832a663f8dbb (patch) | |
tree | 3e83342b62db7ce2a02c909bb7b19ab11c2bdde3 | |
parent | 3e6cb6e075a2d43b0f6c05af1096b5bc8c71b6ae (diff) | |
download | gnunet-8dca171ad616800dc8b5632a872f832a663f8dbb.tar.gz gnunet-8dca171ad616800dc8b5632a872f832a663f8dbb.zip |
-work on packaging
-rw-r--r-- | contrib/Makefile.inc | 3 | ||||
-rw-r--r-- | debian/changelog | 6 | ||||
-rw-r--r-- | debian/etc/gnunet.conf | 1 | ||||
-rw-r--r-- | debian/gnunet.install | 5 | ||||
-rw-r--r-- | debian/gnunet.logrotate | 2 | ||||
-rw-r--r-- | debian/libgnunet.install | 7 | ||||
-rwxr-xr-x | debian/rules | 15 |
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 = \ | |||
8 | build-common/sh/lib.sh/existence_python.sh \ | 8 | build-common/sh/lib.sh/existence_python.sh \ |
9 | build-common/sh/lib.sh/msg.sh \ | 9 | build-common/sh/lib.sh/msg.sh \ |
10 | build-common/sh/lib.sh/progname.sh \ | 10 | build-common/sh/lib.sh/progname.sh \ |
11 | build-common/sh/lib.sh/version_gnunet.sh \ | 11 | build-common/sh/lib.sh/version_gnunet.sh |
12 | build-common/LICENSE | ||
13 | 12 | ||
14 | BUILDCOMMON_CONF_FILES = \ | 13 | BUILDCOMMON_CONF_FILES = \ |
15 | build-common/conf/.dir-locals.el \ | 14 | 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 @@ | |||
1 | gnunet (0.14.0) unstable; urgency=medium | 1 | gnunet (0.14.0) unstable; urgency=medium |
2 | 2 | ||
3 | * Split libgnunet from main gnunet package. | ||
4 | * Set option to log to /var/log/gnunet.log for logrotate to work as configured. | ||
3 | * Import into downstream repo. | 5 | * Import into downstream repo. |
4 | 6 | ||
5 | -- Christian Grothoff <grothoff@gnu.org> Tue 29 Dec 2020 12:02:10 AM CET | 7 | -- Christian Grothoff <grothoff@gnu.org> Tue 29 Dec 2020 12:02:10 AM CET |
6 | 8 | ||
7 | gnunet (0.13.3-1) unstable; urgency=medium | 9 | gnunet (0.13.3-1) unstable; urgency=medium |
@@ -9,7 +11,7 @@ gnunet (0.13.3-1) unstable; urgency=medium | |||
9 | * New upstream version 0.13.3. | 11 | * New upstream version 0.13.3. |
10 | * Maintainer changed to Thomas Liang (Closes: #964314). | 12 | * Maintainer changed to Thomas Liang (Closes: #964314). |
11 | 13 | ||
12 | -- Thomas Liang <rt1omas@protonmail.com> Sat, 19 Sep 2020 21:27:20 +0800 | 14 | -- Thomas Liang <rt1omas@protonmail.com> Sat, 19 Sep 2020 21:27:20 +0800 |
13 | 15 | ||
14 | gnunet (0.13.1-1) unstable; urgency=medium | 16 | gnunet (0.13.1-1) unstable; urgency=medium |
15 | 17 | ||
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/ | |||
6 | [arm] | 6 | [arm] |
7 | START_SYSTEM_SERVICES = YES | 7 | START_SYSTEM_SERVICES = YES |
8 | START_USER_SERVICES = NO | 8 | START_USER_SERVICES = NO |
9 | 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 @@ | |||
1 | etc/gnunet.conf | 1 | etc/gnunet.conf |
2 | usr/bin/ | 2 | usr/bin/ |
3 | usr/lib/*/gnunet/ | 3 | usr/lib/*/gnunet/ |
4 | usr/share/ | 4 | usr/share/man/ |
5 | usr/share/info/ | ||
6 | usr/share/doc/gnunet/ | ||
7 | usr/share/gnunet/ | ||
5 | usr/lib/x86_64-linux-gnu/gnunet/nss/libnss_gns.so.2 /usr/lib/x86_64-linux-gnu/ | 8 | usr/lib/x86_64-linux-gnu/gnunet/nss/libnss_gns.so.2 /usr/lib/x86_64-linux-gnu/ |
6 | usr/lib/x86_64-linux-gnu/gnunet/nss/libnss_gns4.so.2 /usr/lib/x86_64-linux-gnu/ | 9 | usr/lib/x86_64-linux-gnu/gnunet/nss/libnss_gns4.so.2 /usr/lib/x86_64-linux-gnu/ |
7 | usr/lib/x86_64-linux-gnu/gnunet/nss/libnss_gns6.so.2 /usr/lib/x86_64-linux-gnu/ | 10 | 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 @@ | |||
1 | /var/log/gnunetd/gnunetd.log { | 1 | /var/log/gnunet/gnunet.log { |
2 | weekly | 2 | weekly |
3 | size=100k | 3 | size=100k |
4 | rotate 7 | 4 | 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 @@ | |||
1 | usr/lib/*/*.so.* | 1 | usr/lib/*/*.so.* |
2 | usr/share/ | 2 | usr/share/locale/ |
3 | usr/share/doc/libgnunet/ | ||
4 | usr/share/gnunet/config.d/ | ||
5 | usr/bin/gnunet-bugreport | ||
6 | usr/bin/gnunet-ecc | ||
7 | 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: | |||
15 | override_dh_auto_build-indep: | 15 | override_dh_auto_build-indep: |
16 | 16 | ||
17 | override_dh_auto_test: | 17 | override_dh_auto_test: |
18 | # Disabling test suite, incomplete | 18 | # Disabling test suite, incomplete |
19 | 19 | ||
20 | override_dh_auto_install-arch: | 20 | override_dh_auto_install-arch: |
21 | dh_auto_install | 21 | dh_auto_install |
22 | 22 | ||
23 | # Create config file | 23 | # Create config file |
24 | mkdir -p debian/tmp/etc | 24 | mkdir -p debian/tmp/etc |
25 | cp debian/etc/gnunet.conf debian/tmp/etc/ | 25 | cp debian/etc/gnunet.conf debian/tmp/etc/ |
26 | 26 | ||
27 | # Removing useless files | 27 | # Removing useless files |
28 | rm -f debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/*.la \ | 28 | rm -f debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/*.la \ |
29 | debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/gnunet/*.la \ | 29 | debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/gnunet/*.la \ |
30 | debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/gnunet/nss/*.la \ | 30 | debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/gnunet/nss/*.la \ |
@@ -45,3 +45,8 @@ override_dh_auto_clean: | |||
45 | dh_auto_clean | 45 | dh_auto_clean |
46 | rm -rf contrib/gnunet_janitor.py contrib/gnunet_pyexpect.py libltdl/ \ | 46 | rm -rf contrib/gnunet_janitor.py contrib/gnunet_pyexpect.py libltdl/ \ |
47 | src/integration-tests/*.py | 47 | src/integration-tests/*.py |
48 | |||
49 | # Remove files already present in libgnunet from main gnunet package | ||
50 | override_dh_install: | ||
51 | dh_install | ||
52 | cd debian/libgnunet; find . -type f -exec rm -f ../gnunet/{} \; | ||