Merge pull request #191 from git-for-windows/for-upstream

Bringing some changes from the git-for-windows fork upstream

msys2-installer/make-msys2-installer.bat

@@ -44,8 +44,8 @@ pushd %1
   echo bin\bash -l -c "pacman -Syu --root %NEWMSYS%"
   bin\bash -l -c "pacman -Syu --root %NEWMSYS%"
   exit /b 999
-  %1\bin\bash -l -c "pacman -S pacman --rootrebase %NEWMSYS%"
-  %1\bin\bash -l -c "pacman -S base --force --rootrebase %NEWMSYS%" | more /E /P
+  %1\bin\bash -l -c "pacman -S pacman --root %NEWMSYS%"
+  %1\bin\bash -l -c "pacman -S base --force --root %NEWMSYS%" | more /E /P
   timeout 1 > NUL
 popd
 

msys2-installer/qt-ifw/packages/com.msys2.root.base/meta/installscript.js

@@ -33,7 +33,7 @@ function createShortcuts()
                             "@StartMenuDir@/MinGW-w64 Win64 Shell.lnk",
                             "/A /Q /K " + installer.value("TargetDir") + "\\mingw64_shell.bat");
 
-    if ("@BITNESS@bit" === "@BITNESS@bit") {
+    if ("@BITNESS@bit" === "32bit") {
         component.addOperation( "Execute",
                                ["@TargetDir@\\autorebase.bat"]);
     }

pacman-mirrors/mirrorlist.mingw32

@@ -1,6 +1,5 @@
 ##
 ## 32-bit Mingw-w64 repository mirrorlist
-## Changed on 2014-05-24
 ##
 
 ## Primary

pacman-mirrors/mirrorlist.mingw64

@@ -1,6 +1,5 @@
 ##
 ## 64-bit Mingw-w64 repository mirrorlist
-## Changed on 2014-05-24
 ##
 
 ## Primary

pacman-mirrors/mirrorlist.msys

@@ -1,6 +1,5 @@
 ##
 ## MSYS2 repository mirrorlist
-## Changed on 2014-05-24
 ##
 
 ## Primary

pacman/PKGBUILD

@@ -46,8 +46,7 @@ backup=("etc/pacman.conf"
         "etc/makepkg_mingw32.conf"
         "etc/makepkg_mingw64.conf")
 source=("$pkgname"::'git://github.com/Alexpux/MSYS2-pacman.git'
-        "pacman.conf.i686"
-        "pacman.conf.x86_64"
+        "pacman.conf"
         "makepkg.conf"
         "makepkg_mingw32.conf"
         "makepkg_mingw64.conf"
@@ -57,7 +56,6 @@ source=("$pkgname"::'git://github.com/Alexpux/MSYS2-pacman.git'
         "0003-use-busybox-for-msys2-post-installs.patch"
         "0004-Link-pacman-with-static-libraries.patch")
 md5sums=('SKIP'
-         'a74be5548ab4743ef05712ebff0b8472'
          'a74be5548ab4743ef05712ebff0b8472'
          'fc9e737a24f08f842f1f4c54bdcaa653'
          '5651b76cb4f2bea3eda199092db01972'
@@ -115,7 +113,7 @@ package() {
 
   # install Arch specific stuff
   install -dm755 $pkgdir/etc
-  install -m644 $srcdir/pacman.conf.$CARCH $pkgdir/etc/pacman.conf
+  install -m644 $srcdir/pacman.conf $pkgdir/etc/pacman.conf
 
   case "$CARCH" in
   i686)

pacman/pacman.conf.x86_64

@@ -1,85 +0,0 @@
-#
-# /etc/pacman.conf
-#
-# See the pacman.conf(5) manpage for option and repository directives
-
-#
-# GENERAL OPTIONS
-#
-[options]
-# The following paths are commented out with their default values listed.
-# If you wish to use different paths, uncomment and update the paths.
-#RootDir     = /
-#DBPath      = /var/lib/pacman/
-#CacheDir    = /var/cache/pacman/pkg/
-#LogFile     = /var/log/pacman.log
-#GPGDir      = /etc/pacman.d/gnupg/
-HoldPkg      = pacman
-#XferCommand = /usr/bin/curl -C - -f %u > %o
-#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
-#CleanMethod = KeepInstalled
-#UseDelta    = 0.7
-Architecture = auto
-
-# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
-#IgnorePkg   =
-#IgnoreGroup =
-
-#NoUpgrade   =
-#NoExtract   =
-
-# Misc options
-#UseSyslog
-#Color
-#TotalDownload
-CheckSpace
-#VerbosePkgLists
-
-# By default, pacman accepts packages signed by keys that its local keyring
-# trusts (see pacman-key and its man page), as well as unsigned packages.
-#SigLevel = Never
-SigLevel    = Required DatabaseOptional
-LocalFileSigLevel = Optional
-#RemoteFileSigLevel = Required
-
-# NOTE: You must run `pacman-key --init` before first using pacman; the local
-# keyring can then be populated with the keys of all official Arch Linux
-# packagers with `pacman-key --populate archlinux`.
-
-#
-# REPOSITORIES
-#   - can be defined here or included from another file
-#   - pacman will search repositories in the order defined here
-#   - local/custom mirrors can be added here or in separate files
-#   - repositories listed first will take precedence when packages
-#     have identical names, regardless of version number
-#   - URLs will have $repo replaced by the name of the current repo
-#   - URLs will have $arch replaced by the name of the architecture
-#
-# Repository entries are of the format:
-#       [repo-name]
-#       Server = ServerName
-#       Include = IncludePath
-#
-# The header [repo-name] is crucial - it must be present and
-# uncommented to enable the repo.
-#
-
-# The testing repositories are disabled by default. To enable, uncomment the
-# repo name header and Include lines. You can add preferred servers immediately
-# after the header, and they will be used before the default mirrors.
-
-[mingw32]
-Include = /etc/pacman.d/mirrorlist.mingw32
-
-[mingw64]
-Include = /etc/pacman.d/mirrorlist.mingw64
-
-[msys]
-Include = /etc/pacman.d/mirrorlist.msys
-
-# An example of a custom package repository.  See the pacman manpage for
-# tips on creating your own repositories.
-#[custom]
-#SigLevel = Optional TrustAll
-#Server = file:///home/custompkgs