Emmanuel Bourg pushed to branch master at Debian Java Maintainers / sacjava
Commits: b36ba67e by Emmanuel Bourg at 2021-02-22T14:22:20+01:00 Standards-Version updated to 4.5.1 - - - - - 558c209d by Emmanuel Bourg at 2021-02-22T14:22:25+01:00 Switch to debhelper level 13 - - - - - 1b368808 by Emmanuel Bourg at 2021-02-22T14:22:30+01:00 Use salsa.debian.org Vcs-* URLs - - - - - 0d32fb71 by Emmanuel Bourg at 2021-02-22T14:24:56+01:00 Use secure URLs - - - - - 9c35af19 by Emmanuel Bourg at 2021-02-22T14:29:31+01:00 Removed the -java-doc package - - - - - e8223cd6 by Emmanuel Bourg at 2021-02-22T14:42:26+01:00 Build with Maven instead of calling javac directly - - - - - 0a78d1d6 by Emmanuel Bourg at 2021-02-22T14:46:04+01:00 Upload to unstable - - - - - 12 changed files: - debian/changelog - debian/clean - − debian/compat - debian/control - debian/copyright - − debian/libsac-java-doc.doc-base - − debian/libsac-java-doc.install - debian/libsac-java.poms - + debian/maven.properties - debian/pom.xml - debian/rules - debian/watch Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,15 @@ +sacjava (1.3+dfsg-6) unstable; urgency=medium + + * Team upload. + * Build with Maven instead of calling javac directly + * Removed the -java-doc package + * Standards-Version updated to 4.5.1 + * Switch to debhelper level 13 + * Use salsa.debian.org Vcs-* URLs + * Use secure URLs + + -- Emmanuel Bourg <ebo...@apache.org> Mon, 22 Feb 2021 14:45:59 +0100 + sacjava (1.3+dfsg-5) unstable; urgency=medium * Team upload. ===================================== debian/clean ===================================== @@ -1,4 +1 @@ -org/w3c/css/sac/*.class -org/w3c/css/sac/helpers/*.class -doc/ -sac*.jar +pom.xml ===================================== debian/compat deleted ===================================== @@ -1 +0,0 @@ -10 ===================================== debian/control ===================================== @@ -7,32 +7,20 @@ Uploaders: Jakub Adam <jakub.a...@ktknet.cz> Build-Depends: bnd (>= 2.1.0), - debhelper (>= 10), + debhelper-compat (= 13), default-jdk, - maven-repo-helper -Standards-Version: 4.1.2 -Vcs-Git: https://anonscm.debian.org/git/pkg-java/sacjava.git -Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/sacjava.git -Homepage: http://www.w3.org/Style/CSS/SAC/ + maven-debian-helper +Standards-Version: 4.5.1 +Vcs-Git: https://salsa.debian.org/java-team/sacjava.git +Vcs-Browser: https://salsa.debian.org/java-team/sacjava +Homepage: https://www.w3.org/Style/CSS/SAC/ Package: libsac-java Architecture: all Depends: ${misc:Depends} -Suggests: libsac-java-doc Description: Simple API for CSS Java library SAC is a standard interface for CSS parser and supposed to work with CSS1, CSS2, CSS3 (currently under development) and other CSS derived languages. . This package contains the SAC Java library. - -Package: libsac-java-doc -Section: doc -Architecture: all -Depends: ${misc:Depends} -Description: Simple API for CSS Java library (documentation) - SAC is a standard interface for CSS parser and supposed to work - with CSS1, CSS2, CSS3 (currently under development) and other CSS derived - languages. - . - This package contains the SAC Java library javadoc documentation. ===================================== debian/copyright ===================================== @@ -1,5 +1,5 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ -Source: http://www.w3.org/Style/CSS/SAC/ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Source: https://www.w3.org/Style/CSS/SAC/ Files-Excluded: sac.jar doc/* ===================================== debian/libsac-java-doc.doc-base deleted ===================================== @@ -1,8 +0,0 @@ -Document: libsac-java -Title: Simple API for CSS programmer documentation -Abstract: Javadocs for Java version of SAC: The Simple API for CSS -Section: Programming/Java - -Format: HTML -Index: /usr/share/doc/libsac-java/api/index.html -Files: /usr/share/doc/libsac-java/api/*.html ===================================== debian/libsac-java-doc.install deleted ===================================== @@ -1 +0,0 @@ -doc/* usr/share/doc/libsac-java/api/ ===================================== debian/libsac-java.poms ===================================== @@ -1 +1 @@ -debian/pom.xml --has-package-version --java-lib --artifact=sac-1.3.jar +debian/pom.xml --has-package-version --java-lib ===================================== debian/maven.properties ===================================== @@ -0,0 +1 @@ +maven.compiler.release=7 ===================================== debian/pom.xml ===================================== @@ -28,4 +28,8 @@ <post>www-st...@w3.org</post> </mailingList> </mailingLists> + + <build> + <sourceDirectory>.</sourceDirectory> + </build> </project> ===================================== debian/rules ===================================== @@ -1,17 +1,13 @@ #!/usr/bin/make -f -JAVA_HOME=/usr/lib/jvm/default-java - %: - dh $@ --with maven-repo-helper - -override_dh_auto_build: - $(JAVA_HOME)/bin/javac -source 1.7 -target 1.7 `find org -name "*.java" | xargs` - $(JAVA_HOME)/bin/jar cvf sac-1.3.jar `find org -name "*.class" | xargs` - bnd wrap --properties debian/sac.bnd --output sac-1.3.jar.tmp sac-1.3.jar - mv sac-1.3.jar.tmp sac-1.3.jar + dh $@ --builsystem=maven - $(JAVA_HOME)/bin/javadoc -locale en -encoding UTF-8 -notimestamp -source 1.7 -d doc `find org -name "*.java" | xargs` +override_dh_auto_configure: + cp debian/pom.xml . + dh_auto_configure -get-orig-source: - uscan --force-download --download-current-version --rename --repack --compression xz --verbose +override_dh_auto_build: + dh_auto_build + bnd wrap --properties debian/sac.bnd --output target/sac-1.3.jar.tmp target/sac-1.3.jar + mv target/sac-1.3.jar.tmp target/sac-1.3.jar ===================================== debian/watch ===================================== @@ -1,3 +1,3 @@ -version=3 +version=4 opts=dversionmangle=s/\+dfsg\d*$// \ -http://www.w3.org/Style/CSS/SAC/ .*/sacjava-([\d.]+)\.zip +https://www.w3.org/Style/CSS/SAC/ .*/sacjava-([\d.]+)\.zip View it on GitLab: https://salsa.debian.org/java-team/sacjava/-/compare/49ee21776f1142c636dfc0b044281b60d079fa94...0a78d1d6d7ec76a0191c8f40cf3e4aac4511155c -- View it on GitLab: https://salsa.debian.org/java-team/sacjava/-/compare/49ee21776f1142c636dfc0b044281b60d079fa94...0a78d1d6d7ec76a0191c8f40cf3e4aac4511155c You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ pkg-java-commits mailing list pkg-java-comm...@alioth-lists.debian.net https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-commits