mac packages: remove obsolete Delete Preferences.app

This application is incompatible with Mavericks, and it is superseded by the mechanisms provided
within the UI itself.

Also update the readme to reflect this change.

diff --git a/extras/package/macosx/Delete_Preferences.app/Contents/Info.plist b/extras/package/macosx/Delete_Preferences.app/Contents/Info.plist
deleted file mode 100644 (file)
index 544939d..0000000
--- a/extras/package/macosx/Delete_Preferences.app/Contents/Info.plist
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-       <key>CFBundleAllowMixedLocalizations</key>
-       <true/>
-       <key>CFBundleDevelopmentRegion</key>
-       <string>English</string>
-       <key>CFBundleExecutable</key>
-       <string>applet</string>
-       <key>CFBundleIconFile</key>
-       <string>applet</string>
-       <key>CFBundleInfoDictionaryVersion</key>
-       <string>6.0</string>
-       <key>CFBundleName</key>
-       <string>Delete_Preferences</string>
-       <key>CFBundlePackageType</key>
-       <string>APPL</string>
-       <key>CFBundleSignature</key>
-       <string>aplt</string>
-       <key>LSMinimumSystemVersionByArchitecture</key>
-       <dict>
-               <key>x86_64</key>
-               <string>10.6</string>
-       </dict>
-       <key>LSRequiresCarbon</key>
-       <true/>
-       <key>WindowState</key>
-       <dict>
-               <key>dividerCollapsed</key>
-               <false/>
-               <key>eventLogLevel</key>
-               <integer>-1</integer>
-               <key>name</key>
-               <string>ScriptWindowState</string>
-               <key>positionOfDivider</key>
-               <real>618</real>
-               <key>savedFrame</key>
-               <string>390 587 1311 831 0 0 2560 1418 </string>
-               <key>selectedTabView</key>
-               <string>description</string>
-       </dict>
-</dict>
-</plist>

diff --git a/extras/package/macosx/Delete_Preferences.app/Contents/MacOS/applet b/extras/package/macosx/Delete_Preferences.app/Contents/MacOS/applet
deleted file mode 100755 (executable)
index 94b8c6f..0000000
Binary files a/extras/package/macosx/Delete_Preferences.app/Contents/MacOS/applet and /dev/null differ

diff --git a/extras/package/macosx/Delete_Preferences.app/Contents/PkgInfo b/extras/package/macosx/Delete_Preferences.app/Contents/PkgInfo
deleted file mode 100644 (file)
index 3253614..0000000
--- a/extras/package/macosx/Delete_Preferences.app/Contents/PkgInfo
+++ /dev/null
@@ -1 +0,0 @@
-APPLaplt
\ No newline at end of file

diff --git a/extras/package/macosx/Delete_Preferences.app/Contents/Resources/Scripts/main.scpt b/extras/package/macosx/Delete_Preferences.app/Contents/Resources/Scripts/main.scpt
deleted file mode 100644 (file)
index 5be1104..0000000
Binary files a/extras/package/macosx/Delete_Preferences.app/Contents/Resources/Scripts/main.scpt and /dev/null differ

diff --git a/extras/package/macosx/Delete_Preferences.app/Contents/Resources/applet.icns b/extras/package/macosx/Delete_Preferences.app/Contents/Resources/applet.icns
deleted file mode 100644 (file)
index fcc1f09..0000000
Binary files a/extras/package/macosx/Delete_Preferences.app/Contents/Resources/applet.icns and /dev/null differ

diff --git a/extras/package/macosx/Delete_Preferences.app/Contents/Resources/applet.rsrc b/extras/package/macosx/Delete_Preferences.app/Contents/Resources/applet.rsrc
deleted file mode 100644 (file)
index c444d27..0000000
Binary files a/extras/package/macosx/Delete_Preferences.app/Contents/Resources/applet.rsrc and /dev/null differ

