version & changelog v7

* version info changes cause break, fixed in next commit

6 files changed, 48 insertions, 15 deletions

diff --git a/CHANGELOGS/CHANGELOG_v7 b/CHANGELOGS/CHANGELOG_v7
new file mode 120000
index 00000000..12431eef
--- /dev/null
+++ b/CHANGELOGS/CHANGELOG_v7
@@ -0,0 +1 @@
+../data/doc/sisu/CHANGELOG_v7
\ No newline at end of file
diff --git a/data/doc/sisu/CHANGELOG_v7 b/data/doc/sisu/CHANGELOG_v7
new file mode 100644
index 00000000..8f235cf2
--- /dev/null
+++ b/data/doc/sisu/CHANGELOG_v7
@@ -0,0 +1,41 @@
+SiSU CHANGELOG    -*- mode: org; -*-
+* SiSU version 7
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=data/doc/sisu/CHANGELOG_v7;hb=HEAD>
+  * debian/changelog
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob_plain;f=debian/changelog;hb=refs/heads/debian/sid>
+
+v7 opened (single lib dir (separate current/stable & development branches removed) rolls in v6)
+v6 branch (for development and testing prior) removed; available in sisu < 5.8.0
+v5 branch removed; available in sisu < 5.8.0
+v4 branch removed; available in sisu < 4.2.20
+v3 branch removed; available in sisu < 4.1.0
+v2 branch removed; available in sisu =< 3.3.2
+
+  * homepage at: <http://www.jus.uio.no/sisu>
+  * <http://www.jus.uio.no/sisu/SiSU/download>
+  * <http://www.jus.uio.no/sisu/SiSU/changelog>
+  * <http://sisudoc.org/sisu/sisu_manual>
+  * data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_manual.ssm
+  * data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_download.ssi
+  * CHANGELOG CHANGELOG_v2 CHANGELOG_v3 README data/doc/sisu/
+
+* Reverse Chronological:
+
+--- HEAD ---
+
+** 7.0.0.orig.tar.xz (Open commit window: 2015-04-17; Pre-Release))
+http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_7.0.0
+http://www.jus.uio.no/sisu/pkg/src/sisu_7.0.0.orig.tar.xz
+  sisu_7.0.0.orig.tar.xz
+
+* v7 opened
+  * v5 branch closed (available <= 5.8.0)
+  * v6 development moved to stable closed (available <= 6.5.0)
+  * v7 development branch opened (using v6 HEAD)
+    lib/sisu/*, single libs directory (c&d gone) (7)
+* removed lib/sisu/{current,develop} dir branches
+  v7 (v5 & v6 retired)
+  * simplify dir structure, offer single sisu version per snapshot
+  * have enjoyed carrying stable and development versions v5 & v6
+    in a single tarball, may return to this structure
diff --git a/data/sisu/version.yml b/data/sisu/version.yml
new file mode 100644
index 00000000..3d7c8ea3
--- /dev/null
+++ b/data/sisu/version.yml
@@ -0,0 +1,5 @@
+---
+:project: SiSU
+:version: 7.0.0
+:date_stamp: 2015w16/1
+:date: "2015-04-20"
diff --git a/data/sisu/version/current.yml b/data/sisu/version/current.yml
deleted file mode 100644
index 82262ef8..00000000
--- a/data/sisu/version/current.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-:project: SiSU
-:version: 5.9.0
-:date_stamp: 2015w16/2
-:date: "2015-04-21"
diff --git a/data/sisu/version/develop.yml b/data/sisu/version/develop.yml
deleted file mode 100644
index f69fce72..00000000
--- a/data/sisu/version/develop.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-:project: SiSU
-:version: 6.5.0
-:date_stamp: 2015w16/2
-:date: "2015-04-21"
diff --git a/setup/sisu_version.rb b/setup/sisu_version.rb
index 6361cdc1..07de90cc 100644
--- a/setup/sisu_version.rb
+++ b/setup/sisu_version.rb
@@ -1,10 +1,6 @@
 #% constants
 module SiSUversion
-  SiSU_version_next_stable           = '5.9.0'  #% set version stable current
-  SiSU_version_next_unstable         = '6.5.0'  #% set version unstable dev
-  #% qi quick install file
-  SiSU_version_dir_stable            = 'current'
-  SiSU_version_dir_unstable          = 'develop'
+  SiSU_version_next_stable           = '7.0.0'  #% set version stable current
 end
 module Dev
   GPGpubKey                          = '1BB4B289'