[Git][java-team/josql][master] 5 commits: Standards-Version updated to 4.6.1

[Emmanuel Bourg (@ebourg)]

Emmanuel Bourg pushed to branch master at Debian Java Maintainers / josql


Commits:
60fe1e81 by Emmanuel Bourg at 2022-05-16T00:35:48+02:00
Standards-Version updated to 4.6.1

- - - - -
cf242fff by Emmanuel Bourg at 2022-05-16T00:35:53+02:00
Switch to debhelper level 13

- - - - -
6babdb39 by Emmanuel Bourg at 2022-05-16T00:35:58+02:00
Use salsa.debian.org Vcs-* URLs

- - - - -
702957dd by Emmanuel Bourg at 2022-05-16T00:42:36+02:00
Build with javacc5

- - - - -
18a83e7a by Emmanuel Bourg at 2022-05-16T00:42:51+02:00
Upload to unstable

- - - - -


6 changed files:

- debian/changelog
- − debian/compat
- debian/control
- − debian/patches/javacc.diff
- debian/patches/series
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,13 @@
+josql (2.2+dfsg-2) unstable; urgency=medium
+
+  * Team upload.
+  * Build with javacc5
+  * Standards-Version updated to 4.6.1
+  * Switch to debhelper level 13
+  * Use salsa.debian.org Vcs-* URLs
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Mon, 16 May 2022 00:42:43 +0200
+
 josql (2.2+dfsg-1) unstable; urgency=medium
 
   * Team upload.


=====================================
debian/compat deleted
=====================================
@@ -1 +0,0 @@
-10


=====================================
debian/control
=====================================
@@ -6,14 +6,14 @@ Uploaders:
  Damien Raude-Morvan <drazzib at debian.org>
 Build-Depends:
  ant,
- debhelper (>= 10),
+ debhelper-compat (= 13),
  default-jdk,
- javacc,
+ javacc5,
  libgentlyweb-utils-java,
  maven-repo-helper (>= 1.5)
-Standards-Version: 4.1.2
-Vcs-Git: https://anonscm.debian.org/git/pkg-java/josql.git
-Vcs-Browser: https://anonscm.debian.org/git/pkg-java/josql.git
+Standards-Version: 4.6.1
+Vcs-Git: https://salsa.debian.org/java-team/josql.git
+Vcs-Browser: https://salsa.debian.org/java-team/josql
 Homepage: http://josql.sourceforge.net/
 
 Package: libjosql-java


=====================================
debian/patches/javacc.diff deleted
=====================================
@@ -1,15 +0,0 @@
-Description: Use /usr/share/java/ as JavaCC home directory (for ant task).
-Author: Damien Raude-Morvan <drazzib at debian.org>
-Last-Update: 2011-06-19
-Forwarded: not-needed
---- a/build.xml
-+++ b/build.xml
-@@ -44,7 +44,7 @@
- 
-   <target name="javacc" depends="init">
-     <javacc target="data/josql.jj"
--            javacchome="${pathStart}/reference/java/javacc/javacc-4.0"
-+	    javacchome="/usr/share/java/"
-             outputdirectory="src/org/josql/parser" />
-   </target>
- 


=====================================
debian/patches/series
=====================================
@@ -1,2 +1 @@
-javacc.diff
 javadoc_links.diff


=====================================
debian/rules
=====================================
@@ -14,18 +14,18 @@ export CLASSPATH=/usr/share/java/gentlyweb-utils.jar
 	dh $@ --buildsystem=ant --with maven_repo_helper
 
 override_dh_auto_clean:
-	-rm -rf 3rd-party-jars/*
+	-rm -rf 3rd-party-jars/* reference/java/javacc/javacc-4.0
 	ant cleanBuild
 
 override_dh_auto_build:
+	mkdir -p reference/java/javacc/javacc-4.0/
+	cp /usr/share/java/javacc5.jar reference/java/javacc/javacc-4.0/javacc.jar
+
 	-rm src/org/josql/parser/TokenMgrError.java
 	-rm src/org/josql/parser/ParseException.java
 	-rm src/org/josql/parser/Token.java
 	-rm src/org/josql/parser/JavaCharStream.java
-	ant javacc createJar
-
-get-orig-source:
-	uscan --download-version $(VERSION) --force-download --rename
+	ant javacc createJar -DpathStart=.
 
 get-orig-pom:
 	wget -O debian/pom.xml ${MAVEN_REPO}/${GROUP_ID}/${ARTIFACT_ID}/1.5/${ARTIFACT_ID}-1.5.pom



View it on GitLab: https://salsa.debian.org/java-team/josql/-/compare/1230b3aeff31a66a74faf69cbeedb3ebc7cb221c...18a83e7ab850399c3ba28e3b65a0c6382e367a31

-- 
View it on GitLab: https://salsa.debian.org/java-team/josql/-/compare/1230b3aeff31a66a74faf69cbeedb3ebc7cb221c...18a83e7ab850399c3ba28e3b65a0c6382e367a31
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/20220515/d97f5e5a/attachment.htm>