[Pkg-haskell-commits] [SCM] Haskell Logging System Packaging branch, master, updated. debian/1.0.9-4-11-gf31af04

[Joachim Breitner]

The following commit has been merged in the master branch:
commit f31af04d3750467905c14d7c723b06fd06d45164
Author: Joachim Breitner <nomeata at debian.org>
Date:   Mon Apr 18 15:49:07 2011 +0530

    Mention hslogger2j, remove .jar on clean, build it in build

diff --git a/contrib/java/hslogger4j.jar b/contrib/java/hslogger4j.jar
deleted file mode 100644
index c0b4611..0000000
Binary files a/contrib/java/hslogger4j.jar and /dev/null differ
diff --git a/debian/changelog b/debian/changelog
index e3d1052..e0219bf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+hslogger (1.0.10-2) UNRELEASED; urgency=low
+
+  * Mention hslogger2j, remove .jar on clean, build it in build
+
+ -- Joachim Breitner <nomeata at debian.org>  Mon, 18 Apr 2011 15:48:28 +0530
+
 hslogger (1.0.10-1) unstable; urgency=low
 
   * s/ghc6/ghc/
diff --git a/debian/control b/debian/control
index 0af3efd..99e1eae 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,10 @@ Build-Depends: debhelper (>= 7),
  libghc-time-dev,
  libghc-time-prof,
  libghc-network-dev,
- libghc-network-prof
+ libghc-network-prof,
+ ant,
+ openjdk-6-jdk,
+ liblog4j1.2-java,
 Build-Depends-Indep:
  ghc-doc,
  libghc-mtl-doc,
diff --git a/debian/copyright b/debian/copyright
index 2774781..37b0412 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -20,6 +20,10 @@ The GNU General Public License is available in the file COPYING in the source
 distribution.  Debian GNU/Linux users may find this in
 /usr/share/common-licenses/LGPL-2.1.
 
-If the LGPL is unacceptable for your uses, please e-mail me; alternative
+If the LGPL is unacceptable for your uses, please e-mail the author; alternative
 terms can be negotiated for your project.
 
+The files in contrib/java are copyright
+	© 1999,2004 The Apache Software Foundation
+and distributed unter the Apache License, Version 2.0. Debian GNU/Linux users
+may find this licenses in /usr/share/common-licenses/Apache-2.0
diff --git a/debian/libghc-hslogger-dev.install b/debian/libghc-hslogger-dev.install
new file mode 100644
index 0000000..9624a69
--- /dev/null
+++ b/debian/libghc-hslogger-dev.install
@@ -0,0 +1 @@
+contrib/java/hslogger4j.jar /usr/share/doc/libghc-hslogger-dev/contrib/
diff --git a/debian/rules b/debian/rules
index bc087e2..c75242e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,3 +4,11 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/hlibrary.mk
 
+build/libghc-hslogger-dev::
+	cd contrib/java/; ant
+
+clean::
+	cd contrib/java/; ant clean
+	rm -f contrib/java/hslogger4j.jar
+	
+

-- 
Haskell Logging System Packaging