diff options
| author | Joachim Breitner <nomeata@debian.org> | 2011-04-20 12:47:26 +0400 |
|---|---|---|
| committer | Joachim Breitner <nomeata@debian.org> | 2011-04-20 12:47:26 +0400 |
| commit | bc0f7cf9c71f7b77bbefff2bd7e68df53fe19979 (patch) | |
| tree | 3d453adcc81138a1f1a8bf9bcb5f2812fa7c38ab /p/hslogger | |
| parent | 1b5155062447841b7b076c210400a6d2a2f09e23 (diff) | |
| download | DHG_packages-bc0f7cf9c71f7b77bbefff2bd7e68df53fe19979.tar.gz | |
hslogger: Remove java stuff instead of building it
Diffstat (limited to 'p/hslogger')
| -rw-r--r-- | p/hslogger/debian/changelog | 5 | ||||
| -rw-r--r-- | p/hslogger/debian/control | 3 | ||||
| -rw-r--r-- | p/hslogger/debian/copyright | 5 | ||||
| -rw-r--r-- | p/hslogger/debian/libghc-hslogger-dev.install | 1 | ||||
| -rwxr-xr-x | p/hslogger/debian/rules | 7 |
5 files changed, 3 insertions, 18 deletions
diff --git a/p/hslogger/debian/changelog b/p/hslogger/debian/changelog index 03bd97a0a..9b38f4b9c 100644 --- a/p/hslogger/debian/changelog +++ b/p/hslogger/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@debian.org> Mon, 18 Apr 2011 15:48:28 +0530 diff --git a/p/hslogger/debian/control b/p/hslogger/debian/control index 99e1eae14..3a2f108f6 100644 --- a/p/hslogger/debian/control +++ b/p/hslogger/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/p/hslogger/debian/copyright b/p/hslogger/debian/copyright index 37b04124b..ce8eb838b 100644 --- a/p/hslogger/debian/copyright +++ b/p/hslogger/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/p/hslogger/debian/libghc-hslogger-dev.install b/p/hslogger/debian/libghc-hslogger-dev.install deleted file mode 100644 index 9624a69fc..000000000 --- a/p/hslogger/debian/libghc-hslogger-dev.install +++ /dev/null @@ -1 +0,0 @@ -contrib/java/hslogger4j.jar /usr/share/doc/libghc-hslogger-dev/contrib/ diff --git a/p/hslogger/debian/rules b/p/hslogger/debian/rules index f3a16134d..0e3080d0a 100755 --- a/p/hslogger/debian/rules +++ b/p/hslogger/debian/rules @@ -3,10 +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 |