aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorRalph Amissah <ralph@amissah.com>2010-08-24 12:02:02 -0400
committerRalph Amissah <ralph@amissah.com>2010-08-24 12:02:02 -0400
commit734010ccc06105eff2ea882a5679fc49e09577bb (patch)
tree6d875bdeb89ba63f446ed6d6171a30c91f4080cb
parentchangelogs, touch date (diff)
parentCHANGELOG, package version & date (diff)
Merge branch 'upstream' into debian/sid
-rw-r--r--CHANGELOG34
1 files changed, 34 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 0637389..e56a240 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -6,6 +6,40 @@ Reverse Chronological:
%% STABLE MANIFEST
+%% sisu-markup-samples_2.0.6.orig.tar.gz (2010-08-24:34/2)
+http://www.jus.uio.no/sisu/archive/pool/non-free/s/sisu-markup-samples/sisu-markup-samples_2.0.6.orig.tar.gz
+ sisu-markup-samples_2.0.6.orig.tar.gz
+ sisu-markup-samples_2.0.6-1.dsc
+ sisu-markup-samples_2.0.6-1.diff.gz
+
+ [debian in freeze for squeeze, the only changes are documentation related]
+
+ * Viral Spiral, David Bollier markup sample added
+
+ * Book index fixes to existing markup samples
+
+ * Minor adjustments to markup sample headers where appropriate
+
+ * miscellaneous fixes,
+ * add missing skin for v1 markup of "CONTENT", Cory Doctorow
+ * "CONTENT", use preferred curly braces with emphasized text (v1 & v2)
+ * "Free Culture", document structure
+ * add v1 markup for "Democratizing Innovation", Eric von Hippel
+ * (headers & yaml), links added/updated
+
+ * COPYRIGHT and README update on contents
+
+ * Manpage update
+
+ * debian markup-samples headers tended to
+
+ * debian/control
+ * update contents
+ * make description match sisu
+ * update Standards-Version 3.9.1
+ * update Maintainers
+ * add Uploaders field
+
%% sisu-markup-samples_2.0.5.orig.tar.gz (2010-07-15:28/4)
http://www.jus.uio.no/sisu/archive/pool/non-free/s/sisu-markup-samples/sisu-markup-samples_2.0.5.orig.tar.gz
45366204c646b6f9fd751040cfe4e0380554922e79048746e66bca340ec919f4 14114039 sisu-markup-samples_2.0.5.orig.tar.gz