From 0c4bffc07be57aaa826bb88c877a14a3098735f8 Mon Sep 17 00:00:00 2001 From: Matthew Dillon Date: Wed, 4 Feb 2009 21:12:50 -0800 Subject: [PATCH] Release Engineering: Update 2.2 branch, adjust release identifiers for 2.2. --- sys/conf/newvers.sh | 2 +- sys/conf/subvers-DEVELOPMENT_2_1 | 4 ---- sys/conf/subvers-DEVELOPMENT_2_3 | 3 --- sys/conf/subvers-RELEASE_2_2 | 3 +++ sys/sys/param.h | 2 +- 5 files changed, 5 insertions(+), 9 deletions(-) delete mode 100644 sys/conf/subvers-DEVELOPMENT_2_1 delete mode 100644 sys/conf/subvers-DEVELOPMENT_2_3 create mode 100644 sys/conf/subvers-RELEASE_2_2 diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index 47c6ed47eb..f4de7e2bee 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -37,7 +37,7 @@ # Set the branch # -BRANCH="DEVELOPMENT_2_3" +BRANCH="RELEASE_2_2" TYPE="DragonFly" diff --git a/sys/conf/subvers-DEVELOPMENT_2_1 b/sys/conf/subvers-DEVELOPMENT_2_1 deleted file mode 100644 index 70d9f80878..0000000000 --- a/sys/conf/subvers-DEVELOPMENT_2_1 +++ /dev/null @@ -1,4 +0,0 @@ -# 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 - -1 - diff --git a/sys/conf/subvers-DEVELOPMENT_2_3 b/sys/conf/subvers-DEVELOPMENT_2_3 deleted file mode 100644 index 6d290b48e4..0000000000 --- a/sys/conf/subvers-DEVELOPMENT_2_3 +++ /dev/null @@ -1,3 +0,0 @@ -# Subversion control for DragonFly 2.3.X-DEVELOPMENT -# -0 - diff --git a/sys/conf/subvers-RELEASE_2_2 b/sys/conf/subvers-RELEASE_2_2 new file mode 100644 index 0000000000..a306820406 --- /dev/null +++ b/sys/conf/subvers-RELEASE_2_2 @@ -0,0 +1,3 @@ +# Subversion control for DragonFly 2.2.X-RELEASE +# +0 - diff --git a/sys/sys/param.h b/sys/sys/param.h index 4671736ae8..c37f380586 100644 --- a/sys/sys/param.h +++ b/sys/sys/param.h @@ -66,7 +66,7 @@ * 200201 - base development version after 2.2 branch */ #undef __DragonFly_version -#define __DragonFly_version 200201 /* Master, propagated to newvers */ +#define __DragonFly_version 200200 /* Master, propagated to newvers */ #ifdef __FreeBSD__ /* -- 2.11.4.GIT