[Git][java-team/rhino][master] 6 commits: Update librhino-java.manifest

[Markus Koschany (@apo)]

Markus Koschany pushed to branch master at Debian Java Maintainers / rhino


Commits:
ec7c59ce by Markus Koschany at 2023-02-18T00:31:41+01:00
Update librhino-java.manifest

- - - - -
3ccba265 by Markus Koschany at 2023-02-18T00:39:47+01:00
Install the missing bundle resources.

Closes: #1031432

- - - - -
090371e3 by Markus Koschany at 2023-02-18T00:47:32+01:00
Update changelog

- - - - -
8b80169a by Markus Koschany at 2023-02-18T00:53:07+01:00
Fix bundle installation path

- - - - -
2a027718 by Markus Koschany at 2023-02-18T01:03:57+01:00
Update changelog

- - - - -
88c07ac0 by Markus Koschany at 2023-02-18T01:27:00+01:00
Don't install the source files

- - - - -


3 changed files:

- debian/changelog
- debian/librhino-java.manifest
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,12 @@
+rhino (1.7.14-2) unstable; urgency=medium
+
+  * Team upload.
+  * Update librhino-java.manifest so that it matches the upstream one.
+  * Install the missing bundle resources. This caused a runtime error when
+    running the rhino script. (Closes: #1031432)
+
+ -- Markus Koschany <apo at debian.org>  Sat, 18 Feb 2023 00:46:00 +0100
+
 rhino (1.7.14-1) unstable; urgency=medium
 
   * Team upload.


=====================================
debian/librhino-java.manifest
=====================================
@@ -2,9 +2,10 @@ usr/share/java/js.jar:
  Bundle-ManifestVersion: 2
  Bundle-Name: Rhino Javascript interpreter
  Bundle-Vendor: Mozilla Foundation
- Bundle-Version: 1.7
- Bundle-SymbolicName: org.mozilla.javascript
- Export-Package: org.mozilla.javascript;version="1.7",org.mozilla.javascript.annotations;version="1.7",org.mozilla.javascript.ast;version="1.7",org.mozilla.javascript;version="1.7",org.mozilla.javascript.commonjs.module;version="1.7",org.mozilla.javascript.commonjs.module.provider;version="1.7",org.mozilla.javascript.debug;version="1.7",org.mozilla.javascript.jdk13;version="1.7",org.mozilla.javascript.json;version="1.7",org.mozilla.javascript.optimizer;version="1.7",org.mozilla.javascript.regexp;version="1.7",org.mozilla.javascript.serialize;version="1.7",org.mozilla.javascript.tools;version="1.7",org.mozilla.javascript.tools.debugger;version="1.7",org.mozilla.javascript.tools.debugger.downloaded;version="1.7",org.mozilla.javascript.tools.debugger.treetable;version="1.7",org.mozilla.javascript.tools.idswitch;version="1.7",org.mozilla.javascript.tools.jsc;version="1.7",org.mozilla.javascript.tools.shell;version="1.7",org.mozilla.javascript.xml;version="1.7",org.mozilla.javascript.xmlimpl;version="1.7",org.mozilla.classfile;version="1.7"
+ Bundle-Version: 1.7.14
+ Bundle-SymbolicName: org.mozilla.rhino
+ Automatic-Module-Name: org.mozilla.rhino
+ Export-Package: org.mozilla.javascript,org.mozilla.javascript.ast,org.mozilla.javascript.annotations
  Implementation-Title: Mozilla Rhino 1.7.14
  Implementation-URL: http://www.mozilla.org/rhino
  Implementation-Vendor: Mozilla Foundation


=====================================
debian/rules
=====================================
@@ -1,15 +1,21 @@
 #!/usr/bin/make -f
 
-export JH_JAR_EXTRA=META-INF/services/javax.script.ScriptEngineFactory
+export JH_JAR_EXTRA=META-INF/services/javax.script.ScriptEngineFactory org/mozilla/javascript
 
 %:
 	dh $@ --with javahelper --with maven-repo-helper
 
 override_dh_auto_build:
 	mkdir -p META-INF/services
+	mkdir -p org/mozilla/javascript/tools/resources/
+	mkdir -p org/mozilla/javascript/tools/debugger/
 	cp src/META-INF/services/javax.script.ScriptEngineFactory META-INF/services/
+	cp -r src/org/mozilla/javascript/resources org/mozilla/javascript/
+	cp toolsrc/org/mozilla/javascript/tools/resources/*.properties org/mozilla/javascript/tools/resources/
+	cp toolsrc/org/mozilla/javascript/tools/debugger/test.js org/mozilla/javascript/tools/debugger/
 	jh_build --javacopts='--release 8' --no-javadoc js.jar src toolsrc xmlimplsrc
 	$(RM) -r META-INF/services
+	$(RM) -r org/mozilla/javascript
 
 override_dh_installchangelogs:
 	dh_installchangelogs -- RELEASE-NOTES.md



View it on GitLab: https://salsa.debian.org/java-team/rhino/-/compare/9f6dd2432928ec74f5c635ca4ec16414a2048e92...88c07ac075e33bbe07f0c88b1dd95af520fcec7f

-- 
View it on GitLab: https://salsa.debian.org/java-team/rhino/-/compare/9f6dd2432928ec74f5c635ca4ec16414a2048e92...88c07ac075e33bbe07f0c88b1dd95af520fcec7f
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/20230218/a64c795e/attachment.htm>