The following commit has been merged in the master branch:
commit 5198183174596892d472c84ba5c7041360865bcf
Merge: cf4049a5d5cf184f28e0f49248a3b82ae979b617 
4b2d7754fd5a6a2aaef4624b4134a94bfef2c525
Author: Ralf Treinen <trei...@free.fr>
Date:   Mon May 6 20:43:50 2013 +0200

    Merge experimental back into master

diff --combined debian/changelog
index 0398fb9,af197e8..3658246
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,61 +1,67 @@@
- hevea (1.10-15) UNRELEASED; urgency=low
++hevea (2.06-2) unstable; urgency=low
 +
-   * Remove Sylvain Le Gall from uploaders
++  * Upload to unstable.
 +
-  -- Sylvain Le Gall <gil...@debian.org>  Fri, 21 Sep 2012 01:15:18 +0000
++ -- Ralf Treinen <trei...@debian.org>  Mon, 06 May 2013 20:48:42 +0200
++
+ hevea (2.06-1) experimental; urgency=low
+ 
+   * New upstream release.
+ 
+  -- Ralf Treinen <trei...@debian.org>  Wed, 03 Apr 2013 08:17:48 +0200
+ 
+ hevea (2.03-1) experimental; urgency=low
+ 
+   * New upstream release
+ 
+  -- Ralf Treinen <trei...@debian.org>  Thu, 07 Mar 2013 19:15:46 +0100
+ 
+ hevea (2.02-1) experimental; urgency=low
+ 
+   * New upstream release.
+   * Standards-Version 3.9.4 (no change)
+   * Long package description: drop the phrase concerning the patch replacing
+     the default image format since this is no longer true (since version 2.0).
+   * Bump build-dependency on ocaml to >=3.12, following upstream's README.
+ 
+  -- Ralf Treinen <trei...@debian.org>  Wed, 30 Jan 2013 09:50:06 +0100
+ 
+ hevea (2.00-1) experimental; urgency=low
+ 
+   * New upstream version
+     - dropped patch nogif since upstream has now followed debian in using png
+       as default image format.
+     - dropped patch gs-options which is now applied by upstream.
+   * debian/rules:
+     - pass the DESTDIR variable in the install target, not in
+       the configure target.
+     - install target: remove usr/share/hevea/imagen, since upstream
+       installs that file already in /usr/bin.
+   * Add debian/hevea.links:
+     - Link for /usr/bin/hevea from /usr/share/hevea. 
+       Necessary since hevea excepts imagen to live in that directory.
+   * Standards-version 3.9.3:
+     - debian/copyright: migrate to machine-readable format 1.0
+   * debian/control:
+     - dropped Sylvain le Gall from uploaders, on his request.
+   * debian/manpages/hevea.1:
+     - dropped the paragraph on using a different default image format as
+       upstream, since it no longer applies.
+     - fixed a typo (missing space)
+     - added the option -rsz
+   * debian/manpages/hacha.1:
+     - introduced subsections for different types of options
+     - added options -rsz, -tocter, --help, -version.
+     - fixed a typo (htmlcut -> hacha)
+   * debian/manpages/imagen.1
+     - dropped the paragraph on using a different default image format as
+       upstream, since it no longer applies.
+     - small improvements in description of options. 
+   * debian/README.Debian
+     - dropped this file, it no longer applies since debian and upstream now
+       use the same default image format.
+ 
+  -- Ralf Treinen <trei...@debian.org>  Wed, 26 Sep 2012 11:47:21 +0200
  
  hevea (1.10-14) unstable; urgency=low
  

-- 
hevea packaging

_______________________________________________
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits

Reply via email to