summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--contrib/libeufin-bank.conf2
m---------contrib/wallet-core0
-rw-r--r--debian/README22
-rwxr-xr-xdebian/rules5
4 files changed, 7 insertions, 22 deletions
diff --git a/contrib/libeufin-bank.conf b/contrib/libeufin-bank.conf
index f0df8877..f1aa2b09 100644
--- a/contrib/libeufin-bank.conf
+++ b/contrib/libeufin-bank.conf
@@ -36,7 +36,7 @@ PORT = 8080
[libeufin-bankdb-postgres]
# Where are the SQL files to setup our tables?
-SQL_DIR = $DATADIR/sql/libeufin-bank/
+SQL_DIR = $DATADIR/sql/
# DB connection string
CONFIG = postgresql:///libeufinbank
diff --git a/contrib/wallet-core b/contrib/wallet-core
-Subproject 1708d49a2d5da1f325173a030695223e5a24e75
+Subproject 2347be694c713959528ad59f3f157d866d7ad42
diff --git a/debian/README b/debian/README
index c7c72d67..cd26f09c 100644
--- a/debian/README
+++ b/debian/README
@@ -1,19 +1,9 @@
-This is NOT a 'clean' Debian package.
+This is NOT a 'clean' Debian package, as it is not using the proper Javahelper
+tooling (https://wiki.debian.org/Java/Packaging#Gradle). It also requires an
+external run of the configure command.
-The DH build process with gradle passes "--offline" to Gradle and thus
-does not work with the libeufin build system.
+To build the package, you must run:
-Invoking the libeufin build system directly without the DH-magic
-results in some failures to create a lock file in /root/ by Gradle.
-
-Java builds are a mess.
-
-
-So to still generate a 'nice' Debian package, you
-must run:
-
-$ ./gradlew dist
+$ ./bootstrap
+$ ./configure --prefix=/usr
$ dpkg-buildpackage -rfakeroot -b -uc -us
-
-Basically, we take the 'binary' zip file generated by the first
-command as the "source" for dpkg. Yuckkee!
diff --git a/debian/rules b/debian/rules
index b0ad14f8..8624d208 100755
--- a/debian/rules
+++ b/debian/rules
@@ -23,11 +23,6 @@ override_dh_auto_test:
true
override_dh_auto_configure:
true
-override_dh_auto_install:
- unzip bank/build/distributions/libeufin-bank-$(FULLVER).zip
- dh_install libeufin-bank-$(FULLVER)/bin/* $(LIBEUFIN_HOME)/bin
- dh_install libeufin-bank-$(FULLVER)/lib/* $(LIBEUFIN_HOME)/lib
- dh_link $(LIBEUFIN_HOME)/bin/libeufin-bank /usr/bin/libeufin-bank
# Override this step because it's very slow and likely
# unnecessary for us.