aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorRalph Amissah <ralph@amissah.com>2010-02-10 16:57:43 -0500
committerRalph Amissah <ralph@amissah.com>2010-02-10 16:57:43 -0500
commit8ec22ff6969c0963d07a4d7df4fb68161e53bcf2 (patch)
tree1803f0d8494d9de1c455dcb67fb8a87f88ccdd51
parentMerge branch 'upstream' into debian/sid (diff)
parentFree as in Freedom (on RMS), by Sam Williams, sample markup, markup variation... (diff)
Merge branch 'upstream' into debian/sid
-rw-r--r--CHANGELOG10
-rw-r--r--data/v1/samples/gpl2.fsf.sst2
-rw-r--r--data/v1/samples/gpl3.fsf.sst2
3 files changed, 12 insertions, 2 deletions
diff --git a/CHANGELOG b/CHANGELOG
index bc9380d..eb9538e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -6,6 +6,16 @@ Reverse Chronological:
%% STABLE MANIFEST
+%% sisu-markup-samples_1.1.1.orig.tar.gz (2010-02-10:06/3)
+http://www.jus.uio.no/sisu/archive/pool/non-free/s/sisu-markup-samples/sisu-markup-samples_1.1.1.orig.tar.gz
+ sisu-markup-samples_1.1.1.orig.tar.gz
+ sisu-markup-samples_1.1.1-1.dsc
+ sisu-markup-samples_1.1.1-1.diff.gz
+
+ * Free as in Freedom (on RMS), Sam Williams, markup variation, affects numbering
+
+ * minor consistency changes
+
%% sisu-markup-samples_1.1.0.orig.tar.gz (2010-02-08:06/1)
http://www.jus.uio.no/sisu/archive/pool/non-free/s/sisu-markup-samples/sisu-markup-samples_1.1.0.orig.tar.gz
75c494828243499858bec1ed0c562816fa6cfcfe98cab313b0c54cffe5903d08 6424056 sisu-markup-samples_1.1.0.orig.tar.gz
diff --git a/data/v1/samples/gpl2.fsf.sst b/data/v1/samples/gpl2.fsf.sst
index b091616..af558ef 100644
--- a/data/v1/samples/gpl2.fsf.sst
+++ b/data/v1/samples/gpl2.fsf.sst
@@ -1,4 +1,4 @@
-% SiSU 0.38
+% SiSU 1.0
@title: GNU GENERAL PUBLIC LICENSE v2
diff --git a/data/v1/samples/gpl3.fsf.sst b/data/v1/samples/gpl3.fsf.sst
index 10889ac..92b026a 100644
--- a/data/v1/samples/gpl3.fsf.sst
+++ b/data/v1/samples/gpl3.fsf.sst
@@ -1,4 +1,4 @@
-SiSU 0.52
+% SiSU 1.0
@title: GNU GENERAL PUBLIC LICENSE v3