aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorRalph Amissah <ralph@amissah.com>2010-02-10 16:45:04 -0500
committerRalph Amissah <ralph@amissah.com>2010-02-10 16:45:04 -0500
commit7523edb0313bb8d130718563ecb934bb9832f5f9 (patch)
treec5db4773af54ba0e7cbbb1d377d844253e1c8a70
parentdebian/control add ${misc:Depends} (diff)
parentFree as in Freedom (on RMS), by Sam Williams, sample markup, markup variation... (diff)
Merge branch 'upstream' into debian/sid
-rw-r--r--CHANGELOG15
-rw-r--r--conf/sisu/v1/version.yml6
-rw-r--r--data/doc/sisu/v1/CHANGELOG15
-rw-r--r--data/doc/sisu/v1/sisu_markup_samples/samples/free_as_in_freedom.richard_stallman_crusade_for_free_software.sam_williams.sst14
4 files changed, 32 insertions, 18 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 1328ce38..c81c90fd 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -10,11 +10,20 @@ Reverse Chronological:
%% STABLE MANIFEST
+%% 1.0.2.orig.tar.gz (2010-02-10:06/3)
+http://www.jus.uio.no/sisu/pkg/src/sisu_1.0.2.orig.tar.gz
+ sisu_1.0.2.orig.tar.gz
+ sisu_1.0.2-1.dsc
+ sisu_1.0.2-1.diff.gz
+
+ * Free as in Freedom (on RMS), Sam Williams, markup sample, markup variation,
+ affects numbering
+
%% 1.0.1.orig.tar.gz (2010-02-08:06/1)
http://www.jus.uio.no/sisu/pkg/src/sisu_1.0.1.orig.tar.gz
- sisu_1.0.1.orig.tar.gz
- sisu_1.0.1-1.dsc
- sisu_1.0.1-1.diff.gz
+ 0318822b712d4b748d18be4211e3266a2c2689e0809d85219855c7314f2b5942 1556988 sisu_1.0.1.orig.tar.gz
+ 94d0d66971d0316587f300a20bfb1346f27361d94dedc1c746670707e984aecd 1145 sisu_1.0.1-1.dsc
+ dd9f08f02ae09624bde4314472815eed3be205b001587193c76484b36d8cd68c 152471 sisu_1.0.1-1.diff.gz
* odf:odt odt.zip fix addressing issue with presentation of headings in
produced open document text
diff --git a/conf/sisu/v1/version.yml b/conf/sisu/v1/version.yml
index aa2e66f9..1c19f09a 100644
--- a/conf/sisu/v1/version.yml
+++ b/conf/sisu/v1/version.yml
@@ -1,5 +1,5 @@
---
-:version: 1.0.1
-:date_stamp: 2010w06/1
-:date: "2010-02-08"
+:version: 1.0.2
+:date_stamp: 2010w06/3
+:date: "2010-02-10"
:project: SiSU
diff --git a/data/doc/sisu/v1/CHANGELOG b/data/doc/sisu/v1/CHANGELOG
index 1328ce38..c81c90fd 100644
--- a/data/doc/sisu/v1/CHANGELOG
+++ b/data/doc/sisu/v1/CHANGELOG
@@ -10,11 +10,20 @@ Reverse Chronological:
%% STABLE MANIFEST
+%% 1.0.2.orig.tar.gz (2010-02-10:06/3)
+http://www.jus.uio.no/sisu/pkg/src/sisu_1.0.2.orig.tar.gz
+ sisu_1.0.2.orig.tar.gz
+ sisu_1.0.2-1.dsc
+ sisu_1.0.2-1.diff.gz
+
+ * Free as in Freedom (on RMS), Sam Williams, markup sample, markup variation,
+ affects numbering
+
%% 1.0.1.orig.tar.gz (2010-02-08:06/1)
http://www.jus.uio.no/sisu/pkg/src/sisu_1.0.1.orig.tar.gz
- sisu_1.0.1.orig.tar.gz
- sisu_1.0.1-1.dsc
- sisu_1.0.1-1.diff.gz
+ 0318822b712d4b748d18be4211e3266a2c2689e0809d85219855c7314f2b5942 1556988 sisu_1.0.1.orig.tar.gz
+ 94d0d66971d0316587f300a20bfb1346f27361d94dedc1c746670707e984aecd 1145 sisu_1.0.1-1.dsc
+ dd9f08f02ae09624bde4314472815eed3be205b001587193c76484b36d8cd68c 152471 sisu_1.0.1-1.diff.gz
* odf:odt odt.zip fix addressing issue with presentation of headings in
produced open document text
diff --git a/data/doc/sisu/v1/sisu_markup_samples/samples/free_as_in_freedom.richard_stallman_crusade_for_free_software.sam_williams.sst b/data/doc/sisu/v1/sisu_markup_samples/samples/free_as_in_freedom.richard_stallman_crusade_for_free_software.sam_williams.sst
index 74b90a4f..bfcd69e0 100644
--- a/data/doc/sisu/v1/sisu_markup_samples/samples/free_as_in_freedom.richard_stallman_crusade_for_free_software.sam_williams.sst
+++ b/data/doc/sisu/v1/sisu_markup_samples/samples/free_as_in_freedom.richard_stallman_crusade_for_free_software.sam_williams.sst
@@ -1,4 +1,4 @@
-% SiSU 0.38
+% SiSU 1.0
@title: Free as in Freedom
@@ -37,11 +37,7 @@
% @promo: sisu_icon, sample_search, fsf, open_society, sisu
-:A~ Free as in Freedom
-
-:B~ Richard Stallman's Crusade for Free Software
-
-:C~ By Sam Williams
+:A~ @title @author
1~preface Preface
@@ -68,7 +64,7 @@ One final note: this is a work of journalism, but it is also a work of technical
Please address comments and questions concerning this book to the publisher:
-poem{
+group{
O'Reilly & Associates, Inc.
1005 Gravenstein Highway North
@@ -77,7 +73,7 @@ poem{
(707) 829-0515 (international/local)
(707) 829-0104 (fax)
-}poem
+}group
There is a web page for this book, which lists errata, examples, or any additional information. The site also includes a link to a forum where you can discuss the book with the author and other readers. You can access this site at:
@@ -1673,7 +1669,7 @@ By 1993, the GNU Project's inability to deliver a working kernel was leading to
% ={Chassell, Robert}
-% note difference in spelling of name Chasell/Chassel in footnote
+% note difference in spelling of name Chasell/Chassel in footnote
Much has been made about the GNU Project's struggles during the 1990-1993 period. While some place the blame on Stallman for those struggles, Eric Raymond, an early member of the GNU Emacs team and later Stallman critic, says the problem was largely institutional. "The FSF got arrogant," Raymond says. "They moved away from the goal of doing a production-ready operating system to doing operating-system research." Even worse, "They thought nothing outside the FSF could affect them."
={HURD kernel+4;Raymond, Eric}