diff --git a/extras/package/macosx/Delete_Preferences.app/Contents/Resources/description.rtfd/TXT.rtf b/extras/package/macosx/Delete_Preferences.app/Contents/Resources/description.rtfd/TXT.rtf
deleted file mode 100644 (file)
index 9f383fd..0000000
--- a/extras/package/macosx/Delete_Preferences.app/Contents/Resources/description.rtfd/TXT.rtf
+++ /dev/null
@@ -1,8 +0,0 @@
-{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf230
-{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
-{\colortbl;\red255\green255\blue255;}
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\tx7280\tx7840\tx8400\tx8960\tx9520\tx10080\tx10640\tx11200\tx11760\tx12320\tx12880\tx13440\tx14000\tx14560\tx15120\tx15680\tx16240\tx16800\tx17360\tx17920\tx18480\tx19040\tx19600\tx20160\tx20720\tx21280\tx21840\tx22400\tx22960\tx23520\tx24080\tx24640\tx25200\tx25760\tx26320\tx26880\tx27440\tx28000\tx28560\tx29120\tx29680\tx30240\tx30800\tx31360\tx31920\tx32480\tx33040\tx33600\tx34160\tx34720\tx35280\tx35840\tx36400\tx36960\tx37520\tx38080\tx38640\tx39200\tx39760\tx40320\tx40880\tx41440\tx42000\tx42560\tx43120\tx43680\tx44240\tx44800\tx45360\tx45920\tx46480\tx47040\tx47600\tx48160\tx48720\tx49280\tx49840\tx50400\tx50960\tx51520\tx52080\tx52640\tx53200\tx53760\tx54320\tx54880\tx55440\tx56000\pardirnatural
-
-\f0\fs24 \cf0 \CocoaLigature0 This script moves VLC's preferences files to the trash, so the user does not need to search for them. It does not empty your trash, but requires the user to do so afterwards.\
-\
-This script is published under the same license as the VLC package.}
\ No newline at end of file

diff --git a/extras/package/macosx/README.MacOSX.rtf b/extras/package/macosx/README.MacOSX.rtf
index 6d1ee308ed59953a600f423cabb95b2362819271..5ea1a4ce31f5c6bcdc33d0e650b34526b15e20c7 100644 (file)
--- a/extras/package/macosx/README.MacOSX.rtf
+++ b/extras/package/macosx/README.MacOSX.rtf
@@ -1,5 +1,5 @@
-{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf320
-{\fonttbl\f0\fswiss\fcharset0 Helvetica;\f1\fmodern\fcharset0 Courier;}
+{\rtf1\ansi\ansicpg1252\cocoartf1187\cocoasubrtf400
+\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;\f1\fmodern\fcharset0 Courier;}
 {\colortbl;\red255\green255\blue255;}
 \paperw12240\paperh15840\vieww16720\viewh13620\viewkind0
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
@@ -159,10 +159,10 @@ An editable wiki is available at \ul http://wiki.videolan.org\ulnone .\
 \b \cf0 \ul 14. VLC does not start anymore or does strange things \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qj
 
-\b0 \cf0 \ulnone Delete your preferences and try again. You can use the script "Delete Preferences.app" on the disk-image to do that. If you want to do it by hand, delete "org.videolan.vlc.plist" and a folder called "org.videolan.vlc" in ~/Library/Preferences (your personal preferences-folder inside the library of your HOME). If this does not help, see 13.\
+\b0 \cf0 \ulnone Delete your preferences and try again. You can use the button "Reset All" in the Preferences window to do that. If VLC does not start anymore or you want to do it by hand, first execute the following command in Terminal: "defaults delete org.videolan.vlc". Then delete all files and folders starting with "org.videolan.vlc" in ~/Library/Preferences (your personal preferences-folder inside the library of your HOME). If this does not help, see 13.\
 \
 \
 For additional information and support, please see: \ul http://www.videolan.org/support\ulnone \
 -- \
 Derk-Jan Hartman & Felix Paul K\'fchne for the VideoLAN team.\
-}
+}
\ No newline at end of file

diff --git a/extras/package/macosx/package.mak b/extras/package/macosx/package.mak
index b604ab9cd5b1b2a13e15dcff8a261446e46c19d7..53c341c59fdb4e5afcfe1bcd79e7d46165782eda 100644 (file)
--- a/extras/package/macosx/package.mak
+++ b/extras/package/macosx/package.mak
@@ -64,7 +64,6 @@ package-macosx: VLC.app
        mkdir -p "$(top_builddir)/vlc-$(VERSION)/Goodies/"
        cp -R "$(top_builddir)/VLC.app" "$(top_builddir)/vlc-$(VERSION)/VLC.app"
        cd $(srcdir); cp AUTHORS COPYING README THANKS NEWS $(abs_top_builddir)/vlc-$(VERSION)/Goodies/
-       cp -R  $(srcdir)/extras/package/macosx/Delete_Preferences.app $(top_builddir)/vlc-$(VERSION)/Goodies/Delete\ VLC\ Preferences.app
        cp $(srcdir)/extras/package/macosx/README.MacOSX.rtf $(top_builddir)/vlc-$(VERSION)/Read\ Me.rtf
        $(LN_S) -f /Applications $(top_builddir)/vlc-$(VERSION)/
        rm -f "$(top_builddir)/vlc-$(VERSION)-rw.dmg"
@@ -85,7 +84,6 @@ package-macosx-zip: VLC.app
        mkdir -p $(top_builddir)/vlc-$(VERSION)/Goodies/
        cp -R $(top_builddir)/VLC.app $(top_builddir)/vlc-$(VERSION)/VLC.app
        cd $(srcdir); cp -R AUTHORS COPYING README THANKS NEWS $(abs_top_builddir)/vlc-$(VERSION)/Goodies/
-       cp -R  $(srcdir)/extras/package/macosx/Delete_Preferences.app $(top_builddir)/vlc-$(VERSION)/Goodies/Delete\ VLC\ Preferences.app
        cp $(srcdir)/extras/package/macosx/README.MacOSX.rtf $(top_builddir)/vlc-$(VERSION)/Read\ Me.rtf
        zip -r -y -9 $(top_builddir)/vlc-$(VERSION).zip $(top_builddir)/vlc-$(VERSION)
        rm -rf "$(top_builddir)/vlc-$(VERSION)"