diff options
| author | Ralph Amissah <ralph@amissah.com> | 2012-04-22 13:52:17 -0400 |
|---|---|---|
| committer | Ralph Amissah <ralph@amissah.com> | 2012-04-22 13:52:17 -0400 |
| commit | b169f75ff002a0e11b252480e437eacdaf2c9cb9 (patch) | |
| tree | b8e72d8d0c26cc2f1eabc99d84d1a07ee420e67b /data | |
| parent | debian/changelog (3.2.4-1) (diff) | |
| parent | v3: shared_html_lite, codeblock fix, affecting sql (diff) | |
Merge tag 'sisu_3.2.5' into debian/sid
Diffstat (limited to 'data')
| -rw-r--r-- | data/doc/sisu/CHANGELOG_v3 | 18 | ||||
| -rw-r--r-- | data/sisu/v3/v/version.yml | 6 |
2 files changed, 18 insertions, 6 deletions
diff --git a/data/doc/sisu/CHANGELOG_v3 b/data/doc/sisu/CHANGELOG_v3 index 23b5d927..96450db9 100644 --- a/data/doc/sisu/CHANGELOG_v3 +++ b/data/doc/sisu/CHANGELOG_v3 @@ -13,13 +13,25 @@ Reverse Chronological: %% Development branch UNSTABLE v3 branch once stable will supersede & replace current stable v2 branch +%% 3.2.5.orig.tar.xz (2012-04-22:16/7) +http://git.sisudoc.org/?p=code/sisu.git;a=log;h=refs/tags/sisu_3.2.5 +http://git.sisudoc.org/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_3.2.5-1 +http://www.jus.uio.no/sisu/pkg/src/sisu_3.2.5.orig.tar.xz + sisu_3.2.5.orig.tar.xz + sisu_3.2.5-1.dsc + sisu_3.2.5-1.debian.tar.gz + + * v3: shared_html_lite, codeblock fix, affecting sql: + SELECT ocn,body FROM doc_objects WHERE t_is='code'; + SELECT ocn,clean FROM doc_objects; + %% 3.2.4.orig.tar.xz (2012-04-21:16/6) http://git.sisudoc.org/?p=code/sisu.git;a=log;h=refs/tags/sisu_3.2.4 http://git.sisudoc.org/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_3.2.4-1 http://www.jus.uio.no/sisu/pkg/src/sisu_3.2.4.orig.tar.xz - sisu_3.2.4.orig.tar.xz - sisu_3.2.4-1.dsc - sisu_3.2.4-1.debian.tar.gz + 6bb53debc788a572562272d4f639ca872a2995e06b2d3fa6e867c44ac8f7194e 1682800 sisu_3.2.4.orig.tar.xz + 256d99071bd4ea95020df777b40451f7bb79cfd6531351f0fd00734cc9133c73 1382 sisu_3.2.4-1.dsc + 31bf5091aaf1122906de09c9d17d3b2fccd4fd6cfdc768fad5485b8c0bb98d63 295114 sisu_3.2.4-1.debian.tar.gz * v3: db bugfix in maintenance mode (variable name reused) diff --git a/data/sisu/v3/v/version.yml b/data/sisu/v3/v/version.yml index 50d7de5c..1ce9ed62 100644 --- a/data/sisu/v3/v/version.yml +++ b/data/sisu/v3/v/version.yml @@ -1,5 +1,5 @@ --- -:version: 3.2.4 -:date_stamp: 2012w16/4 -:date: "2012-04-19" +:version: 3.2.5 +:date_stamp: 2012w16/7 +:date: "2012-04-22" :project: SiSU |