Andrius Merkys pushed to branch master at Debian Java Maintainers / jep
Commits: be5f098a by Andrius Merkys at 2019-08-12T07:40:39Z Adding an ITP bug number. - - - - - cd7daf30 by Andrius Merkys at 2019-08-12T07:48:57Z Building and installing javadoc documentation. - - - - - 6233ad7e by Andrius Merkys at 2019-08-12T07:49:58Z Folding overlong lines in long description. - - - - - dbb6d090 by Andrius Merkys at 2019-08-12T08:03:36Z Linking jquery files over embedded ones. - - - - - 3a4319c7 by Andrius Merkys at 2019-08-12T08:11:05Z Determining JAR file name from upstream version. - - - - - 4 changed files: - debian/changelog - debian/control - debian/libjep-java-doc.javadoc - debian/rules Changes: ===================================== debian/changelog ===================================== @@ -1,5 +1,5 @@ jep (2.4.1+ds-1) unstable; urgency=low - * Initial release. (Closes: #XXXXXX) + * Initial release. (Closes: #934544) -- Andrius Merkys <mer...@debian.org> Mon, 12 Aug 2019 02:36:58 -0400 ===================================== debian/control ===================================== @@ -23,23 +23,27 @@ Depends: Recommends: ${java:Recommends}, Description: Java Expression Parser - Jep Java parses and evaluates mathematical expressions with only a few lines of - code. This package allows your users to enter a formula as a string, and + Jep Java parses and evaluates mathematical expressions with only a few lines + of code. This package allows your users to enter a formula as a string, and instantly evaluate it. Jep supports user defined variables, constants, and - functions. A number of common mathematical functions and constants are included. + functions. A number of common mathematical functions and constants are + included. Package: libjep-java-doc Architecture: all Section: doc Depends: + libjs-jquery, + libjs-jquery-ui, ${java:Depends}, ${misc:Depends}, Recommends: ${java:Recommends}, Description: Java Expression Parser - documentation - Jep Java parses and evaluates mathematical expressions with only a few lines of - code. This package allows your users to enter a formula as a string, and + Jep Java parses and evaluates mathematical expressions with only a few lines + of code. This package allows your users to enter a formula as a string, and instantly evaluate it. Jep supports user defined variables, constants, and - functions. A number of common mathematical functions and constants are included. + functions. A number of common mathematical functions and constants are + included. . This package contains the Javadoc API ===================================== debian/libjep-java-doc.javadoc ===================================== @@ -1 +1 @@ -<javadoc build dir here> +doc/javadoc ===================================== debian/rules ===================================== @@ -1,16 +1,34 @@ #!/usr/bin/make -f +include /usr/share/dpkg/pkg-info.mk + export JAVA_HOME=/usr/lib/jvm/default-java export JAVACCHOME=/usr/share/java # Put depended upon jars in here export CLASSPATH=/usr/share/java/jama.jar +UPSTREAM_VER := $(shell echo $(DEB_VERSION_UPSTREAM) | cut -d + -f 1) +JQUERY_DIR = $(CURDIR)/debian/libjep-java-doc/usr/share/doc/libjep-java-doc/api/jquery + %: dh $@ --with javahelper override_dh_auto_build: - dh_auto_build -- jar + dh_auto_build -- jar javadoc override_jh_installlibs: - jh_installlibs dist/jep-2.4.1.jar + jh_installlibs dist/jep-$(UPSTREAM_VER).jar + +override_dh_installdocs: + dh_installdocs + ln -fs /usr/share/javascript/jquery/jquery.js ${JQUERY_DIR}/external/jquery/jquery.js + ln -fs /usr/share/javascript/jquery/jquery.js ${JQUERY_DIR}/jquery-3*.js + ln -fs /usr/share/javascript/jquery-ui/themes/base/jquery-ui.css ${JQUERY_DIR}/jquery-ui.css + ln -fs /usr/share/javascript/jquery-ui/jquery-ui.js ${JQUERY_DIR}/jquery-ui.js + ln -fs /usr/share/javascript/jquery-ui/themes/base/jquery-ui.min.css ${JQUERY_DIR}/jquery-ui.min.css + ln -fs /usr/share/javascript/jquery-ui/jquery-ui.min.js ${JQUERY_DIR}/jquery-ui.min.js + +override_dh_clean: + rm -rf doc/javadoc + dh_clean View it on GitLab: https://salsa.debian.org/java-team/jep/compare/d8bc8962b43af8be302a203142d4fd88dac2b768...3a4319c724e95d2ba7e78eeed8a0ddeb5ce28f26 -- View it on GitLab: https://salsa.debian.org/java-team/jep/compare/d8bc8962b43af8be302a203142d4fd88dac2b768...3a4319c724e95d2ba7e78eeed8a0ddeb5ce28f26 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