From 84217f86294f5ecaa1bb324c7ab15ea63ffee4e0 Mon Sep 17 00:00:00 2001
From: Matthew Dillon <dillon@dragonflybsd.org>
Date: Tue, 12 Feb 2008 02:26:08 +0000
Subject: [PATCH] Release Engineering on HEAD.

* Branch 1.12

* Change HEAD to 1.13
---
 gnu/usr.bin/groff/tmac/mdoc.local |  6 ++++--
 sys/conf/newvers.sh               | 10 +++++-----
 sys/conf/subvers-DEVELOPMENT_1_11 |  4 ----
 sys/conf/subvers-DEVELOPMENT_1_13 |  3 +++
 sys/sys/param.h                   | 14 ++++++--------
 5 files changed, 18 insertions(+), 19 deletions(-)
 delete mode 100644 sys/conf/subvers-DEVELOPMENT_1_11
 create mode 100644 sys/conf/subvers-DEVELOPMENT_1_13

diff --git a/gnu/usr.bin/groff/tmac/mdoc.local b/gnu/usr.bin/groff/tmac/mdoc.local
index 200c7e082..e2c1704de 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.20 2008/01/03 13:59:03 hasso Exp $
+.\" $DragonFly: src/gnu/usr.bin/groff/tmac/mdoc.local,v 1.21 2008/02/12 02:26:08 dillon Exp $
 .\"
 .\"     %beginstrip%
 .
@@ -77,7 +77,7 @@
 .
 .
 .\" Default .Os value
-.ds doc-default-operating-system DragonFly\~1.11
+.ds doc-default-operating-system DragonFly\~1.13
 .
 .
 .\" DragonFly releases not found in doc-common
@@ -93,6 +93,8 @@
 .ds doc-operating-system-DragonFly-1.9 1.9
 .ds doc-operating-system-DragonFly-1.10 1.10
 .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
 .
 .\" 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 26654f978..ff205a4e2 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.20 2007/10/28 01:32:33 swildner Exp $
+# $DragonFly: src/sys/conf/newvers.sh,v 1.21 2008/02/12 02:26:07 dillon Exp $
 
 tag="\$Name:  $"
 
@@ -53,14 +53,14 @@ BRANCH=${BRANCH%_Slip}
 # implicitly or explicitly.
 #
 if [ "X${BRANCH}" = "X$" ]; then
-    BRANCH="DEVELOPMENT_1_11"
+    BRANCH="DEVELOPMENT_1_13"
 fi
 if [ "X${BRANCH}" = "XHEAD" ]; then
-    BRANCH="DEVELOPMENT_1_11"
+    BRANCH="DEVELOPMENT_1_13"
 fi
 if [ "X${BRANCH}" = "XPreview" ]; then
-    BRANCH="PREVIEW_1_11"
-    SHORTTAG="DEVELOPMENT_1_11"
+    BRANCH="PREVIEW_1_13"
+    SHORTTAG="DEVELOPMENT_1_13"
 fi
 
 # This case occurs if the $Name:  $ field has not been expanded.
diff --git a/sys/conf/subvers-DEVELOPMENT_1_11 b/sys/conf/subvers-DEVELOPMENT_1_11
deleted file mode 100644
index 5a04b12f6..000000000
--- a/sys/conf/subvers-DEVELOPMENT_1_11
+++ /dev/null
@@ -1,4 +0,0 @@
-# Subversion control for DragonFly 1.11.X-DEVELOPMENT
-# $DragonFly: src/sys/conf/Attic/subvers-DEVELOPMENT_1_11,v 1.2 2008/02/12 02:09:24 dillon Exp $
-0	-
-1	pre-1.12-branch
diff --git a/sys/conf/subvers-DEVELOPMENT_1_13 b/sys/conf/subvers-DEVELOPMENT_1_13
new file mode 100644
index 000000000..576072fc6
--- /dev/null
+++ b/sys/conf/subvers-DEVELOPMENT_1_13
@@ -0,0 +1,3 @@
+# Subversion control for DragonFly 1.13.X-DEVELOPMENT
+# $DragonFly: src/sys/conf/subvers-DEVELOPMENT_1_13,v 1.1 2008/02/12 02:26:07 dillon Exp $
+0	-
diff --git a/sys/sys/param.h b/sys/sys/param.h
index c9f3ec6fb..c81f0d533 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.44 2008/02/12 02:09:23 dillon Exp $
+ * $DragonFly: src/sys/sys/param.h,v 1.45 2008/02/12 02:26:05 dillon Exp $
  */
 
 #ifndef _SYS_PARAM_H_
@@ -48,20 +48,18 @@
 #define BSD4_4	1		/* XXX obsolete */
 
 /*
- * __DragonFly_version number.   Note that the name and comment are pattern
- * searched from conf/newvers.sh.
- *
- * Version changes should be documented in:
- *	doc/en_US.ISO8859-1/books/porters-handbook/book.sgml
+ * __DragonFly_version number.  The number doesn't really meaningfully
+ * translate to a version number.
  *
  * 170000 - base development version after 1.6 branch
  * 170001 - base development version before 1.8 branch
  * 190000 - base development version after 1.8 branch
  * 195000 - base development version after 1.10 branch
- * 197500 - base development version after 1.12 branch
+ * 197500 - base development version before 1.12 branch
+ * 197600 - base development version after 1.12 branch
  */
 #undef __DragonFly_version
-#define __DragonFly_version 197500	/* Master, propagated to newvers */
+#define __DragonFly_version 197600	/* Master, propagated to newvers */
 
 #ifdef __FreeBSD__
 /* 
-- 
2.11.4.GIT