2.0 Release Engineering:
authorMatthew Dillon <dillon@dragonflybsd.org>
Mon, 14 Jul 2008 04:01:45 +0000 (04:01 +0000)
committerMatthew Dillon <dillon@dragonflybsd.org>
Mon, 14 Jul 2008 04:01:45 +0000 (04:01 +0000)
* Post-branch adjustments to HEAD (2.1)

gnu/usr.bin/groff/tmac/mdoc.local
sys/conf/newvers.sh
sys/conf/subvers-DEVELOPMENT_1_13 [deleted file]
sys/conf/subvers-DEVELOPMENT_2_1 [new file with mode: 0644]
sys/sys/param.h

index 628b0c2..43313e1 100644 (file)
@@ -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.22 2008/05/01 13:04:51 swildner Exp $
+.\" $DragonFly: src/gnu/usr.bin/groff/tmac/mdoc.local,v 1.23 2008/07/14 04:01:45 dillon Exp $
 .\"
 .\"     %beginstrip%
 .
@@ -95,6 +95,8 @@
 .ds doc-operating-system-DragonFly-1.11 1.11
 .ds doc-operating-system-DragonFly-1.12 1.12
 .ds doc-operating-system-DragonFly-1.13 1.13
+.ds doc-operating-system-DragonFly-2.0 2.0
+.ds doc-operating-system-DragonFly-2.1 2.1
 .
 .\" FreeBSD releases not found in doc-common.
 .ds doc-operating-system-FreeBSD-4.11 4.11
 .ds doc-operating-system-FreeBSD-6.3  6.3
 .ds doc-operating-system-FreeBSD-7.0  7.0
 .ds doc-operating-system-FreeBSD-7.1  7.1
+.ds doc-operating-system-FreeBSD-8.0  8.0
 .
 .\" NetBSD releases not found in doc-common.
 .ds doc-operating-system-NetBSD-1.6.3 1.6.3
index 7d40ae4..98c342d 100644 (file)
@@ -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.22 2008/07/09 18:15:10 thomas Exp $
+# $DragonFly: src/sys/conf/newvers.sh,v 1.23 2008/07/14 04:01:44 dillon Exp $
 
 tag="\$Name:  $"
 
@@ -53,14 +53,14 @@ BRANCH=${BRANCH%_Slip}
 # implicitly or explicitly.
 #
 if [ "X${BRANCH}" = "X$" ]; then
-    BRANCH="DEVELOPMENT_1_13"
+    BRANCH="DEVELOPMENT_2_1"
 fi
 if [ "X${BRANCH}" = "XHEAD" ]; then
-    BRANCH="DEVELOPMENT_1_13"
+    BRANCH="DEVELOPMENT_2_1"
 fi
 if [ "X${BRANCH}" = "XPreview" ]; then
-    BRANCH="PREVIEW_1_13"
-    SHORTTAG="DEVELOPMENT_1_13"
+    BRANCH="PREVIEW_2_1"
+    SHORTTAG="DEVELOPMENT_2_1"
 fi
 
 # This case occurs if the $Name:  $ field has not been expanded.
diff --git a/sys/conf/subvers-DEVELOPMENT_1_13 b/sys/conf/subvers-DEVELOPMENT_1_13
deleted file mode 100644 (file)
index 81e19b4..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-# Subversion control for DragonFly 1.13.X-DEVELOPMENT
-# $DragonFly: src/sys/conf/Attic/subvers-DEVELOPMENT_1_13,v 1.2 2008/07/14 03:46:52 dillon Exp $
-0      -
-1      2.0 branch
diff --git a/sys/conf/subvers-DEVELOPMENT_2_1 b/sys/conf/subvers-DEVELOPMENT_2_1
new file mode 100644 (file)
index 0000000..d067522
--- /dev/null
@@ -0,0 +1,3 @@
+# Subversion control for DragonFly 2.1.X-DEVELOPMENT
+# $DragonFly: src/sys/conf/subvers-DEVELOPMENT_2_1,v 1.1 2008/07/14 04:01:44 dillon Exp $
+0      -
index 09d9857..1ebbfa7 100644 (file)
@@ -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.50 2008/07/14 03:46:50 dillon Exp $
+ * $DragonFly: src/sys/sys/param.h,v 1.51 2008/07/14 04:01:42 dillon Exp $
  */
 
 #ifndef _SYS_PARAM_H_
  * 197700 - base development version after 1.12 branch
  * 199900 - base development version before 2.0 branch
  * 200000 - 2.0 branch
+ * 200100 - base development version after 2.0 branch
  */
 #undef __DragonFly_version
-#define __DragonFly_version 199900     /* Master, propagated to newvers */
+#define __DragonFly_version 200100     /* Master, propagated to newvers */
 
 #ifdef __FreeBSD__
 /*