merged
authorwenzelm
Thu, 26 Jun 2014 21:25:41 +0200
changeset 5873297bb2c737406
parent 58730 a8eaa0e7d439
parent 58731 eb96243a25c5
child 58733 06599233e54e
merged
     1.1 --- a/Admin/components/bundled-windows	Thu Jun 26 20:49:34 2014 +0200
     1.2 +++ b/Admin/components/bundled-windows	Thu Jun 26 21:25:41 2014 +0200
     1.3 @@ -1,3 +1,3 @@
     1.4  #additional components to be bundled for release
     1.5 -cygwin-20140530
     1.6 +cygwin-20140626
     1.7  windows_app-20131201
     2.1 --- a/Admin/components/components.sha1	Thu Jun 26 20:49:34 2014 +0200
     2.2 +++ b/Admin/components/components.sha1	Thu Jun 26 21:25:41 2014 +0200
     2.3 @@ -7,6 +7,7 @@
     2.4  7470125fc46e24ee188bdaacc6d560e01b6fa839  cygwin-20140520.tar.gz
     2.5  db4dedae026981c5f001be283180abc1962b79ad  cygwin-20140521.tar.gz
     2.6  acbc4bf161ad21e96ecfe506266ccdbd288f8a6f  cygwin-20140530.tar.gz
     2.7 +3dc680d9eb85276e8c3e9f6057dad0efe2d5aa41  cygwin-20140626.tar.gz
     2.8  0fe549949a025d65d52d6deca30554de8fca3b6e  e-1.5.tar.gz
     2.9  2e293256a134eb8e5b1a283361b15eb812fbfbf1  e-1.6-1.tar.gz
    2.10  e1919e72416cbd7ac8de5455caba8901acc7b44d  e-1.6-2.tar.gz
     3.1 --- a/Admin/lib/Tools/makedist_cygwin	Thu Jun 26 20:49:34 2014 +0200
     3.2 +++ b/Admin/lib/Tools/makedist_cygwin	Thu Jun 26 21:25:41 2014 +0200
     3.3 @@ -55,7 +55,7 @@
     3.4    --site "$CYGWIN_MIRROR" --no-verify \
     3.5    --local-package-dir 'C:\temp' \
     3.6    --root "$(cygpath -w "$TARGET")" \
     3.7 -  --packages libgmp3,perl,perl_vendor,python,rlwrap,vim \
     3.8 +  --packages libgmp3,perl,perl_vendor,python,rlwrap,unzip,vim \
     3.9    --no-shortcuts --no-startmenu --no-desktop --quiet-mode
    3.10  
    3.11  [ "$?" = 0 -a -e "$TARGET/etc" ] || exit 2