Tony Mancill pushed to branch master at Debian Java Maintainers / sunflow
Commits: 09423b3a by tony mancill at 2019-09-03T16:21:51Z Build-Depend on python3-all (Closes: #938599) - - - - - 1f1ec884 by tony mancill at 2019-09-03T16:21:58Z Use debhelper 12 - - - - - ad643eae by tony mancill at 2019-09-03T16:21:58Z Drop build-dep on cdbs - - - - - 52235dc9 by tony mancill at 2019-09-03T16:21:58Z Drop get-orig-source target from debian/rules - - - - - 403d4d59 by tony mancill at 2019-09-03T16:21:58Z Drop cdbs and use dh sequencer - - - - - fb20ae43 by tony mancill at 2019-09-03T16:21:58Z Update doc-base to for /usr/share/doc/libsunflow-java - - - - - 12dd7245 by tony mancill at 2019-09-03T16:21:58Z Remove variables related to get-orig-source in debian/rules - - - - - 9f53c49e by tony mancill at 2019-09-03T16:25:34Z Bump Standards-Version to 4.4.0 - - - - - c1e7919b by tony mancill at 2019-09-03T16:46:17Z Convert Blender3D sunflow_export.py from Python 2 -> 3 - - - - - 52d76d48 by tony mancill at 2019-09-03T16:46:17Z prepare changelog for upload to unstable - - - - - 602fd56a by tony mancill at 2019-09-04T03:22:45Z Correct tab indentation in sunflow_export.py - - - - - 9 changed files: - debian/changelog - debian/compat - debian/control - debian/copyright - debian/libsunflow-java-doc.doc-base.javadoc - + debian/patches/40_python3 - + debian/patches/50_python_consistent_indentation - debian/patches/series - debian/rules Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,16 @@ +sunflow (0.07.2.svn396+dfsg-18) unstable; urgency=medium + + * Build-Depend on python3-all (Closes: #938599) + * Drop get-orig-source target from debian/rules + * Remove variables related to get-orig-source in debian/rules + * Drop build-dep on cdbs and use dh sequencer + * Update doc-base to for /usr/share/doc/libsunflow-java + * Use debhelper 12 + * Bump Standards-Version to 4.4.0 + * Convert Blender3D sunflow_export.py from Python 2 -> 3 + + -- tony mancill <[email protected]> Tue, 03 Sep 2019 09:25:01 -0700 + sunflow (0.07.2.svn396+dfsg-17) unstable; urgency=medium * Team upload. ===================================== debian/compat ===================================== @@ -1 +1 @@ -10 +12 ===================================== debian/control ===================================== @@ -6,14 +6,13 @@ Uploaders: tony mancill <[email protected]> Build-Depends: ant, - cdbs (>= 0.4.90~), - debhelper (>= 10), + debhelper (>= 12), default-jdk, dh-python, - python (>= 2.6.6-3~) + python3-all Build-Depends-Indep: janino -Standards-Version: 4.1.4 +Standards-Version: 4.4.0 Homepage: http://sunflow.sourceforge.net/ Vcs-Git: https://salsa.debian.org/java-team/sunflow.git Vcs-Browser: https://salsa.debian.org/java-team/sunflow @@ -24,7 +23,7 @@ Depends: default-jre | java8-runtime, libsunflow-java, ${misc:Depends}, - ${python:Depends} + ${python3:Depends} Replaces: libsunflow-java (= 0.07.2.svn396+dfsg-2) Description: rendering system for photo-realistic image synthesis (GUI) ===================================== debian/copyright ===================================== @@ -2,6 +2,9 @@ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: Sunflow - rendering system for photo-realistic image synthesis Upstream-Contact: Christopher Kulla <[email protected]> Source: http://sunflow.sourceforge.net/ +Files-Excluded: + *.jar + *.class Files: * Copyright: 2003-2008, Christopher Kulla <[email protected]> ===================================== debian/libsunflow-java-doc.doc-base.javadoc ===================================== @@ -5,6 +5,6 @@ Abstract: This the API JavaDoc for sunflow Section: Programming Format: HTML -Index: /usr/share/doc/libsunflow-java-doc/api/index.html -Files: /usr/share/doc/libsunflow-java-doc/api/* +Index: /usr/share/doc/libsunflow-java/api/index.html +Files: /usr/share/doc/libsunflow-java/api/* ===================================== debian/patches/40_python3 ===================================== The diff for this file was not included because it is too large. ===================================== debian/patches/50_python_consistent_indentation ===================================== The diff for this file was not included because it is too large. ===================================== debian/patches/series ===================================== @@ -1,3 +1,5 @@ 10_to_use_system_janino 20_split 30_sweethome3d +40_python3 +50_python_consistent_indentation ===================================== debian/rules ===================================== @@ -1,22 +1,21 @@ #!/usr/bin/make -f -include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/ant.mk - -NAME := sunflow -VERSION := $(shell dpkg-parsechangelog| sed -n '/^Version/{s/Version: \(.*\)-[0-9]*$$/\1/;s/+dfsg//p}') -SVNREV := $(shell echo $(VERSION)|sed -n 's/.*svn\([0-9]*\)/\1/p') -TMPDIR := $(NAME)-$(VERSION) -TAR := ../$(NAME)_$(VERSION)+dfsg.orig.tar.gz +include /usr/share/dpkg/pkg-info.mk +UPSTREAM_VERSION = $(shell echo $(DEB_VERSION_UPSTREAM) | sed -e 's/.dfsg$$//') JAVA_HOME := /usr/lib/jvm/default-java -DEB_JARS := janino -DEB_ANT_BUILD_TARGET = jars javadoc +%: + dh $@ --buildsystem=ant -UPSTREAM_VERSION = $(shell echo $(DEB_UPSTREAM_VERSION) | sed -e 's/.dfsg$$//') +override_dh_auto_build: + dh_auto_build + pod2man --center='SUNFLOW DOCUMENTATION' \ + --release=$(UPSTREAM_VERSION) \ + debian/sunflow.pod -o debian/sunflow.1 -install/libsunflow-java:: +override_dh_auto_install: + #install/libsunflow-java:: # If case to avoid build failure when resuming the build # at the install step if [ ! -f release/sunflow-$(UPSTREAM_VERSION).jar ] ; then \ @@ -26,7 +25,7 @@ install/libsunflow-java:: dh_link -plibsunflow-java usr/share/java/sunflow-$(UPSTREAM_VERSION).jar \ usr/share/java/sunflow.jar -install/sunflow:: + #install/sunflow:: # If case to avoid build failure when resuming the build # at the install step if [ ! -f release/sunflowGUI-$(UPSTREAM_VERSION).jar ] ; then \ @@ -57,27 +56,8 @@ install/sunflow:: debian/sunflow/usr/share/icons/hicolor/scalable/apps # Not using python-distutils.mk, calling manually - dh_python2 /usr/share/blender/scripts/sunflow + dh_python3 /usr/share/blender/scripts/sunflow -install/libsunflow-java-doc:: # Javadoc mv release/javadoc release/api dh_installdocs -plibsunflow-java-doc release/api - -build/sunflow:: - pod2man --center='SUNFLOW DOCUMENTATION' \ - --release=$(UPSTREAM_VERSION) \ - debian/sunflow.pod -o debian/sunflow.1 - -clean:: - rm -f debian/sunflow.1 - -get-orig-source: - mkdir $(TMPDIR) - -rm $(TAR) - svn export --force -r $(SVNREV) https://$(NAME).svn.sourceforge.net/svnroot/$(NAME)/trunk $(TMPDIR) - echo "The following files will not be included in Debian tarball:" - cd $(TMPDIR) && find . \( -name '*.class' -o -name '*.jar' \) -print - ZIP=--best tar --exclude-vcs --exclude *.jar --exclude *.class -zcf $(TAR) $(TMPDIR) - rm -rf $(TMPDIR) - View it on GitLab: https://salsa.debian.org/java-team/sunflow/compare/25aa7450a3c5a1fa1e3d18a94936be8fcd5c9730...602fd56acf49d7a1e8d500231b05bfdc0cb91050 -- View it on GitLab: https://salsa.debian.org/java-team/sunflow/compare/25aa7450a3c5a1fa1e3d18a94936be8fcd5c9730...602fd56acf49d7a1e8d500231b05bfdc0cb91050 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
