summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2013-11-02 16:09:04 +0100
committerJonas Smedegaard <dr@jones.dk>2013-11-02 16:09:04 +0100
commit4e99b886d1a90bf13bda962954325cd0e350300b (patch)
tree2e2bb8e1022e00179997e80ebf065978dfd8ce17 /debian
parent023c07bd3dcdcf915b23eb7852dacefd7b4fe5c9 (diff)
Prepare for release: Update changelog and control file.
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog12
-rw-r--r--debian/control8
2 files changed, 14 insertions, 6 deletions
diff --git a/debian/changelog b/debian/changelog
index 6ac4fd716..f540290d9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,17 @@
-pandoc (1.11.1-5) UNRELEASED; urgency=low
+pandoc (1.11.1-5) unstable; urgency=low
* Have pandoc depend on (not recommend) pandoc-data.
Closes: bug#724102. Thanks to David Suárez and others involved.
* Drop bogus note for backporters in changelog entry for 1.11.1-4.
(note to self: never write notes here, always use README.Debian!).
-
- -- Jonas Smedegaard <dr@jones.dk> Sat, 28 Sep 2013 15:24:58 +0200
+ * Have pandoc-data symlink and depend on separately packaged S5.
+ Closes: bug#631848. Thanks to Clint Adams.
+ * Bump standards-version to 3.9.5.
+ * Update copyright file to document how Slidy is covered only by W3C
+ software license (not also document license).
+ Closes: bug#722134. Thanks to Francesco Poli.
+
+ -- Jonas Smedegaard <dr@jones.dk> Sat, 02 Nov 2013 16:09:01 +0100
pandoc (1.11.1-4) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 568e28e8f..136df46d6 100644
--- a/debian/control
+++ b/debian/control
@@ -94,14 +94,15 @@ Build-Depends-Indep: ghc-doc
, libghc-pcre-light-doc
, libghc-transformers-doc
, libghc-utf8-string-doc
-Standards-Version: 3.9.4
+Standards-Version: 3.9.5
Homepage: http://johnmacfarlane.net/pandoc/
Vcs-Git: git://anonscm.debian.org/git/collab-maint/pandoc.git
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/pandoc.git
Package: pandoc
Architecture: any
-Depends: ${misc:Depends}
+Depends: ${cdbs:Depends}
+ , ${misc:Depends}
, ${shlibs:Depends}
Recommends: ${cdbs:Recommends}
Suggests: ${cdbs:Suggests}
@@ -138,7 +139,8 @@ Description: general markup converter
Package: pandoc-data
Architecture: all
-Depends: ${misc:Depends}
+Depends: ${cdbs:Depends}
+ , ${misc:Depends}
Recommends: ${cdbs:Recommends}
Suggests: ${cdbs:Suggests}
Description: general markup converter - data files