[Git][java-team/javacc][master] 6 commits: Standards-Version updated to 4.6.1

[Emmanuel Bourg (@ebourg)]

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


Commits:
59580df9 by Emmanuel Bourg at 2022-05-13T01:31:54+02:00
Standards-Version updated to 4.6.1

- - - - -
8c90649e by Emmanuel Bourg at 2022-05-13T01:32:28+02:00
Switch to debhelper level 13

- - - - -
e1356b38 by Emmanuel Bourg at 2022-05-13T01:41:21+02:00
Fixed the watch file

- - - - -
f5bae6f4 by Emmanuel Bourg at 2022-05-13T01:46:15+02:00
No longer parse dpkg-parsechangelog in debian/rules

- - - - -
72a14a0b by Emmanuel Bourg at 2022-05-13T07:55:47+02:00
Do not run the tests if the nocheck option is specified

- - - - -
2d91090e by Emmanuel Bourg at 2022-05-13T07:59:15+02:00
Upload to unstable

- - - - -


4 changed files:

- debian/changelog
- debian/control
- debian/rules
- debian/watch


Changes:

=====================================
debian/changelog
=====================================
@@ -1,15 +1,19 @@
-javacc (5.0-9) UNRELEASED; urgency=medium
+javacc (5.0-9) unstable; urgency=medium
 
+  [ Debian Janitor ]
   * Trim trailing whitespace.
   * Use secure copyright file specification URI.
   * Use secure URI in Homepage field.
-  * Update standards version to 4.1.1, no changes needed.
-  * Bump debhelper from old 10 to 12.
-  * Set debhelper-compat version in Build-Depends.
   * Update Vcs-* headers from URL redirect.
   * Use canonical URL in Vcs-Git.
 
- -- Debian Janitor <janitor at jelmer.uk>  Tue, 19 Nov 2019 05:40:08 +0000
+  [ Emmanuel Bourg ]
+  * Standards-Version updated to 4.6.1
+  * Switch to debhelper level 13
+  * Fixed the watch file
+  * Do not run the tests if the nocheck option is specified
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Fri, 13 May 2022 07:55:56 +0200
 
 javacc (5.0-8) unstable; urgency=medium
 


=====================================
debian/control
=====================================
@@ -6,13 +6,13 @@ Uploaders: Emmanuel Bourg <ebourg at apache.org>
 Build-Depends:
  ant,
  ant-optional,
- debhelper-compat (= 12),
+ debhelper-compat (= 13),
  default-jdk,
  docbook-to-man,
  junit,
  libxalan2-java,
  maven-repo-helper
-Standards-Version: 4.1.1
+Standards-Version: 4.6.1
 Vcs-Git: https://salsa.debian.org/java-team/javacc.git
 Vcs-Browser: https://salsa.debian.org/java-team/javacc
 Homepage: https://javacc.org


=====================================
debian/rules
=====================================
@@ -1,18 +1,17 @@
 #!/usr/bin/make -f
 
-VERSION=$(shell dpkg-parsechangelog | sed -rne 's,^Version: ([^-]+).*,\1,p')
+include /usr/share/dpkg/pkg-info.mk
 
 %:
 	dh $@ --with maven-repo-helper
 
 override_dh_auto_build:
-	dh_auto_build -- jar update-bootstrap -Dversion=$(VERSION)
+	dh_auto_build -- jar update-bootstrap -Dversion=$(DEB_VERSION_UPSTREAM)
 	dh_auto_build -- clean
 	dh_auto_build -- jar
 	docbook-to-man debian/manpage.sgml >bin/javacc.1
 
 override_dh_auto_test:
+ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 	dh_auto_build -- unittest
-
-get-orig-source:
-	uscan --download-current-version --force-download --rename --repack --compression xz
+endif


=====================================
debian/watch
=====================================
@@ -1,3 +1,3 @@
-version=3
-opts=uversionmangle=s/_/./g \
-https://github.com/javacc/javacc/tags .*/release_(\d_[\d_]+).tar.gz
+version=4
+opts="mode=git,uversionmangle=s/_/./g;s/(\d)(\d)/$1.$2/" \
+https://github.com/javacc/javacc refs/tags/(?:release_|javacc-)?(\d[\d_.]+)



View it on GitLab: https://salsa.debian.org/java-team/javacc/-/compare/447aa4f6d544e5b69283ac586363fa1596c4cd3e...2d91090e46701e4579328088934f3c86c3496491

-- 
View it on GitLab: https://salsa.debian.org/java-team/javacc/-/compare/447aa4f6d544e5b69283ac586363fa1596c4cd3e...2d91090e46701e4579328088934f3c86c3496491
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/20220513/541f6190/attachment.htm>