Gilles Filippini pushed to branch master at Debian Java Maintainers / jython
Commits: 7ae88f02 by Gilles Filippini at 2020-04-25T09:12:21+02:00 New upstream version 2.7.2+repack1 - - - - - 6401d556 by Gilles Filippini at 2020-04-25T09:13:11+02:00 Update upstream source from tag 'upstream/2.7.2+repack1' Update to upstream version '2.7.2+repack1' with Debian dir a92e9fec3e72f18c8d85880cdc2e1e05eec5961a - - - - - c771c8d4 by Gilles Filippini at 2020-04-25T10:39:13+02:00 Upload 2.7.2+repack1-1 to unstable - - - - - 7 changed files: - .hgtags - NEWS - build.gradle - build.xml - debian/changelog - debian/pom.xml → debian/pom.xml.in - debian/rules Changes: ===================================== .hgtags ===================================== @@ -113,3 +113,4 @@ dfc49bafbe79566bd54c8d417829e001ff2316ea v2.7.2a1 328e162ec1178fb38b81b342f84c1268bf21d7fb v2.7.2b1 b9b60766cabebf007b7584ec21a69b3f58587525 v2.7.2b2 6d3659465010fd2a8fb11a93953bae5bf9e9db80 v2.7.2b3 +1fcef1abf1d66abfef61a365d4fccef158d37fb7 v2.7.2rc1 ===================================== NEWS ===================================== @@ -6,6 +6,9 @@ of that version. For more details of issue [ n ], please see https://hg.python.org/jython, or for tags [ GH-n ] see https://github.com/jythontools/jython +Jython 2.7.2 + same as 2.7.2rc1 + Jython 2.7.2rc1 Bugs fixed - [ 2858 ] test_ssl failure due to embedding Bouncy Castle (doc change only) ===================================== build.gradle ===================================== @@ -45,7 +45,7 @@ import java.text.SimpleDateFormat // Versions are specified in this grammar: // <major> . <minor> ( . <micro> )? ( <release> <serial> )? ( - <word> )? -version = '2.7.2rc1' +version = '2.7.2' // Valid examples (please preserve in comments): //version = '2.7.2a2' ===================================== build.xml ===================================== @@ -106,10 +106,10 @@ informix.jar = ../support/jdbc-4.10.12.jar <property name="jython.major_version" value="2"/> <property name="jython.minor_version" value="7"/> <property name="jython.micro_version" value="2"/> - <property name="jython.release_level" value="${PY_RELEASE_LEVEL_GAMMA}"/> + <property name="jython.release_level" value="${PY_RELEASE_LEVEL_FINAL}"/> <!-- Zero at full release: one-up number for alpha, beta and candidate versions. --> - <property name="jython.release_serial" value="1"/> + <property name="jython.release_serial" value="0"/> </target> <target name="common-constants"> ===================================== debian/changelog ===================================== @@ -1,3 +1,11 @@ +jython (2.7.2+repack1-1) unstable; urgency=medium + + * New upstream release + * Auto-sync upstream version into pom.xml + * Improve build time classpath checks output + + -- Gilles Filippini <[email protected]> Sat, 25 Apr 2020 10:31:22 +0200 + jython (2.7.2~rc1+repack1-2) unstable; urgency=medium * Embed the modules into the jar ===================================== debian/pom.xml → debian/pom.xml.in ===================================== @@ -8,7 +8,7 @@ <artifactId>jython</artifactId> <packaging>jar</packaging> <name>Jython</name> - <version>2.7.2~rc1</version> + <version>@VERSION@</version> <url>http://www.jython.org/</url> <description> Jython is an implementation of the high-level, dynamic, object-oriented ===================================== debian/rules ===================================== @@ -7,15 +7,17 @@ # could work effectively and it doesn't need to be hardcoded into the launcher # script. +VERSION_UPSTREAM = $(shell dpkg-parsechangelog -S Version | sed -E 's/\+repack.*$$//') + # Extract upstream main.classpath -THEIR_MAIN_CLASSPATH := $(shell \ +THEIR_MAIN_CLASSPATH = $(shell \ ant -nouserlib -quiet get-their-main-classpath | \ head -1 | \ sed 's/^ *\[echo\] *//' \ ) # Extract upstream test.classpath -THEIR_TEST_CLASSPATH := $(shell \ +THEIR_TEST_CLASSPATH = $(shell \ ant -nouserlib -quiet get-their-test-classpath | \ head -1 | \ sed 's/^ *\[echo\] *//' \ @@ -43,29 +45,42 @@ their_to_our = $(shell \ ) # Fix main.classpath and test.classpath -OUR_MAIN_CLASSPATH := $(call their_to_our,$(THEIR_MAIN_CLASSPATH)) -OUR_TEST_CLASSPATH := $(call their_to_our,$(THEIR_TEST_CLASSPATH)) +OUR_MAIN_CLASSPATH = $(call their_to_our,$(THEIR_MAIN_CLASSPATH)) +OUR_TEST_CLASSPATH = $(call their_to_our,$(THEIR_TEST_CLASSPATH)) # Runtime classpath uses space as separator instead of ':' -OUR_RUNTIME_CLASSPATH := $(shell echo '$(OUR_MAIN_CLASSPATH)' | sed 's/:/ /g') +OUR_RUNTIME_CLASSPATH = $(shell echo '$(OUR_MAIN_CLASSPATH)' | sed 's/:/ /g') # Print and check classpaths to help finding missing dependencies -print_classpath = ls -1 $(foreach path,$(shell echo '$(1)' | sed 's/:/\n/g' | grep -v '$(CURDIR)/build/'),'$(path)') +print_classpath = echo '$(1)' | sed 's/:/\n/g' | sort | grep -v '$(CURDIR)/build/' +ls_classpath = ls -1 $(foreach path,$(shell echo '$(1)' | sed 's/:/\n/g' | grep -v '$(CURDIR)/build/'),'$(path)') check_classpath: @echo THEIR_MAIN @$(call print_classpath,$(THEIR_MAIN_CLASSPATH)) || true @echo OUR_MAIN - @$(call print_classpath,$(OUR_MAIN_CLASSPATH)) + @$(call ls_classpath,$(OUR_MAIN_CLASSPATH)) @echo THEIR_TEST @$(call print_classpath,$(THEIR_TEST_CLASSPATH)) || true @echo OUR_TEST - @$(call print_classpath,$(OUR_TEST_CLASSPATH)) + @$(call ls_classpath,$(OUR_TEST_CLASSPATH)) + +DEBIAN_IN = $(wildcard debian/*.in) +DEBIAN_OUT = $(patsubst %.in,%,$(DEBIAN_IN)) + +# Requested to prevent deletion of $(DEBIAN_OUT) files as intermediate files +.SECONDARY: $(DEBIAN_OUT) + +info: + @echo $(DEBIAN_OUT) +debian/%: debian/%.in + sed -e 's/@VERSION@/$(VERSION_UPSTREAM)/g' \ + $< >$@ %: dh $@ --with python2 --with javahelper --with jh-maven-repo-helper -override_dh_auto_configure: check_classpath +override_dh_auto_configure: check_classpath $(DEBIAN_OUT) dh_auto_configure override_dh_auto_build: @@ -92,6 +107,7 @@ override_dh_auto_build: override_dh_auto_clean: dh_auto_clean rm -rf extlibs + rm -f $(DEBIAN_OUT) override_jh_installlibs: jh_installlibs --version-strip="[+].*" View it on GitLab: https://salsa.debian.org/java-team/jython/-/compare/f04561e254ab2bae732987b6139d6b22d01c231a...c771c8d4e1d92511d31a7102dfb641c71022a363 -- View it on GitLab: https://salsa.debian.org/java-team/jython/-/compare/f04561e254ab2bae732987b6139d6b22d01c231a...c771c8d4e1d92511d31a7102dfb641c71022a363 You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ pkg-java-commits mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-commits
