[Git][java-team/icedtea-web][master] 6 commits: Fixed the installation of the CLI tools alternatives (Closes: #924706)

[Emmanuel Bourg]

Emmanuel Bourg pushed to branch master at Debian Java Maintainers / icedtea-web


Commits:
5c158c34 by Emmanuel Bourg at 2019-03-17T20:45:04Z
Fixed the installation of the CLI tools alternatives (Closes: #924706)

- - - - -
7e59e71d by Emmanuel Bourg at 2019-03-17T20:46:35Z
Marked bug #673415 as fixed in 1.7.2-1

- - - - -
db40a49a by Emmanuel Bourg at 2019-03-17T20:59:43Z
Marked bug #675082 as fixed in 1.7.1-1

- - - - -
d7b4302d by Emmanuel Bourg at 2019-03-17T21:15:25Z
Marked bug #889553 as fixed in 1.7.1-1

- - - - -
268826c4 by Emmanuel Bourg at 2019-03-17T21:38:42Z
Improved the package description (Closes: #706306)

- - - - -
9ecd3291 by Emmanuel Bourg at 2019-03-17T23:57:36Z
Upload to unstable

- - - - -


4 changed files:

- debian/changelog
- debian/control
- debian/icedtea-netx.postinst
- debian/icedtea-netx.prerm


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,11 @@
+icedtea-web (1.7.2-2) unstable; urgency=medium
+
+  * Team upload.
+  * Fixed the installation of the CLI tools alternatives (Closes: #924706)
+  * Improved the package description (Closes: #706306)
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Mon, 18 Mar 2019 00:57:12 +0100
+
 icedtea-web (1.7.2-1) unstable; urgency=medium
 
   * Team upload.
@@ -7,7 +15,7 @@ icedtea-web (1.7.2-1) unstable; urgency=medium
   * Added the missing dependency on a Java runtime (Closes: #912464)
   * icedtea-netx now provides icedtea-netx-common (Closes: #911995)
   * Enabled the enhanced XML parser based on Tagsoup
-  * Enabled Proxy Auto Config support with Rhino
+  * Enabled Proxy Auto Config support with Rhino (Closes: #673415)
 
  -- Emmanuel Bourg <ebourg at apache.org>  Fri, 15 Mar 2019 23:44:27 +0100
 
@@ -27,12 +35,12 @@ icedtea-web (1.7.1-1) unstable; urgency=medium
   [ Emmanuel Bourg ]
   * No longer integrate icedtea-web with a specific JDK
     (Closes: #743922, #642901, #712292)
-  * Merged icedtea-netx-common into icedtea-netx (Closes: #798946)
+  * Merged icedtea-netx-common into icedtea-netx (Closes: #798946, #675082)
   * Package transferred to the Java Team.
   * Removed Damien Raude-Morvan from the uploaders (Closes: #889448)
   * Fixed the detection of Java 10+ in the configure script
   * No longer generate debian/control from template files
-  * Updated the .desktop files
+  * Updated the .desktop files (Closes: #889553)
   * Build with the DH sequencer
   * Use Breaks/Replaces instead of Conflicts/Replaces in debian/control
   * Standards-Version updated to 4.2.1


=====================================
debian/control
=====================================
@@ -28,11 +28,13 @@ Replaces:
  openjdk-6-jre (<< 6b18-1.8.7-3),
  openjdk-6-jre-headless (<< 6b18-1.8.7-3)
 Provides: icedtea-netx-common
-Description: NetX - implementation of the Java Network Launching Protocol (JNLP)
+Description: Implementation of the Java Network Launching Protocol (JNLP)
  NetX provides a drop-in replacement for javaws (Java Web Start). Since
- upstream NetX is dormant, IcedTea is hosting and modifying the sources
- in the IcedTea-Web directory.
+ upstream NetX is dead, the IcedTea Web project is hosting a fork of the
+ original code. However, as icedtea-web has evolved to complex set of tools,
+ extensions and tests, it has now only a few lines of code shared with the
+ original implementation.
  .
  IcedTea's NetX currently supports verification of signed jars, trusted
  certificate storing, system certificate store checking, and provides
- the services specified by the jnlp API.
+ the services specified by the JNLP API.


=====================================
debian/icedtea-netx.postinst
=====================================
@@ -21,14 +21,14 @@ configure)
     fi
 
     if [ "$update_alternatives" = y ]; then
-	if [ -f $basedir/bin/javaws ]; then
+	if [ -f $basedir/bin/javaws.sh ]; then
 	    for tool in $tools; do
 		unset slave1 || true
 		if [ -e $basedir/man/man1/$tool.1.gz ]; then
 		    slave1="--slave /usr/share/man/man1/$tool.1.gz $tool.1.gz $basedir/man/man1/$tool.1.gz"
 		fi
-		update-alternatives --install /usr/bin/$tool $tool $basedir/bin/$tool $priority $slave1
-		update-alternatives --set $tool $basedir/bin/$tool
+		update-alternatives --install /usr/bin/$tool $tool $basedir/bin/$tool.sh $priority $slave1
+		update-alternatives --set $tool $basedir/bin/$tool.sh
 	    done
 	fi
     fi # update_alternatives


=====================================
debian/icedtea-netx.prerm
=====================================
@@ -6,7 +6,7 @@ tools='javaws itweb-settings policyeditor'
 
 if [ "$1" = "remove" ] || [ "$1" = "deconfigure" ]; then
     for tool in $tools; do
-        update-alternatives --remove $tool /usr/share/icedtea-web/bin/$tool
+        update-alternatives --remove $tool /usr/share/icedtea-web/bin/$tool.sh
     done
 fi
 



View it on GitLab: https://salsa.debian.org/java-team/icedtea-web/compare/5bcd218ce9eb09ef78814c7ddafd6bbede1865f9...9ecd32914e4dd8a705d86fb57303a08c6963bddf

-- 
View it on GitLab: https://salsa.debian.org/java-team/icedtea-web/compare/5bcd218ce9eb09ef78814c7ddafd6bbede1865f9...9ecd32914e4dd8a705d86fb57303a08c6963bddf
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/20190318/578564de/attachment.html>