[Pkg-ocaml-maint-commits] [SCM] hevea packaging branch, experimental/master, updated. debian/1.10-14-16-ge605d79

[Ralf Treinen]

The following commit has been merged in the experimental/master branch:
commit 038f774aed904b82c5ff21c89268e99ecd38dd6b
Author: Ralf Treinen <treinen at debian.org>
Date:   Thu Sep 6 20:23:03 2012 +0900

    drop duplicate installation of imagen

diff --git a/debian/changelog b/debian/changelog
index 4fedfe8..e5856e9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,12 +4,15 @@ hevea (2.00-1) experimental-UNRELEASED; urgency=low
     - dropped patch nogif since upstream has now followd us 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.
+  * 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.
   * Standards-version 3.9.3:
     - debian/copyright: migrate to machine-readable format 1.0
 
- -- Ralf Treinen <treinen at debian.org>  Thu, 06 Sep 2012 17:49:08 +0900
+ -- Ralf Treinen <treinen at debian.org>  Thu, 06 Sep 2012 20:22:23 +0900
 
 hevea (1.10-14) unstable; urgency=low
 
diff --git a/debian/rules b/debian/rules
index 8be95d0..38466f8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -21,6 +21,8 @@ override_dh_auto_build:
 
 override_dh_auto_install:
 	$(MAKE) install TARGET=byte DESTDIR=$(DEB_DESTDIR)
+	-rm $(DEB_DESTDIR)/usr/share/hevea/imagen
+
 
 
 

-- 
hevea packaging