[Git][java-team/jep][master] 2 commits: Adding build depends on javacc.

Andrius Merkys gitlab at salsa.debian.org
Mon Aug 12 11:22:25 BST 2019



Andrius Merkys pushed to branch master at Debian Java Maintainers / jep


Commits:
5712988c by Andrius Merkys at 2019-08-12T09:25:21Z
Adding build depends on javacc.

- - - - -
dc71f7fd by Andrius Merkys at 2019-08-12T10:16:44Z
Force-regenerating jjtree-made files.

- - - - -


2 changed files:

- debian/control
- debian/rules


Changes:

=====================================
debian/control
=====================================
@@ -8,6 +8,7 @@ Build-Depends:
  ant,
  debhelper (>= 12),
  default-jdk,
+ javacc,
  javahelper (>= 0.72.9),
  junit,
  libjama-java,


=====================================
debian/rules
=====================================
@@ -15,6 +15,10 @@ JQUERY_DIR = $(CURDIR)/debian/libjep-java-doc/usr/share/doc/libjep-java-doc/api/
 	dh $@ --with javahelper
 
 override_dh_auto_build:
+	mkdir debian/old
+	mv src/org/nfunk/jep/Token.java src/org/nfunk/jep/TokenMgrError.java \
+		src/org/nfunk/jep/JavaCharStream.java src/org/nfunk/jep/ParseException.java \
+		debian/old/
 	dh_auto_build -- jar javadoc
 
 ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
@@ -35,5 +39,6 @@ override_dh_installdocs:
 	ln -fs /usr/share/javascript/jquery-ui/jquery-ui.min.js ${JQUERY_DIR}/jquery-ui.min.js
 
 override_dh_clean:
-	rm -rf doc/javadoc
+	-find debian/old -name '*.java' | xargs -i mv {} src/org/nfunk/jep/
+	rm -rf doc/javadoc debian/old
 	dh_clean



View it on GitLab: https://salsa.debian.org/java-team/jep/compare/62c49799f546f98d79ed218eb14a0b29392aae46...dc71f7fd4989acdbb5f67f11c7e3bb605855631a

-- 
View it on GitLab: https://salsa.debian.org/java-team/jep/compare/62c49799f546f98d79ed218eb14a0b29392aae46...dc71f7fd4989acdbb5f67f11c7e3bb605855631a
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/20190812/a25e0b04/attachment.html>


More information about the pkg-java-commits mailing list