diff options
author | Ralph Amissah <ralph@amissah.com> | 2012-01-23 21:52:37 -0500 |
---|---|---|
committer | Ralph Amissah <ralph@amissah.com> | 2012-01-23 21:52:37 -0500 |
commit | dc5c01b1033cfc9e09fd4fc29666e826e67cd7bb (patch) | |
tree | e53a389c4f669d79b5b82ce6fd1853da6b25f85d /data | |
parent | debian/changelog (3.1.11-1) (diff) | |
parent | v3dv: replace use of most ruby exclamation (!) method actions (diff) |
Merge commit 'sisu_3.1.12' into debian/sid
Diffstat (limited to 'data')
-rw-r--r-- | data/doc/sisu/CHANGELOG_v3 | 27 | ||||
-rw-r--r-- | data/sisu/v3/v/version.yml | 6 | ||||
-rw-r--r-- | data/sisu/v3dv/conf/convert/modify.rb | 2 | ||||
-rw-r--r-- | data/sisu/v3dv/v/version.yml | 6 |
4 files changed, 31 insertions, 10 deletions
diff --git a/data/doc/sisu/CHANGELOG_v3 b/data/doc/sisu/CHANGELOG_v3 index e132f417..79293dca 100644 --- a/data/doc/sisu/CHANGELOG_v3 +++ b/data/doc/sisu/CHANGELOG_v3 @@ -13,13 +13,34 @@ Reverse Chronological: %% Development branch UNSTABLE v3 branch once stable will supersede & replace current stable v2 branch +%% 3.1.12.orig.tar.xz (2012-01-23:04/1) +http://git.sisudoc.org/?p=code/sisu.git;a=log;h=refs/tags/sisu_3.1.12 +http://git.sisudoc.org/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_3.1.12-1 +http://www.jus.uio.no/sisu/pkg/src/sisu_3.1.12.orig.tar.xz + sisu_3.1.12.orig.tar.xz + sisu_3.1.12-1.dsc + sisu_3.1.12-1.debian.tar.gz + +* texpdf, tampering with "safe" special character transformations, a fix (that + may introduce new issues, watch) [in response to report of a pdf title bug + "&" not represented, Timothy Hume] + +* urls, odt maintenance path fix + +* v3dv, messing with code, merge back likely to become v3.2 + * call most methods by full name (include associated module & class names) + * replace most ruby exclamation (!) method actions + +* v3dv, sysenv, use "which" instead of "whereis" to locate programs, test + [suggested by, Timothy Hume, used to get sisu texpdf to work on MacOS] + %% 3.1.11.orig.tar.xz (2012-01-10:02/2) http://git.sisudoc.org/?p=code/sisu.git;a=log;h=refs/tags/sisu_3.1.11 http://git.sisudoc.org/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_3.1.11-1 http://www.jus.uio.no/sisu/pkg/src/sisu_3.1.11.orig.tar.xz - sisu_3.1.11.orig.tar.xz - sisu_3.1.11-1.dsc - sisu_3.1.11-1.debian.tar.gz + d94c7d2a514a33e897111ba05fabdc3186252037f0e03ba188ac233de76c8244 1665384 sisu_3.1.11.orig.tar.xz + 237270ed1416f708b6965b26da939538a2517d2408f6d97d2c7f5fb8ea0c590f 1389 sisu_3.1.11-1.dsc + 3bc6e173f905668d8d5c610280d946f9897b836dce0a834836b0e7c2ace05d44 291434 sisu_3.1.11-1.debian.tar.gz * date, year 2012, update diff --git a/data/sisu/v3/v/version.yml b/data/sisu/v3/v/version.yml index 94485abd..78011058 100644 --- a/data/sisu/v3/v/version.yml +++ b/data/sisu/v3/v/version.yml @@ -1,5 +1,5 @@ --- -:version: 3.1.11 -:date_stamp: 2012w02/2 -:date: "2012-01-10" +:version: 3.1.12 +:date_stamp: 2012w04/1 +:date: "2012-01-23" :project: SiSU diff --git a/data/sisu/v3dv/conf/convert/modify.rb b/data/sisu/v3dv/conf/convert/modify.rb index fab7832d..8a4b9074 100644 --- a/data/sisu/v3dv/conf/convert/modify.rb +++ b/data/sisu/v3dv/conf/convert/modify.rb @@ -173,7 +173,7 @@ WOK if t =~m p m.to_s + ' -> ' + r puts "in: #{t}" - t.gsub!(m,r) if m and r + t=t.gsub(m,r) if m and r puts "out: #{t}" end end diff --git a/data/sisu/v3dv/v/version.yml b/data/sisu/v3dv/v/version.yml index 90c5c6f6..2e506e6d 100644 --- a/data/sisu/v3dv/v/version.yml +++ b/data/sisu/v3dv/v/version.yml @@ -1,5 +1,5 @@ --- -:version: 3.1.11~dev -:date_stamp: 2012w02/2 -:date: "2012-01-10" +:version: 3.2.0~pre_3.1.12 +:date_stamp: 2012w04/1 +:date: "2012-01-23" :project: SiSU |