# HG changeset patch
# User wenzelm
# Date 1358458989 -3600
# Node ID 157d90cdcef0ec4d49b5fe65bf9246e098c6ebe4
# Parent  7bc58677860ed6d94b6c1bbf3c94210ca9146702# Parent  d64bc889f7d60471542501b96fed22fbc78406a6
merged

diff -r 7bc58677860e -r 157d90cdcef0 Admin/Release/CHECKLIST
--- a/Admin/Release/CHECKLIST	Thu Jan 17 19:20:56 2013 +0100
+++ b/Admin/Release/CHECKLIST	Thu Jan 17 22:43:09 2013 +0100
@@ -11,9 +11,9 @@
 
 - test Proof General 4.1, 3.7.1.1;
 
-- check HTML header of library;
+- test 'display_drafts' command;
 
-- check CTRL-C, SIGINT in tty (also for external processes);
+- check HTML header of library;
 
 - check persistent sessions with PG and Poly/ML 5.x;
 
diff -r 7bc58677860e -r 157d90cdcef0 Admin/Windows/Cygwin/Cygwin-Latex-Setup.bat
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Admin/Windows/Cygwin/Cygwin-Latex-Setup.bat	Thu Jan 17 22:43:09 2013 +0100
@@ -0,0 +1,4 @@
+@echo off
+
+"%CD%\contrib\cygwin\isabelle\cygwin" --site http://isabelle.in.tum.de/cygwin_2013 --no-verify --only-site --local-package-dir "%TEMP%" --root "%CD%\contrib\cygwin" --packages texlive-collection-latexextra,texlive-collection-fontutils,texlive-collection-mathextra,libsasl2 --quiet-mode
+
diff -r 7bc58677860e -r 157d90cdcef0 Admin/Windows/launch4j/Isabelle.exe
Binary file Admin/Windows/launch4j/Isabelle.exe has changed
diff -r 7bc58677860e -r 157d90cdcef0 Admin/Windows/launch4j/isabelle.xml
--- a/Admin/Windows/launch4j/isabelle.xml	Thu Jan 17 19:20:56 2013 +0100
+++ b/Admin/Windows/launch4j/isabelle.xml	Thu Jan 17 22:43:09 2013 +0100
@@ -20,7 +20,7 @@
     <cp>%EXEDIR%\lib\classes\ext\scala-swing.jar</cp>
   </classPath>
   <jre>
-    <path>%EXEDIR%\contrib\jdk-7u9\x86-cygwin\jdk1.7.0_09</path>
+    <path>%EXEDIR%\contrib\jdk-7u11\x86-cygwin\jdk1.7.0_11</path>
     <minVersion></minVersion>
     <maxVersion></maxVersion>
     <jdkPreference>jdkOnly</jdkPreference>
diff -r 7bc58677860e -r 157d90cdcef0 Admin/components/bundled-windows
--- a/Admin/components/bundled-windows	Thu Jan 17 19:20:56 2013 +0100
+++ b/Admin/components/bundled-windows	Thu Jan 17 22:43:09 2013 +0100
@@ -1,3 +1,2 @@
 #additional components to be bundled for release
-cygwin-20130114
-
+cygwin-20130117
diff -r 7bc58677860e -r 157d90cdcef0 Admin/components/components.sha1
--- a/Admin/components/components.sha1	Thu Jan 17 19:20:56 2013 +0100
+++ b/Admin/components/components.sha1	Thu Jan 17 22:43:09 2013 +0100
@@ -4,6 +4,7 @@
 2f6417b8e96a0e4e8354fe0f1a253c18fb55d9a7  cvc3-2.4.1.tar.gz
 842d9526f37b928cf9e22f141884365129990d63  cygwin-20130110.tar.gz
 cb3b0706d208f104b800267697204f6d82f7b48a  cygwin-20130114.tar.gz
+3b44cca04855016d5f8cfb5101b2e0579ab80197  cygwin-20130117.tar.gz
 0fe549949a025d65d52d6deca30554de8fca3b6e  e-1.5.tar.gz
 2e293256a134eb8e5b1a283361b15eb812fbfbf1  e-1.6-1.tar.gz
 e1919e72416cbd7ac8de5455caba8901acc7b44d  e-1.6-2.tar.gz
diff -r 7bc58677860e -r 157d90cdcef0 Admin/lib/Tools/makedist_bundles
--- a/Admin/lib/Tools/makedist_bundles	Thu Jan 17 19:20:56 2013 +0100
+++ b/Admin/lib/Tools/makedist_bundles	Thu Jan 17 22:43:09 2013 +0100
@@ -125,6 +125,7 @@
 
     cp "$ISABELLE_HOME/Admin/Windows/launch4j/Isabelle.exe" "$ISABELLE_TARGET/Isabelle2013.exe"
     cp "$ISABELLE_HOME/Admin/Windows/Cygwin/Cygwin-Setup.bat" \
+      "$ISABELLE_HOME/Admin/Windows/Cygwin/Cygwin-Latex-Setup.bat" \
       "$ISABELLE_HOME/Admin/Windows/Cygwin/Cygwin-Terminal.bat" "$ISABELLE_TARGET"
 
     for NAME in init.bat postinstall rebaseall
diff -r 7bc58677860e -r 157d90cdcef0 Admin/lib/Tools/makedist_cygwin
--- a/Admin/lib/Tools/makedist_cygwin	Thu Jan 17 19:20:56 2013 +0100
+++ b/Admin/lib/Tools/makedist_cygwin	Thu Jan 17 22:43:09 2013 +0100
@@ -77,3 +77,4 @@
 
 DATE=$(date +%Y%m%d)
 tar -C "$TARGET/.." -cz -f "cygwin-${DATE}.tar.gz" cygwin
+