← Back to branch summary

~ubuntu-branches/ubuntu/lucid/icedtea-web/lucid-updates

« back to all changes in this revision

Viewing changes to debian/patches/gcc-option-order.diff

  • Committer: Package Import Robot
  • Author(s): Jamie Strandboge, Matthias Klose, Jamie Strandboge
  • Date: 2013-04-17 17:57:13 UTC
  • mfrom: (1.1.20) (19.1.25 precise-security)
  • Revision ID: package-import@ubuntu.com-20130417175713-shac0w2uah1i3i77
Tags: 1.2.3-0ubuntu0.10.04.1
[ Matthias Klose ]
* IcedTea-Web 1.2.3 release.
* Security Updates:
  - CVE-2013-1927: fixed gifar vulnerability.
  - CVE-2013-1926: Class-loader incorrectly shared for applets with same
    relative-path.
* Common:
  - PR1161: X509VariableTrustManager does not work correctly with OpenJDK7.
* NetX:
  - PR580: http://www.horaoficial.cl/ loads improperly.
* Plugin:
  - PR1157: Applets can hang browser after fatal exception.

[ Jamie Strandboge ]
* debian/rules: generate icedtea-plugin meta package
* debian/control.in: update icedtea-netx replace/conflicts to avoid
  javaws conflict with openjdk-6-jre
* debian/icedtea-netx.postinst.in: skip update-alternatives on
  openjdk-7 binaries if they don't exist
* Regenerate the control file.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/gcc-option-order.diff
1
 
--- icedtea-web-1.2~pre3.orig/Makefile.am
2
 
+++ icedtea-web-1.2~pre3/Makefile.am
3
 
@@ -213,7 +213,7 @@ $(PLUGIN_DIR)/%.o: $(PLUGIN_SRCDIR)/%.cc
 
1
Index: b/Makefile.am
 
2
===================================================================
 
3
--- a/Makefile.am       2013-02-08 01:14:55.020767334 +0000
 
4
+++ b/Makefile.am       2013-02-08 01:15:16.704767241 +0000
 
5
@@ -213,7 +213,7 @@
4
6
        mkdir -p $(PLUGIN_DIR) && \
5
7
        cd $(PLUGIN_DIR) && \
6
8
        $(CXX) $(CXXFLAGS) \
9
11
          -DJDK_UPDATE_VERSION="\"$(JDK_UPDATE_VERSION)\"" \
10
12
          -DPLUGIN_NAME="\"IcedTea-Web Plugin\"" \
11
13
          -DPLUGIN_VERSION="\"$(PLUGIN_VERSION)\"" \
12
 
@@ -221,6 +221,7 @@ $(PLUGIN_DIR)/%.o: $(PLUGIN_SRCDIR)/%.cc
 
14
@@ -221,6 +221,7 @@
13
15
          -DMOZILLA_VERSION_COLLAPSED="$(MOZILLA_VERSION_COLLAPSED)" \
14
16
          -DICEDTEA_WEB_JRE="\"$(SYSTEM_JRE_DIR)\"" \
15
17
          -DPLUGIN_BOOTCLASSPATH=$(PLUGIN_BOOTCLASSPATH) \
17
19
          $(GLIB_CFLAGS) \
18
20
          $(GTK_CFLAGS) \
19
21
          $(MOZILLA_CFLAGS) \
20
 
--- icedtea-web-1.2~pre3.orig/Makefile.in
21
 
+++ icedtea-web-1.2~pre3/Makefile.in
22
 
@@ -718,7 +718,7 @@ uninstall-local:
 
22
Index: b/Makefile.in
 
23
===================================================================
 
24
--- a/Makefile.in       2013-02-08 01:14:55.004767334 +0000
 
25
+++ b/Makefile.in       2013-02-08 01:15:16.704767241 +0000
 
26
@@ -740,7 +740,7 @@
23
27
 @ENABLE_PLUGIN_TRUE@   mkdir -p $(PLUGIN_DIR) && \
24
28
 @ENABLE_PLUGIN_TRUE@   cd $(PLUGIN_DIR) && \
25
29
 @ENABLE_PLUGIN_TRUE@   $(CXX) $(CXXFLAGS) \
28
32
 @ENABLE_PLUGIN_TRUE@     -DJDK_UPDATE_VERSION="\"$(JDK_UPDATE_VERSION)\"" \
29
33
 @ENABLE_PLUGIN_TRUE@     -DPLUGIN_NAME="\"IcedTea-Web Plugin\"" \
30
34
 @ENABLE_PLUGIN_TRUE@     -DPLUGIN_VERSION="\"$(PLUGIN_VERSION)\"" \
31
 
@@ -726,6 +726,7 @@ uninstall-local:
 
35
@@ -748,6 +748,7 @@
32
36
 @ENABLE_PLUGIN_TRUE@     -DMOZILLA_VERSION_COLLAPSED="$(MOZILLA_VERSION_COLLAPSED)" \
33
37
 @ENABLE_PLUGIN_TRUE@     -DICEDTEA_WEB_JRE="\"$(SYSTEM_JRE_DIR)\"" \
34
38
 @ENABLE_PLUGIN_TRUE@     -DPLUGIN_BOOTCLASSPATH=$(PLUGIN_BOOTCLASSPATH) \