From 677f984f94dc5c14676ef6392669e095a45f0475 Mon Sep 17 00:00:00 2001 From: Matthew Dillon Date: Thu, 25 Jan 2007 18:57:48 +0000 Subject: [PATCH] Setup for 1.8 release - Adjust HEAD to 1.9.0 --- gnu/usr.bin/groff/tmac/mdoc.local | 6 ++++-- sys/conf/newvers.sh | 10 +++++----- sys/conf/subvers-DEVELOPMENT_1_7 | 4 ---- sys/conf/subvers-DEVELOPMENT_1_9 | 3 +++ sys/sys/param.h | 5 +++-- 5 files changed, 15 insertions(+), 13 deletions(-) delete mode 100644 sys/conf/subvers-DEVELOPMENT_1_7 create mode 100644 sys/conf/subvers-DEVELOPMENT_1_9 diff --git a/gnu/usr.bin/groff/tmac/mdoc.local b/gnu/usr.bin/groff/tmac/mdoc.local index 99c1adcb42..4aedbc23d0 100644 --- a/gnu/usr.bin/groff/tmac/mdoc.local +++ b/gnu/usr.bin/groff/tmac/mdoc.local @@ -23,7 +23,7 @@ .\" SUCH DAMAGE. .\" .\" $FreeBSD: src/gnu/usr.bin/groff/tmac/mdoc.local,v 1.2.2.19 2003/03/25 10:20:12 murray Exp $ -.\" $DragonFly: src/gnu/usr.bin/groff/tmac/mdoc.local,v 1.14 2006/12/06 16:27:28 tgen Exp $ +.\" $DragonFly: src/gnu/usr.bin/groff/tmac/mdoc.local,v 1.15 2007/01/25 18:57:48 dillon Exp $ .\" .\" %beginstrip% . @@ -72,7 +72,7 @@ . . .\" Default .Os value -.ds doc-default-operating-system DragonFly\~1.7 +.ds doc-default-operating-system DragonFly\~1.9 . . .\" DragonFly releases not found in doc-common @@ -84,6 +84,8 @@ .ds doc-operating-system-DragonFly-1.5 1.5 .ds doc-operating-system-DragonFly-1.6 1.6 .ds doc-operating-system-DragonFly-1.7 1.7 +.ds doc-operating-system-DragonFly-1.8 1.8 +.ds doc-operating-system-DragonFly-1.9 1.9 . .\" FreeBSD releases not found in doc-common. .ds doc-operating-system-FreeBSD-4.11 4.11 diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index 19fb8d30ae..f7d6d3eef1 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -33,7 +33,7 @@ # # @(#)newvers.sh 8.1 (Berkeley) 4/20/94 # $FreeBSD: src/sys/conf/newvers.sh,v 1.44.2.30 2003/04/04 07:02:46 murray Exp $ -# $DragonFly: src/sys/conf/newvers.sh,v 1.17 2006/07/17 00:11:59 dillon Exp $ +# $DragonFly: src/sys/conf/newvers.sh,v 1.18 2007/01/25 18:57:44 dillon Exp $ tag="\$Name: $" @@ -53,14 +53,14 @@ BRANCH=${BRANCH%_Slip} # implicitly or explicitly. # if [ "X${BRANCH}" = "X$" ]; then - BRANCH="DEVELOPMENT_1_7" + BRANCH="DEVELOPMENT_1_9" fi if [ "X${BRANCH}" = "XHEAD" ]; then - BRANCH="DEVELOPMENT_1_7" + BRANCH="DEVELOPMENT_1_9" fi if [ "X${BRANCH}" = "XPreview" ]; then - BRANCH="PREVIEW_1_7" - SHORTTAG="DEVELOPMENT_1_7" + BRANCH="PREVIEW_1_9" + SHORTTAG="DEVELOPMENT_1_9" fi # This case occurs if the $Name: $ field has not been expanded. diff --git a/sys/conf/subvers-DEVELOPMENT_1_7 b/sys/conf/subvers-DEVELOPMENT_1_7 deleted file mode 100644 index a50c006cef..0000000000 --- a/sys/conf/subvers-DEVELOPMENT_1_7 +++ /dev/null @@ -1,4 +0,0 @@ -# Subversion control for DragonFly 1.7.X-DEVELOPMENT -# $DragonFly: src/sys/conf/Attic/subvers-DEVELOPMENT_1_7,v 1.2 2007/01/25 18:42:38 dillon Exp $ -0 - -1 Bump 1.7 subvers prior to 1.8 branch diff --git a/sys/conf/subvers-DEVELOPMENT_1_9 b/sys/conf/subvers-DEVELOPMENT_1_9 new file mode 100644 index 0000000000..bf85894232 --- /dev/null +++ b/sys/conf/subvers-DEVELOPMENT_1_9 @@ -0,0 +1,3 @@ +# Subversion control for DragonFly 1.9.X-DEVELOPMENT +# $DragonFly: src/sys/conf/Attic/subvers-DEVELOPMENT_1_9,v 1.1 2007/01/25 18:57:44 dillon Exp $ +0 - diff --git a/sys/sys/param.h b/sys/sys/param.h index f4620b316f..63609642ea 100644 --- a/sys/sys/param.h +++ b/sys/sys/param.h @@ -37,7 +37,7 @@ * * @(#)param.h 8.3 (Berkeley) 4/4/95 * $FreeBSD: src/sys/sys/param.h,v 1.61.2.38 2003/05/22 17:12:01 fjoe Exp $ - * $DragonFly: src/sys/sys/param.h,v 1.38 2007/01/25 18:42:41 dillon Exp $ + * $DragonFly: src/sys/sys/param.h,v 1.39 2007/01/25 18:57:46 dillon Exp $ */ #ifndef _SYS_PARAM_H_ @@ -56,9 +56,10 @@ * * 170000 - base development version after 1.6 branch * 170001 - base development version before 1.8 branch + * 190000 - base development version after 1.8 branch */ #undef __DragonFly_version -#define __DragonFly_version 170001 /* Master, propagated to newvers */ +#define __DragonFly_version 190000 /* Master, propagated to newvers */ #ifdef __FreeBSD__ /* -- 2.41.0