[Pkg-freeipa-devel] [Git][freeipa-team/ldapjdk][master] rules: Run build using ant again, and use config options to specify paths to...

[Timo Aaltonen (@tjaalton)]

Timo Aaltonen pushed to branch master at FreeIPA packaging / ldapjdk


Commits:
bda035b8 by Timo Aaltonen at 2021-10-19T11:38:44+03:00
rules: Run build using ant again, and use config options to specify paths to jss and slf4j, and drop the patch.

- - - - -


4 changed files:

- debian/changelog
- − debian/patches/fix-jar-paths.diff
- debian/patches/series
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+ldapjdk (5.0.0+dfsg1-2) UNRELEASED; urgency=medium
+
+  * rules: Run build using ant again, and use config options to
+    specify paths to jss and slf4j, and drop the patch.
+
+ -- Timo Aaltonen <tjaalton at debian.org>  Tue, 19 Oct 2021 11:00:52 +0300
+
 ldapjdk (5.0.0+dfsg1-1) unstable; urgency=medium
 
   * New upstream release.


=====================================
debian/patches/fix-jar-paths.diff deleted
=====================================
@@ -1,13 +0,0 @@
---- a/java-sdk/build.xml
-+++ b/java-sdk/build.xml
-@@ -63,8 +63,8 @@
-     <property name="package.dist"        value="${dist}/packages"/>
-     <property name="src"                 value="."/>
-     <property name="build"               value="build"/>
--    <property name="jss.lib"             value="/usr/lib/java/jss.jar"/>
--    <property name="slf4j.lib"           value="/usr/share/java/slf4j/slf4j-api.jar" />
-+    <property name="jss.lib"             value="/usr/share/java/jss.jar"/>
-+    <property name="slf4j.lib"           value="/usr/share/java/slf4j-api.jar" />
- 
-     <!-- we do not use the users existing classpath and instead build our own
-          comment the following line out if this is not desired -->


=====================================
debian/patches/series
=====================================
@@ -1,2 +1 @@
 #placeholder
-fix-jar-paths.diff


=====================================
debian/rules
=====================================
@@ -6,8 +6,10 @@ export JAVA_HOME=/usr/lib/jvm/default-java
 	dh $@ --with javahelper
 
 override_dh_auto_build:
-	./build.sh \
-		--work-dir=build \
+	ant -buildfile $(CURDIR)/java-sdk/build.xml \
+		-Ddist=../build \
+		-Djss.lib=/usr/share/java/jss.jar \
+		-Dslf4j.lib=/usr/share/java/slf4j-api.jar \
 		dist
 
 override_dh_clean:



View it on GitLab: https://salsa.debian.org/freeipa-team/ldapjdk/-/commit/bda035b83868160b55b4a0628eecaadc4c27787c

-- 
View it on GitLab: https://salsa.debian.org/freeipa-team/ldapjdk/-/commit/bda035b83868160b55b4a0628eecaadc4c27787c
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-freeipa-devel/attachments/20211019/9b443b7f/attachment-0001.htm>