From 8ab6d79dde1c57e6ce61104ce3810a675bc6c80d Mon Sep 17 00:00:00 2001 From: rishwanth1995 <rishwanthsenthilkumar@hotmail.com> Date: Mon, 12 Feb 2018 15:45:11 -0500 Subject: [PATCH] made sqlite to newer version and removed autoconfigure from rules --- bindings/java/build.xml | 1 - bindings/java/ivy.xml | 2 +- debian/rules | 12 +++--------- debian/sleuthkit-java.install | 3 +-- 4 files changed, 5 insertions(+), 13 deletions(-) diff --git a/bindings/java/build.xml b/bindings/java/build.xml index e87636101..d96d029ae 100755 --- a/bindings/java/build.xml +++ b/bindings/java/build.xml @@ -74,7 +74,6 @@ </fileset> <pathelement path="${build}"/> </path> - <echo message="hey"/> </target> <target name="set-library-path-offline" description="set the library path when the user is offline" if="offline"> diff --git a/bindings/java/ivy.xml b/bindings/java/ivy.xml index b28852837..90b2b3261 100644 --- a/bindings/java/ivy.xml +++ b/bindings/java/ivy.xml @@ -3,7 +3,7 @@ <dependencies> <dependency org="junit" name="junit" rev="4.8.2"/> <dependency org="com.googlecode.java-diff-utils" name="diffutils" rev="1.2.1"/> - <dependency org="org.xerial" name="sqlite-jdbc" rev="3.8.11"> + <dependency org="org.xerial" name="sqlite-jdbc" rev="3.21.0.1"> <artifact name="sqlite-jdbc" type="jar" /> </dependency> <dependency org="org.postgresql" name="postgresql" rev="9.4.1211.jre7" > diff --git a/debian/rules b/debian/rules index 466d90831..8ae083b9d 100755 --- a/debian/rules +++ b/debian/rules @@ -23,13 +23,7 @@ export DEB_LDFLAGS_MAINT_APPEND = -lsqlite3 -lsupc++ -Wl,--as-needed #override_dh_auto_configure: # dh_auto_configure -- # -DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH) - -override_dh_auto_configure: - dh_auto_configure -- --enable-offline=yes -override_dh_auto_install: - cd tsk/ - sudo make install - cd .. - cd bindings/java/ - sudo make install +overide_dh_auto_install: dh_install + + diff --git a/debian/sleuthkit-java.install b/debian/sleuthkit-java.install index 67b5aefc5..cab26ee97 100644 --- a/debian/sleuthkit-java.install +++ b/debian/sleuthkit-java.install @@ -1,4 +1,3 @@ -bindings/java/thirdpartyjars/sqlite-jdbc-3.21.0.1.jar /usr/share/java +bindings/java/lib/sqlite-jdbc-3.21.0.1.jar /usr/share/java bindings/java/dist/sleuthkit-4.6.0.jar /usr/share/java -bindings/java/libtsk.so /usr/lib/ -- GitLab