[Git][java-team/libjson-java][master] 2 commits: Switch from cdbs to dh

[Andreas Tille (@tille)]

Andreas Tille pushed to branch master at Debian Java Maintainers / libjson-java


Commits:
2cbc18a9 by Andreas Tille at 2024-11-30T07:50:35+01:00
Switch from cdbs to dh

- - - - -
3205fe28 by Andreas Tille at 2024-11-30T07:51:00+01:00
Point watch file to Github

- - - - -


6 changed files:

- debian/changelog
- + debian/clean
- debian/compat
- debian/control
- debian/rules
- debian/watch


Changes:

=====================================
debian/changelog
=====================================
@@ -3,6 +3,8 @@ libjson-java (2.4-4) UNRELEASED; urgency=medium
   * Team upload.
   * Secure URL in Homepage field
   * Fix Vcs fields
+  * Switch from cdbs to dh
+  * Point watch file to Gitub
 
  -- Andreas Tille <tille at debian.org>  Sat, 30 Nov 2024 07:13:57 +0100
 


=====================================
debian/clean
=====================================
@@ -0,0 +1 @@
+*.jar


=====================================
debian/compat
=====================================
@@ -1 +1 @@
-9
+13


=====================================
debian/control
=====================================
@@ -5,7 +5,7 @@ Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.or
 Uploaders: Torsten Werner <twerner at debian.org>,
            Varun Hiremath <varun at debian.org>,
            Emmanuel Bourg <ebourg at apache.org>
-Build-Depends: ant, cdbs, debhelper (>= 9), default-jdk
+Build-Depends: ant, debhelper (>= 9), default-jdk, javahelper
 Build-Depends-Indep: groovy,
                      junit,
                      libcommons-beanutils-java,


=====================================
debian/rules
=====================================
@@ -1,21 +1,33 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/class/ant.mk
-include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/dpkg/default.mk
 
-JAVA_HOME         := /usr/lib/jvm/default-java
-DEB_ANT_BUILDFILE := debian/build.xml
-DEB_JARS          := groovy commons-lang oro commons-beanutils commons-logging \
-  commons-collections3 ezmorph xom junit
+JAVA_HOME     := /usr/lib/jvm/default-java
+export CLASSPATH=/usr/share/java/groovy \
+                 /usr/share/java/commons-lang \
+                 /usr/share/java/oro \
+                 /usr/share/java/commons-beanutils \
+                 /usr/share/java/commons-logging \
+                 /usr/share/java/commons-collections3 \
+                 /usr/share/java/ezmorph \
+                 /usr/share/java/xom \
+                 /usr/share/java/junit
 
-install/libjson-java:: 
-	install -m644 -D json-lib.jar \
-	  $(DEB_DESTDIR)/usr/share/java/json-lib-$(DEB_UPSTREAM_VERSION).jar
-	dh_link -plibjson-java /usr/share/java/json-lib-$(DEB_UPSTREAM_VERSION).jar \
-	  /usr/share/java/json-lib.jar
+%:
+	dh $@ --buildsystem=ant --with javahelper
+
+override_dh_auto_clean:
+	dh_auto_clean -- -f debian/build.xml
 
-clean::
-	rm -f *.jar
+override_dh_auto_build:
+	dh_auto_build -- -f debian/build.xml
 
-get-orig-source:
-	uscan --force-download --rename	
+override_dh_install:
+	dh_install
+	dh_install json-lib.jar \
+	  /usr/share/java/json-lib-$(DEB_VERSION_UPSTREAM).jar
+
+override_dh_link:
+	dh_link
+	dh_link -plibjson-java /usr/share/java/json-lib-$(DEB_VERSION_UPSTREAM).jar \
+	  /usr/share/java/json-lib.jar


=====================================
debian/watch
=====================================
@@ -1,3 +1,7 @@
-version=3
-http://sf.net/json-lib/ json-lib-(.*)-jdk15-sources.jar \
-  debian debian/orig-tar.sh
+version=4
+
+opts="filenamemangle=s%(?:.*?)?v?(\d[\d.]*)\.tar\.gz%@PACKAGE at -$1.tar.gz%" \
+   https://github.com/stleary/JSON-java/tags (?:.*?/)?v?(\d[\d.]*)\.tar\.gz
+
+#http://sf.net/json-lib/ json-lib-(.*)-jdk15-sources.jar \
+#  debian debian/orig-tar.sh



View it on GitLab: https://salsa.debian.org/java-team/libjson-java/-/compare/862987e011c4b44d8acbd0087d76e87b557e2d37...3205fe28117314a68257a0452ee423fe6a177fdf

-- 
View it on GitLab: https://salsa.debian.org/java-team/libjson-java/-/compare/862987e011c4b44d8acbd0087d76e87b557e2d37...3205fe28117314a68257a0452ee423fe6a177fdf
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/20241130/47953970/attachment.htm>