[pkg-java] r8115 - trunk/png-sixlegs/debian
dominik-guest at alioth.debian.org
dominik-guest at alioth.debian.org
Wed Mar 25 15:29:19 UTC 2009
Author: dominik-guest
Date: 2009-03-25 15:29:19 +0000 (Wed, 25 Mar 2009)
New Revision: 8115
Added:
trunk/png-sixlegs/debian/libpng-sixlegs-java-doc.docs
trunk/png-sixlegs/debian/libpng-sixlegs-java.docs
trunk/png-sixlegs/debian/libpng-sixlegs-java.jlibs
Removed:
trunk/png-sixlegs/debian/docs
Modified:
trunk/png-sixlegs/debian/changelog
trunk/png-sixlegs/debian/control
trunk/png-sixlegs/debian/rules
Log:
javahelper scripts + various fixes
Modified: trunk/png-sixlegs/debian/changelog
===================================================================
--- trunk/png-sixlegs/debian/changelog 2009-03-24 19:18:45 UTC (rev 8114)
+++ trunk/png-sixlegs/debian/changelog 2009-03-25 15:29:19 UTC (rev 8115)
@@ -6,11 +6,13 @@
* lintian warning resolved: no-section-field-for-source
* lintian info resolved: debian-watch-file-is-missing
* lintian info resolved: build-depends-without-arch-dep
- * lintian info resolved: extended-description-is-probably-too-short (libpng-sixlegs-java)
+ * lintian info resolved: extended-description-is-probably-too-short
* debian/copyright updated to conform Copyright Format proposal rev.443
- * Build-Depends-Indep: kaffe replaced by default-jdk
+ * Build-Depends-Indep: default-jdk
+ * javahelper scripts used in debian/rules
+ * created separated package for javadoc and examples
- -- Dominik Smatana <dominik.smatana at gmail.com> Wed, 18 Mar 2009 08:32:18 +0100
+ -- Dominik Smatana <dominik.smatana at gmail.com> Wed, 25 Mar 2009 16:22:20 +0100
png-sixlegs (1.2.3-3) unstable; urgency=low
Modified: trunk/png-sixlegs/debian/control
===================================================================
--- trunk/png-sixlegs/debian/control 2009-03-24 19:18:45 UTC (rev 8114)
+++ trunk/png-sixlegs/debian/control 2009-03-25 15:29:19 UTC (rev 8115)
@@ -2,7 +2,7 @@
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
Section: java
Priority: optional
-Build-Depends: debhelper (>> 5.0.0)
+Build-Depends: debhelper (>=5), javahelper
Build-Depends-Indep: default-jdk
Standards-Version: 3.8.0
Homepage: http://www.sixlegs.com/software/png/
Deleted: trunk/png-sixlegs/debian/docs
===================================================================
--- trunk/png-sixlegs/debian/docs 2009-03-24 19:18:45 UTC (rev 8114)
+++ trunk/png-sixlegs/debian/docs 2009-03-25 15:29:19 UTC (rev 8115)
@@ -1,2 +0,0 @@
-README.txt
-javadoc
Added: trunk/png-sixlegs/debian/libpng-sixlegs-java-doc.docs
===================================================================
--- trunk/png-sixlegs/debian/libpng-sixlegs-java-doc.docs (rev 0)
+++ trunk/png-sixlegs/debian/libpng-sixlegs-java-doc.docs 2009-03-25 15:29:19 UTC (rev 8115)
@@ -0,0 +1,3 @@
+README.txt
+javadoc
+src/examples
Added: trunk/png-sixlegs/debian/libpng-sixlegs-java.docs
===================================================================
--- trunk/png-sixlegs/debian/libpng-sixlegs-java.docs (rev 0)
+++ trunk/png-sixlegs/debian/libpng-sixlegs-java.docs 2009-03-25 15:29:19 UTC (rev 8115)
@@ -0,0 +1,2 @@
+README.txt
+
Added: trunk/png-sixlegs/debian/libpng-sixlegs-java.jlibs
===================================================================
--- trunk/png-sixlegs/debian/libpng-sixlegs-java.jlibs (rev 0)
+++ trunk/png-sixlegs/debian/libpng-sixlegs-java.jlibs 2009-03-25 15:29:19 UTC (rev 8115)
@@ -0,0 +1 @@
+png.jar
Modified: trunk/png-sixlegs/debian/rules
===================================================================
--- trunk/png-sixlegs/debian/rules 2009-03-24 19:18:45 UTC (rev 8114)
+++ trunk/png-sixlegs/debian/rules 2009-03-25 15:29:19 UTC (rev 8115)
@@ -3,32 +3,20 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
- CFLAGS += -g
-endif
+export JAVA_HOME=/usr/lib/jvm/default-java
-DESTDIR=debian/libpng-sixlegs-java
-
build: build-stamp
build-stamp:
dh_testdir
-
- # Add here commands to compile the package.
- (cd src; javac main/com/sixlegs/image/png/*.java)
- (cd src; jar cf ../png.jar main/com/sixlegs/image/png/*.class)
-
+ jh_build png.jar src/main
touch build-stamp
clean:
dh_testdir
dh_testroot
- rm -f build-stamp configure-stamp
-
- # Add here commands to clean up after the build process.
- rm -f src/main/com/sixlegs/image/png/*.class
- rm -f png.jar
-
+ jh_build --clean
dh_clean
+ rm -f build-stamp png.jar
install: build
dh_testdir
@@ -36,27 +24,27 @@
dh_clean -k
dh_installdirs
- # Add here commands to install the package into debian/tmp
- install -m 0644 png.jar $(DESTDIR)/usr/share/java/png.jar
+binary-arch: build install
+ # Java packages are arch: all, nothing to do here
-
-# Build architecture-independent files here.
binary-indep: build install
+ # Create the package here
dh_testdir
dh_testroot
+ dh_clean -k
+ dh_install -i
+ dh_installdocs -i
+ dh_installchangelogs -i
+# dh_javadoc -i --sourcedir=src/main
+ jh_libs -i
+ jh_depends -i
+ dh_compress -i
+ dh_fixperms -i
+ dh_installdeb -i
+ dh_gencontrol -i
+ dh_md5sums -i
+ dh_builddeb -i
- dh_installdocs
- dh_installexamples src/examples/*
- dh_installchangelogs
- dh_compress
- dh_fixperms
- dh_makeshlibs
- dh_installdeb
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install
-binary: binary-indep
-binary-arch: binary
-.PHONY: build clean binary-indep binary-arch binary install configure
More information about the pkg-java-commits
mailing list