From 09f762885ab6c561ef7bf679a6b6440ea138cf4e Mon Sep 17 00:00:00 2001 From: "Justin C. Sherrill" Date: Mon, 26 May 2014 00:51:35 -0400 Subject: [PATCH] Release 3.8 changes. --- etc/Makefile.usr | 10 +++++----- gnu/usr.bin/groff/tmac/mdoc.local | 2 +- sys/conf/newvers.sh | 2 +- sys/sys/param.h | 3 ++- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/etc/Makefile.usr b/etc/Makefile.usr index 0288b30591..9a3208cbf8 100644 --- a/etc/Makefile.usr +++ b/etc/Makefile.usr @@ -73,7 +73,7 @@ src-create-repo: cd ${.CURDIR}/src && \ git remote add origin git://${GITHOST}/dragonfly.git cd ${.CURDIR}/src && git fetch origin - cd ${.CURDIR}/src && git branch master origin/master + cd ${.CURDIR}/src && git branch DragonFly_RELEASE_3_8 origin/DragonFly_RELEASE_3_8 .endif src-create: src-create-repo @@ -82,7 +82,7 @@ src-create: src-create-repo .elif exists (${.CURDIR}/src) @echo ${ERRSR} .else - cd ${.CURDIR}/src && git checkout master + cd ${.CURDIR}/src && git checkout DragonFly_RELEASE_3_8 cd ${.CURDIR}/src && git pull .endif @@ -99,8 +99,8 @@ src-create-shallow: cd ${.CURDIR}/src && \ git remote add origin git://${GITHOST}/dragonfly.git cd ${.CURDIR}/src && git fetch --depth=1 origin - cd ${.CURDIR}/src && git branch master origin/master - cd ${.CURDIR}/src && git checkout master + cd ${.CURDIR}/src && git branch DragonFly_RELEASE_3_8 origin/DragonFly_RELEASE_3_8 + cd ${.CURDIR}/src && git checkout DragonFly_RELEASE_3_8 cd ${.CURDIR}/src && git pull .endif @@ -110,7 +110,7 @@ src-checkout: .elif !exists (${.CURDIR}/src) @echo ${ERRNSR} .else - cd ${.CURDIR}/src && git checkout master + cd ${.CURDIR}/src && git checkout DragonFly_RELEASE_3_8 .endif src-update: diff --git a/gnu/usr.bin/groff/tmac/mdoc.local b/gnu/usr.bin/groff/tmac/mdoc.local index 60664f533e..0d4f800578 100644 --- a/gnu/usr.bin/groff/tmac/mdoc.local +++ b/gnu/usr.bin/groff/tmac/mdoc.local @@ -68,7 +68,7 @@ . . .\" Default .Os value -.ds doc-default-operating-system DragonFly\~3.7 +.ds doc-default-operating-system DragonFly\~3.8 . . .\" DragonFly releases not found in doc-common diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index 409c7a19be..4f722fc90c 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -43,7 +43,7 @@ fi # Set the branch # -BRANCH="DEVELOPMENT_3_7" +BRANCH="RELEASE_3_8" TYPE="DragonFly" diff --git a/sys/sys/param.h b/sys/sys/param.h index e999bd5286..ff2cfe7e95 100644 --- a/sys/sys/param.h +++ b/sys/sys/param.h @@ -109,9 +109,10 @@ * 300703 - Make usb4bsd default * 300704 - Removal of IPX, NCP and NWFS support * 300705 - Removal of ATM support. + * 300800 - 3.8 release */ #undef __DragonFly_version -#define __DragonFly_version 300705 /* propagated to newvers */ +#define __DragonFly_version 300800 /* propagated to newvers */ #include -- 2.11.4.GIT