postgrespro
diff --git a/‎build/helpers/postgres.cmd
+4-4 b/‎build/helpers/postgres.cmd
+4-4
diff --git a/‎patches/postgresql/9.2.14/series renamed to ‎patches/postgresql/9.2/series b/‎patches/postgresql/9.2.14/series renamed to ‎patches/postgresql/9.2/series
diff --git a/‎patches/postgresql/9.2.14/windows-shmem-detach-fix.patch renamed to ‎patches/postgresql/9.2/windows-shmem-detach-fix.patch b/‎patches/postgresql/9.2.14/windows-shmem-detach-fix.patch renamed to ‎patches/postgresql/9.2/windows-shmem-detach-fix.patch
diff --git a/‎patches/postgresql/9.4.10/02-relax-sslkey-permscheck.patch renamed to ‎patches/postgresql/9.4/02-relax-sslkey-permscheck.patch b/‎patches/postgresql/9.4.10/02-relax-sslkey-permscheck.patch renamed to ‎patches/postgresql/9.4/02-relax-sslkey-permscheck.patch
diff --git a/‎patches/postgresql/9.4.10/50-per-version-dirs.patch renamed to ‎patches/postgresql/9.4/50-per-version-dirs.patch b/‎patches/postgresql/9.4.10/50-per-version-dirs.patch renamed to ‎patches/postgresql/9.4/50-per-version-dirs.patch
diff --git a/‎patches/postgresql/9.4.10/51-default-sockets-in-var.patch renamed to ‎patches/postgresql/9.4/51-default-sockets-in-var.patch b/‎patches/postgresql/9.4.10/51-default-sockets-in-var.patch renamed to ‎patches/postgresql/9.4/51-default-sockets-in-var.patch
diff --git a/‎patches/postgresql/9.4.10/52-tutorial-README.patch renamed to ‎patches/postgresql/9.4/52-tutorial-README.patch b/‎patches/postgresql/9.4.10/52-tutorial-README.patch renamed to ‎patches/postgresql/9.4/52-tutorial-README.patch
diff --git a/‎patches/postgresql/9.4.10/53-pg_service.conf_directory_doc.patch renamed to ‎patches/postgresql/9.4/53-pg_service.conf_directory_doc.patch b/‎patches/postgresql/9.4.10/53-pg_service.conf_directory_doc.patch renamed to ‎patches/postgresql/9.4/53-pg_service.conf_directory_doc.patch
diff --git a/‎patches/postgresql/9.4.10/64-pg_upgrade-sockdir renamed to ‎patches/postgresql/9.4/64-pg_upgrade-sockdir b/‎patches/postgresql/9.4.10/64-pg_upgrade-sockdir renamed to ‎patches/postgresql/9.4/64-pg_upgrade-sockdir
diff --git a/‎patches/postgresql/9.4.10/65-1c_FULL_94-0.23 renamed to ‎patches/postgresql/9.4/65-1c_FULL_94-0.23 b/‎patches/postgresql/9.4.10/65-1c_FULL_94-0.23 renamed to ‎patches/postgresql/9.4/65-1c_FULL_94-0.23
diff --git a/‎patches/postgresql/9.4.10/66-applock-1c-9.4.patch renamed to ‎patches/postgresql/9.4/66-applock-1c-9.4.patch b/‎patches/postgresql/9.4.10/66-applock-1c-9.4.patch renamed to ‎patches/postgresql/9.4/66-applock-1c-9.4.patch
diff --git a/‎patches/postgresql/9.4.10/67-postgresql-1c-9.4.patch renamed to ‎patches/postgresql/9.4/67-postgresql-1c-9.4.patch b/‎patches/postgresql/9.4.10/67-postgresql-1c-9.4.patch renamed to ‎patches/postgresql/9.4/67-postgresql-1c-9.4.patch
diff --git a/‎patches/postgresql/9.4.10/68-online_analyze-9.4.patch renamed to ‎patches/postgresql/9.4/68-online_analyze-9.4.patch b/‎patches/postgresql/9.4.10/68-online_analyze-9.4.patch renamed to ‎patches/postgresql/9.4/68-online_analyze-9.4.patch
diff --git a/‎patches/postgresql/9.4.10/69-plantuner.patch renamed to ‎patches/postgresql/9.4/69-plantuner.patch b/‎patches/postgresql/9.4.10/69-plantuner.patch renamed to ‎patches/postgresql/9.4/69-plantuner.patch
diff --git a/‎patches/postgresql/9.4.10/70-history renamed to ‎patches/postgresql/9.4/70-history b/‎patches/postgresql/9.4.10/70-history renamed to ‎patches/postgresql/9.4/70-history
diff --git a/‎patches/postgresql/9.4.10/series renamed to ‎patches/postgresql/9.4/series b/‎patches/postgresql/9.4.10/series renamed to ‎patches/postgresql/9.4/series
diff --git a/‎patches/postgresql/9.4.10/series.for1c renamed to ‎patches/postgresql/9.4/series.for1c b/‎patches/postgresql/9.4.10/series.for1c renamed to ‎patches/postgresql/9.4/series.for1c
diff --git a/‎patches/postgresql/9.4.10/win_dsm.patch renamed to ‎patches/postgresql/9.4/win_dsm.patch b/‎patches/postgresql/9.4.10/win_dsm.patch renamed to ‎patches/postgresql/9.4/win_dsm.patch
diff --git a/‎patches/postgresql/9.5.5/02-relax-sslkey-permscheck.patch renamed to ‎patches/postgresql/9.5/02-relax-sslkey-permscheck.patch b/‎patches/postgresql/9.5.5/02-relax-sslkey-permscheck.patch renamed to ‎patches/postgresql/9.5/02-relax-sslkey-permscheck.patch
diff --git a/‎patches/postgresql/9.5.5/50-per-version-dirs.patch renamed to ‎patches/postgresql/9.5/50-per-version-dirs.patch b/‎patches/postgresql/9.5.5/50-per-version-dirs.patch renamed to ‎patches/postgresql/9.5/50-per-version-dirs.patch
diff --git a/‎patches/postgresql/9.5.5/51-default-sockets-in-var.patch renamed to ‎patches/postgresql/9.5/51-default-sockets-in-var.patch b/‎patches/postgresql/9.5.5/51-default-sockets-in-var.patch renamed to ‎patches/postgresql/9.5/51-default-sockets-in-var.patch
diff --git a/‎patches/postgresql/9.5.5/52-tutorial-README.patch renamed to ‎patches/postgresql/9.5/52-tutorial-README.patch b/‎patches/postgresql/9.5.5/52-tutorial-README.patch renamed to ‎patches/postgresql/9.5/52-tutorial-README.patch
diff --git a/‎patches/postgresql/9.5.5/53-pg_service.conf_directory_doc.patch renamed to ‎patches/postgresql/9.5/53-pg_service.conf_directory_doc.patch b/‎patches/postgresql/9.5.5/53-pg_service.conf_directory_doc.patch renamed to ‎patches/postgresql/9.5/53-pg_service.conf_directory_doc.patch
diff --git a/‎patches/postgresql/9.5.5/65-1c_FULL_95-0.23.1 renamed to ‎patches/postgresql/9.5/65-1c_FULL_95-0.23.1 b/‎patches/postgresql/9.5.5/65-1c_FULL_95-0.23.1 renamed to ‎patches/postgresql/9.5/65-1c_FULL_95-0.23.1
diff --git a/‎patches/postgresql/9.5.5/66-applock-1c-9.4.patch renamed to ‎patches/postgresql/9.5/66-applock-1c-9.4.patch b/‎patches/postgresql/9.5.5/66-applock-1c-9.4.patch renamed to ‎patches/postgresql/9.5/66-applock-1c-9.4.patch
diff --git a/‎patches/postgresql/9.5.5/67-postgresql-1c-9.5.patch renamed to ‎patches/postgresql/9.5/67-postgresql-1c-9.5.patch b/‎patches/postgresql/9.5.5/67-postgresql-1c-9.5.patch renamed to ‎patches/postgresql/9.5/67-postgresql-1c-9.5.patch
diff --git a/‎patches/postgresql/9.5.5/68-online_analyze-9.5.patch renamed to ‎patches/postgresql/9.5/68-online_analyze-9.5.patch b/‎patches/postgresql/9.5.5/68-online_analyze-9.5.patch renamed to ‎patches/postgresql/9.5/68-online_analyze-9.5.patch
diff --git a/‎patches/postgresql/9.5.5/69-plantuner.patch renamed to ‎patches/postgresql/9.5/69-plantuner.patch b/‎patches/postgresql/9.5.5/69-plantuner.patch renamed to ‎patches/postgresql/9.5/69-plantuner.patch
diff --git a/‎patches/postgresql/9.5.5/70-history renamed to ‎patches/postgresql/9.5/70-history b/‎patches/postgresql/9.5.5/70-history renamed to ‎patches/postgresql/9.5/70-history
diff --git a/‎patches/postgresql/9.5.5/Mkvcbuild.pm.patch renamed to ‎patches/postgresql/9.5/Mkvcbuild.pm.patch b/‎patches/postgresql/9.5.5/Mkvcbuild.pm.patch renamed to ‎patches/postgresql/9.5/Mkvcbuild.pm.patch
diff --git a/‎patches/postgresql/9.5.5/series.for1c renamed to ‎patches/postgresql/9.5/series.for1c b/‎patches/postgresql/9.5.5/series.for1c renamed to ‎patches/postgresql/9.5/series.for1c
@@ -21,20 +21,20 @@ tar xf postgresql-%PGVER%.tar.bz2 -C %BUILD_DIR%\postgresql
 CD /D %BUILD_DIR%\postgresql\*%PGVER%*
 
 IF %ONE_C% == YES (
-  cp -va %ROOT%/patches/postgresql/%PGVER%/series.for1c .
+  cp -va %ROOT%/patches/postgresql/%PG_MAJOR_VERSION%/series.for1c .
   IF NOT EXIST series.for1c GOTO :ERROR
   FOR /F %%I IN (series.for1c) DO (
     ECHO %%I
-    cp -va %ROOT%/patches/postgresql/%PGVER%/%%I .
+    cp -va %ROOT%/patches/postgresql/%PG_MAJOR_VERSION%/%%I .
     patch -p1 < %%I || GOTO :ERROR
   )
 )
 
-cp -va %ROOT%/patches/postgresql/%PGVER%/series .
+cp -va %ROOT%/patches/postgresql/%PG_MAJOR_VERSION%/series .
 IF NOT EXIST series GOTO :DONE_POSTGRESQL_PATCH
 FOR /F %%I IN (series) do (
   ECHO %%I
-  cp -va %ROOT%/patches/postgresql/%PGVER%/%%I .
+  cp -va %ROOT%/patches/postgresql/%PG_MAJOR_VERSION%/%%I .
   patch -p1 < %%I || GOTO :ERROR
 )