[Git][java-team/xerial-sqlite-jdbc][master] 2 commits: Looking for the shared lib in the right place during build-time tests

[Pierre Gruet (@pgt)]

Pierre Gruet pushed to branch master at Debian Java Maintainers / xerial-sqlite-jdbc


Commits:
a888a106 by Pierre Gruet at 2022-02-14T22:11:51+01:00
Looking for the shared lib in the right place during build-time tests

- - - - -
cd33c490 by Pierre Gruet at 2022-02-14T23:29:00+01:00
Upload to unstable

- - - - -


3 changed files:

- debian/changelog
- debian/patches/test.patch
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+xerial-sqlite-jdbc (3.36.0.3+dfsg1-2) unstable; urgency=medium
+
+  * Removing build-dependency on debhelper
+  * Looking for the shared lib in the right place during build-time tests
+
+ -- Pierre Gruet <pgt at debian.org>  Mon, 14 Feb 2022 22:11:27 +0100
+
 xerial-sqlite-jdbc (3.36.0.3+dfsg1-1) unstable; urgency=medium
 
   * Initial release (Closes: #930333)


=====================================
debian/patches/test.patch
=====================================
@@ -19,7 +19,7 @@ Last-Update: 2022-01-07
              <artifactId>maven-surefire-plugin</artifactId>
              <version>${surefire.version}</version>
              <configuration>
-+                <argLine>-Djava.library.path=${project.basedir}/target/sqlite-${sqlite.version}-Linux-x86_64</argLine>
++                <argLine>-Djava.library.path=${project.basedir}/target/sqlite-${sqlite.version}-Linux-${build.architecture}</argLine>
                <!--  If enabled, will run the GraalVM tracing agent while running tests  -->
  <!--              <argLine>-agentlib:native-image-agent=config-output-dir=META-INF/native-image</argLine>-->
                <excludes>


=====================================
debian/rules
=====================================
@@ -22,10 +22,13 @@ override_dh_auto_clean:
 override_dh_auto_configure:
 	# Setting the version of installed sqlite3 lib in the VERSION file, using dpkg
 	# to get this version number.
+	# Also putting it in d/maven.properties...
 	cp VERSION VERSION.old
 	sqliteVersion=$$(dpkg -s libsqlite3-dev | grep "Version" | sed 's/Version: \(.*\)-.*/\1/') && \
 	        echo "version=$$sqliteVersion" > VERSION && \
 	        echo "sqlite.version=$$sqliteVersion" > debian/maven.properties
+	# Together with the architecture.
+	echo "build.architecture=$$(arch)" >> debian/maven.properties
 	dh_auto_configure
 
 override_dh_auto_build:



View it on GitLab: https://salsa.debian.org/java-team/xerial-sqlite-jdbc/-/compare/344c217c717fd9e52d5cc3cc9fecc5836aabfa1c...cd33c4906492c55852ee35db9a6a39d961be4acc

-- 
View it on GitLab: https://salsa.debian.org/java-team/xerial-sqlite-jdbc/-/compare/344c217c717fd9e52d5cc3cc9fecc5836aabfa1c...cd33c4906492c55852ee35db9a6a39d961be4acc
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20220214/cc995ee9/attachment.htm>