[libeufin] branch master updated: debian

[gnunet]

This is an automated email from the git hooks/post-receive script.

dold pushed a commit to branch master
in repository libeufin.

The following commit(s) were added to refs/heads/master by this push:
     new 36175972 debian
36175972 is described below

commit 36175972ebd4cb6e5013ba4a9065ef07589b5c2f
Author: Florian Dold <florian@dold.me>
AuthorDate: Wed Oct 4 19:25:45 2023 +0200

    debian
---
 build-system/taler-build-scripts |  2 +-
 contrib/wallet-core              |  2 +-
 debian/rules                     | 37 +++----------------------------------
 3 files changed, 5 insertions(+), 36 deletions(-)

diff --git a/build-system/taler-build-scripts b/build-system/taler-build-scripts
index 47f14fcf..001f5dd0 160000
--- a/build-system/taler-build-scripts
+++ b/build-system/taler-build-scripts
@@ -1 +1 @@
-Subproject commit 47f14fcf1d03d9dad1bae59987488ea05ecd307b
+Subproject commit 001f5dd081fc8729ff8def90c4a1c3f93eb8689a
diff --git a/contrib/wallet-core b/contrib/wallet-core
index e65bbfc4..1708d49a 160000
--- a/contrib/wallet-core
+++ b/contrib/wallet-core
@@ -1 +1 @@
-Subproject commit e65bbfc4e162f16cd0d1a0b92ecc86ebb6b73bd2
+Subproject commit 1708d49a2d5da1f325173a030695223e5a24e75c
diff --git a/debian/rules b/debian/rules
index 7e81b0be..5e7a5c98 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,7 +13,7 @@ FULLVER = $(DEB_VERSION_UPSTREAM)$(DEV)
        dh ${@}
 
 clean:
-       rm -rf libeufin-$(FULLVER)
+       rm -rf libeufin-bank-$(FULLVER)
 
 # Override the build step, because we current need to do it manually
 # outside the regular Debian package build.
@@ -24,14 +24,9 @@ override_dh_auto_test:
 override_dh_auto_configure:
        true
 override_dh_auto_install:
-       unzip build/distributions/libeufin-$(FULLVER).zip
-       dh_install libeufin-$(FULLVER)/lib/nexus-$(FULLVER)-all.jar 
$(LIBEUFIN_HOME)/lib
-       dh_install libeufin-$(FULLVER)/lib/bank-$(FULLVER)-all.jar 
$(LIBEUFIN_HOME)/lib
-       install -D -m755 libeufin-$(FULLVER)/bin/libeufin-cli 
debian/libeufin/$(LIBEUFIN_HOME)/bin/libeufin-cli
-       install -D -m755 libeufin-$(FULLVER)/bin/libeufin-nexus 
debian/libeufin/$(LIBEUFIN_HOME)/bin/libeufin-nexus
+       unzip build/distributions/libeufin-bank-$(FULLVER).zip
+       dh_install libeufin-$(FULLVER)/lib/* $(LIBEUFIN_HOME)/lib
        install -D -m755 libeufin-$(FULLVER)/bin/libeufin-bank 
debian/libeufin/$(LIBEUFIN_HOME)/bin/libeufin-bank
-       dh_link $(LIBEUFIN_HOME)/bin/libeufin-cli /usr/bin/libeufin-cli
-       dh_link $(LIBEUFIN_HOME)/bin/libeufin-nexus /usr/bin/libeufin-nexus
        dh_link $(LIBEUFIN_HOME)/bin/libeufin-bank /usr/bin/libeufin-bank
 
 # Override this step because it's very slow and likely
@@ -43,32 +38,6 @@ override_dh_install:
        dh_install
 # Needs to be called manually for debhelper-compat < 13
        dh_installtmpfiles
-# Reorganize files
-       mkdir -p debian/libeufin-nexus/usr/share/libeufin/lib/
-       mv debian/libeufin-common/usr/share/libeufin/lib/nexus-*.jar \
-           debian/libeufin-nexus/usr/share/libeufin/lib/
-       mkdir -p debian/libeufin-nexus/usr/bin/
-       mv debian/libeufin-common/usr/bin/libeufin-nexus \
-           debian/libeufin-nexus/usr/bin/
-       mkdir -p debian/libeufin-nexus/usr/share/libeufin/bin/
-       mv debian/libeufin/usr/share/libeufin/bin/libeufin-nexus \
-           debian/libeufin-nexus/usr/share/libeufin/bin/
-
-       mkdir -p debian/libeufin-bank/usr/share/libeufin/lib/
-       mv debian/libeufin-common/usr/share/libeufin/lib/bank-*.jar \
-           debian/libeufin-bank/usr/share/libeufin/lib/
-       mkdir -p debian/libeufin-bank/usr/bin/
-       mv debian/libeufin-common/usr/bin/libeufin-bank \
-           debian/libeufin-bank/usr/bin/
-       mkdir -p debian/libeufin-bank/usr/share/libeufin/bin/
-       mv debian/libeufin/usr/share/libeufin/bin/libeufin-bank \
-           debian/libeufin-bank/usr/share/libeufin/bin/
-
-       mkdir -p debian/libeufin-common/usr/share/libeufin/bin/
-       mv debian/libeufin/usr/share/libeufin/bin/libeufin-cli \
-           debian/libeufin-common/usr/share/libeufin/bin/
-
-       rm -rf debian/libeufin/
 
 override_dh_installsystemd:
        # Need to specify units manually, since we have multiple

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.