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

[Joachim Breitner]

The following commit has been merged in the master branch:
commit 1f6ace8e4500e584a4c0121b4583162f59e59e48
Author: Joachim Breitner <nomeata at debian.org>
Date:   Wed Apr 20 14:13:37 2011 +0530

    Remove java stuff instead of building it

diff --git a/debian/changelog b/debian/changelog
index e0219bf..5f6c513 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
-hslogger (1.0.10-2) UNRELEASED; urgency=low
+hslogger (1.0.10+dfsg1-1) UNRELEASED; urgency=low
 
-  * Mention hslogger2j, remove .jar on clean, build it in build
+  * Repack original tarball to remove java files with unclear distributability
+    status.
 
  -- Joachim Breitner <nomeata at debian.org>  Mon, 18 Apr 2011 15:48:28 +0530
 
diff --git a/debian/control b/debian/control
index 99e1eae..3a2f108 100644
--- a/debian/control
+++ b/debian/control
@@ -16,9 +16,6 @@ Build-Depends: debhelper (>= 7),
  libghc-time-prof,
  libghc-network-dev,
  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 37b0412..ce8eb83 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -22,8 +22,3 @@ distribution.  Debian GNU/Linux users may find this in
 
 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
deleted file mode 100644
index 9624a69..0000000
--- a/debian/libghc-hslogger-dev.install
+++ /dev/null
@@ -1 +0,0 @@
-contrib/java/hslogger4j.jar /usr/share/doc/libghc-hslogger-dev/contrib/
diff --git a/debian/rules b/debian/rules
index c75242e..0e3080d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,12 +3,3 @@
 # Standard way of building Haskell libraries .
 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