diff options
-rw-r--r-- | contrib/Makefile.inc | 3 | ||||
-rw-r--r-- | debian/changelog | 13 | ||||
-rw-r--r-- | debian/control | 1 | ||||
-rw-r--r-- | debian/gnunet.install | 4 | ||||
-rw-r--r-- | debian/libgnunet.install | 7 | ||||
-rw-r--r-- | src/gns/nss/Makefile.am | 4 |
6 files changed, 21 insertions, 11 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 42a019674..49f744aa4 100644 --- a/debian/changelog +++ b/debian/changelog | |||
@@ -1,3 +1,16 @@ | |||
1 | gnunet (0.14.0-4) unstable; urgency=medium | ||
2 | |||
3 | * Remove dependency of libgnunetutil on gnunet. | ||
4 | |||
5 | -- Christian Grothoff <grothoff@gnu.org> Mon, 15 Feb 2021 13:02:10 +0100 | ||
6 | |||
7 | gnunet (0.14.0-3) unstable; urgency=medium | ||
8 | |||
9 | * Reduce libgnunetutil dependencies. | ||
10 | * Modify package instructions to work on non-AMD64 architectures. | ||
11 | |||
12 | -- Christian Grothoff <grothoff@gnu.org> Mon, 15 Feb 2021 12:02:10 +0100 | ||
13 | |||
1 | gnunet (0.14.0-2) unstable; urgency=medium | 14 | gnunet (0.14.0-2) unstable; urgency=medium |
2 | 15 | ||
3 | * Bugfix in GMT conversion of GNUNET_TIME_year_to_time(). | 16 | * Bugfix in GMT conversion of GNUNET_TIME_year_to_time(). |
diff --git a/debian/control b/debian/control index dd401d2cc..01b549286 100644 --- a/debian/control +++ b/debian/control | |||
@@ -7,7 +7,6 @@ Build-Depends: | |||
7 | automake (>=1.11.1), | 7 | automake (>=1.11.1), |
8 | autopoint, | 8 | autopoint, |
9 | debhelper-compat (= 13), | 9 | debhelper-compat (= 13), |
10 | default-libmysqlclient-dev, | ||
11 | gettext, | 10 | gettext, |
12 | iptables, | 11 | iptables, |
13 | libbluetooth-dev, | 12 | libbluetooth-dev, |
diff --git a/debian/gnunet.install b/debian/gnunet.install index d3426b454..0de11b4c2 100644 --- a/debian/gnunet.install +++ b/debian/gnunet.install | |||
@@ -1,13 +1,11 @@ | |||
1 | etc/gnunet.conf | 1 | etc/gnunet.conf |
2 | usr/bin/ | 2 | usr/bin/ |
3 | usr/lib/*/gnunet/ | 3 | usr/lib/*/gnunet/ |
4 | usr/lib/*/*.so.* | ||
4 | usr/share/man/ | 5 | usr/share/man/ |
5 | usr/share/info/ | 6 | usr/share/info/ |
6 | usr/share/doc/gnunet/ | 7 | usr/share/doc/gnunet/ |
7 | usr/share/gnunet/ | 8 | usr/share/gnunet/ |
8 | usr/lib/x86_64-linux-gnu/gnunet/nss/libnss_gns.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/ | ||
10 | usr/lib/x86_64-linux-gnu/gnunet/nss/libnss_gns6.so.2 /usr/lib/x86_64-linux-gnu/ | ||
11 | debian/etc/skel/.config/ etc/skel/ | 9 | debian/etc/skel/.config/ etc/skel/ |
12 | debian/etc/skel/.config/gnunet.conf etc/skel/.config/ | 10 | debian/etc/skel/.config/gnunet.conf etc/skel/.config/ |
13 | debian/etc/skel/.config/systemd etc/skel/.config/ | 11 | debian/etc/skel/.config/systemd etc/skel/.config/ |
diff --git a/debian/libgnunet.install b/debian/libgnunet.install index 60cdebea9..9e7624b8a 100644 --- a/debian/libgnunet.install +++ b/debian/libgnunet.install | |||
@@ -1,6 +1,9 @@ | |||
1 | usr/lib/*/*.so.* | 1 | usr/lib/*/libgnunetcurl.so.* |
2 | usr/lib/*/libgnunetjson.so.* | ||
3 | usr/lib/*/libgnunetpq.so.* | ||
4 | usr/lib/*/libgnunetsq.so.* | ||
2 | usr/share/locale/ | 5 | usr/share/locale/ |
3 | usr/share/gnunet/config.d/ | 6 | usr/share/gnunet/config.d/util.conf |
4 | usr/bin/gnunet-bugreport | 7 | usr/bin/gnunet-bugreport |
5 | usr/bin/gnunet-ecc | 8 | usr/bin/gnunet-ecc |
6 | usr/bin/gnunet-config | 9 | usr/bin/gnunet-config |
diff --git a/src/gns/nss/Makefile.am b/src/gns/nss/Makefile.am index f4a12ddee..af0a8a2e2 100644 --- a/src/gns/nss/Makefile.am +++ b/src/gns/nss/Makefile.am | |||
@@ -22,9 +22,7 @@ EXTRA_DIST = map-file | |||
22 | 22 | ||
23 | AM_LDFLAGS=-avoid-version -module -export-dynamic | 23 | AM_LDFLAGS=-avoid-version -module -export-dynamic |
24 | 24 | ||
25 | nssdir = $(libdir)/gnunet/nss | 25 | lib_LTLIBRARIES = \ |
26 | |||
27 | nss_LTLIBRARIES = \ | ||
28 | libnss_gns.la \ | 26 | libnss_gns.la \ |
29 | libnss_gns4.la \ | 27 | libnss_gns4.la \ |
30 | libnss_gns6.la | 28 | libnss_gns6.la |