package/java/sun-jdk-160/mime-type-remove.diff

   1 # --- T2-COPYRIGHT-NOTE-BEGIN ---
   2 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
   3 #
   4 # T2 SDE: package/.../sun-jdk-160/mime-type-remove.diff
   5 # Copyright (C) 2006 The T2 SDE Project
   6 #
   7 # More information can be found in the files COPYING and README.
   8 #
   9 # This patch file is dual-licensed. It is available under the license the
  10 # patched project is licensed under, as long as it is an OpenSource license
  11 # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
  12 # of the GNU General Public License as published by the Free Software
  13 # Foundation; either version 2 of the License, or (at your option) any later
  14 # version.
  15 # --- T2-COPYRIGHT-NOTE-END ---
  16
  17 we don't want java touching /etc/mailcap
  18 Alejandro
  19
  20 we dont want java touching /usr/share/ registry files
  21 mipe
  22
  23 we can't add new lines to .bin file because it does tail to checksum and to
  24 generate tarball
  25 Alejandro
  26
  27 Just a remark without modification: safe_mimetypeadd can not be used to add
  28 mimetypes safely. This is done in postsysfiles.in. Create both mimetype and
  29 mailcap entries.
  30 Minto
  31
  32 --- jdk-6-beta-linux-i586.bin.orig      2006-03-12 09:41:15.000000000 +0100
  33 +++ jdk-6-beta-linux-i586.bin   2006-03-12 09:53:57.000000000 +0100
  34 @@ -147,7 +147,7 @@
  35      if [ -w `dirname ${MAILCAP_FILE}` ]; then
  36          MC_TEXT="${MC_TEXT}\n${MC_COMMENT}"
  37          MC_TEXT="${MC_TEXT}\n${MIME_TYPE}; $LATEST_JAVAWS_PATH %s"
  38 -        echo ${echo_args}"${MC_TEXT}" > ${MAILCAP_FILE}
  39 +        #echo ${echo_args}"${MC_TEXT}" > ${MAILCAP_FILE}
  40      else
  41          echo "WARNING - cannot write to file:"
  42          echo "       ${MAILCAP_FILE}"
  43 @@ -171,9 +171,9 @@
  44      # Create the file if it does not exist
  45      if [ ! -w ${MIME_FILE} ]; then
  46          if [ -w `dirname ${MIME_FILE}` ]; then
  47 -            echo "${NS_COMMENT1}"  > ${MIME_FILE}
  48 -            echo "${NS_COMMENT2}" >> ${MIME_FILE}
  49 -            echo "${NS_COMMENT3}" >> ${MIME_FILE}
  50 +            #echo "${NS_COMMENT1}"  > ${MIME_FILE}
  51 +            #echo "${NS_COMMENT2}" >> ${MIME_FILE}
  52 +            #echo "${NS_COMMENT3}" >> ${MIME_FILE}
  53          else
  54              echo "WARNING - cannot write to file:"
  55              echo "       ${MIME_FILE}"
  56 @@ -182,9 +182,9 @@
  57          fi
  58      fi
  59      # Add the jnlp entry if it does not already exist.
  60 -    if [ -z "`grep ${MIME_TYPE} ${MIME_FILE}`" ]; then
  61 -        echo ${JNLP_ENTRY} >> ${MIME_FILE}
  62 -    fi
  63 +    #if [ -z "`grep ${MIME_TYPE} ${MIME_FILE}`" ]; then
  64 +    #    echo ${JNLP_ENTRY} >> ${MIME_FILE}
  65 +    #fi
  66  }
  67  # End of UpdateMimeTypes
  68
  69 @@ -430,21 +430,21 @@
  70          fi
  71
  72          # Setup the GNOME associations
  73 -        AddGNOME application/java-archive \
  74 -                 jar \
  75 -                 java-archive \
  76 -                 "${LATEST_JRE_PATH}/bin/java -jar" \
  77 -                 sun-java \
  78 -                 png \
  79 -                 "Java Archive"
  80 -
  81 -        AddGNOME ${MIME_TYPE} \
  82 -                 jnlp \
  83 -                 java-web-start \
  84 -                 "${LATEST_JAVAWS_PATH}" \
  85 -                 sun-java \
  86 -                 png \
  87 -                 "Java Web Start Application"
  88 +        #AddGNOME application/java-archive \
  89 +        #         jar \
  90 +        #         java-archive \
  91 +        #         "${LATEST_JRE_PATH}/bin/java -jar" \
  92 +        #         sun-java \
  93 +        #         png \
  94 +        #         "Java Archive"
  95 +
  96 +        #AddGNOME ${MIME_TYPE} \
  97 +        #         jnlp \
  98 +        #         java-web-start \
  99 +        #         "${LATEST_JAVAWS_PATH}" \
 100 +        #         sun-java \
 101 +        #         png \
 102 +        #         "Java Web Start Application"
 103      fi
 104  fi
 105