-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Package: service-wrapper-java Version: 3.5.3-2 Severity: wishlist tags: patch
Rémi (or to whom it may concern), Please package the most recent version of the java service wrapper. Attached to this email is a patch against version 3.5.3-2. My patch will - - remove /usr/share/doc/libservice-wrapper-java and symlink to /usr/share/service-wrapper - - remove /usr/share/doc/libservice-wrapper-jni and symlink to /usr/share/doc/service-wrapper - - remove the accidental patches to the source and adds "abort-on-upstream-changes" to local-options to prevent these patches from sneaking in in the future. - - converts debian/rules to use "dh" - - removes the accidental *debhelper.log and *substvars files. Hope this helps (and thank you for your work!), - -- Kill Your TV GPG Key 0xDF0A0A1A -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.10 (GNU/Linux) iQEcBAEBAgAGBQJN2tq0AAoJEKvgwxnfCgoaIl4H/icEHCBppT9KxUKttTnO5N4m TZsNFDOMjQWmbXmvp+v9QAtUzfZpyu+JsKo1hRFF0mzTiyz+dz4JgNG+Vn6Svx+H qNTY9n63xGIz5//fV0ZFsclZ53OJ8JDwFbyYhAdLMXxvcK0ebdVtkcWnYKIqWZJM FrAkJmyJ3HLpOgZLV0rPRm9SrVK/IyANZEeeXy3B3PQXLjuvUwlA6H0GfWE5l2jF RVJgdgflNnkiX/Q+MeCSGnZHOqhj7Gx96BzDII2Y2pptILALFOVaV4F3WPEfQYgj 7olFjIZx/zOofmTDniKcR0Sd/LsQdd9L3vso5UrRLTcrVXpuc/JD1gko0cBR3mA= =7RFl -----END PGP SIGNATURE-----
diff -Naur service-wrapper-java-3.5.3/debian//compat service-wrapper-java-3.5.9/debian//compat --- service-wrapper-java-3.5.3/debian//compat 2010-08-04 17:53:45.000000000 +0000 +++ service-wrapper-java-3.5.9/debian//compat 2011-05-20 14:36:12.000000000 +0000 @@ -1 +1 @@ -5 +7 diff -Naur service-wrapper-java-3.5.3/debian//docs service-wrapper-java-3.5.9/debian//docs --- service-wrapper-java-3.5.3/debian//docs 1970-01-01 00:00:00.000000000 +0000 +++ service-wrapper-java-3.5.9/debian//docs 2011-05-20 14:36:12.000000000 +0000 @@ -0,0 +1,2 @@ +README_??.txt +doc/index.html diff -Naur service-wrapper-java-3.5.3/debian//patches/debian-changes-3.5.3-1 service-wrapper-java-3.5.9/debian//patches/debian-changes-3.5.3-1 --- service-wrapper-java-3.5.3/debian//patches/debian-changes-3.5.3-1 2010-08-05 14:07:54.000000000 +0000 +++ service-wrapper-java-3.5.9/debian//patches/debian-changes-3.5.3-1 1970-01-01 00:00:00.000000000 +0000 @@ -1,45 +0,0 @@ -Description: Upstream changes introduced in version 3.5.3-1 - This patch has been created by dpkg-source during the package build. - Here's the last changelog entry, hopefully it gives details on why - those changes were made: - . - service-wrapper-java (3.5.3-1) unstable; urgency=low - . - * Initial release (Closes: #591758) - . - The person named in the Author field signed this changelog entry. -Author: Rémi Debay <debay.r...@gmail.com> -Bug-Debian: http://bugs.debian.org/591758 - ---- -The information above should follow the Patch Tagging Guidelines, please -checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here -are templates for supplementary fields that you might want to add: - -Origin: <vendor|upstream|other>, <url of original patch> -Bug: <url in upstream bugtracker> -Bug-Debian: http://bugs.debian.org/<bugnumber> -Forwarded: <no|not-needed|url proving that it has been forwarded> -Reviewed-By: <name and email of someone who approved the patch> -Last-Update: <YYYY-MM-DD> - ---- service-wrapper-java-3.5.3.orig/src/c/wrapperinfo.c -+++ service-wrapper-java-3.5.3/src/c/wrapperinfo.c -@@ -31,5 +31,5 @@ TCHAR *wrapperOS = TEXT("linux"); - TCHAR *wrapperReleaseDate = TEXT("20100803"); - TCHAR *wrapperReleaseTime = TEXT("0000"); - TCHAR *wrapperBuildDate = TEXT("20100805"); --TCHAR *wrapperBuildTime = TEXT("0928"); -+TCHAR *wrapperBuildTime = TEXT("1605"); - ---- service-wrapper-java-3.5.3.orig/src/java/org/tanukisoftware/wrapper/WrapperInfo.java -+++ service-wrapper-java-3.5.3/src/java/org/tanukisoftware/wrapper/WrapperInfo.java -@@ -57,7 +57,7 @@ final class WrapperInfo - try - { - buildDate.setTime( new SimpleDateFormat( "yyyyMMdd" ).parse( "20100805" ) ); -- buildTime.setTime( new SimpleDateFormat( "HHmm" ).parse( "0928" ) ); -+ buildTime.setTime( new SimpleDateFormat( "HHmm" ).parse( "1605" ) ); - - m_build.set( buildDate.get( Calendar.YEAR ), - buildDate.get( Calendar.MONTH ), diff -Naur service-wrapper-java-3.5.3/debian//patches/debian-changes-3.5.3-2 service-wrapper-java-3.5.9/debian//patches/debian-changes-3.5.3-2 --- service-wrapper-java-3.5.3/debian//patches/debian-changes-3.5.3-2 2010-08-21 20:40:55.000000000 +0000 +++ service-wrapper-java-3.5.9/debian//patches/debian-changes-3.5.3-2 1970-01-01 00:00:00.000000000 +0000 @@ -1,58 +0,0 @@ -Description: Upstream changes introduced in version 3.5.3-2 - This patch has been created by dpkg-source during the package build. - Here's the last changelog entry, hopefully it gives details on why - those changes were made: - . - service-wrapper-java (3.5.3-2) experimental; urgency=low - . - [ Rémi Debay ] - * Moving jni library to /usr/lib/jni. - * Changing standards version to 3.9.1. - * split the package on 3 packages. - * Adding manpage for wrapper. - * Imporving building for archs specifics packages. - . - [ tony mancill ] - * Add myself to Uploaders in debian/control. - * Set distribution to experimental for upload during freeze. - . - The person named in the Author field signed this changelog entry. -Author: tony mancill <tmanc...@debian.org> - ---- -The information above should follow the Patch Tagging Guidelines, please -checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here -are templates for supplementary fields that you might want to add: - -Origin: <vendor|upstream|other>, <url of original patch> -Bug: <url in upstream bugtracker> -Bug-Debian: http://bugs.debian.org/<bugnumber> -Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber> -Forwarded: <no|not-needed|url proving that it has been forwarded> -Reviewed-By: <name and email of someone who approved the patch> -Last-Update: <YYYY-MM-DD> - ---- service-wrapper-java-3.5.3.orig/src/java/org/tanukisoftware/wrapper/WrapperInfo.java -+++ service-wrapper-java-3.5.3/src/java/org/tanukisoftware/wrapper/WrapperInfo.java -@@ -56,8 +56,8 @@ final class WrapperInfo - Calendar buildTime = Calendar.getInstance(); - try - { -- buildDate.setTime( new SimpleDateFormat( "yyyyMMdd" ).parse( "20100805" ) ); -- buildTime.setTime( new SimpleDateFormat( "HHmm" ).parse( "1605" ) ); -+ buildDate.setTime( new SimpleDateFormat( "yyyyMMdd" ).parse( "20100809" ) ); -+ buildTime.setTime( new SimpleDateFormat( "HHmm" ).parse( "1744" ) ); - - m_build.set( buildDate.get( Calendar.YEAR ), - buildDate.get( Calendar.MONTH ), ---- service-wrapper-java-3.5.3.orig/src/c/wrapperinfo.c -+++ service-wrapper-java-3.5.3/src/c/wrapperinfo.c -@@ -30,6 +30,6 @@ TCHAR *wrapperArch = TEXT("x86"); - TCHAR *wrapperOS = TEXT("linux"); - TCHAR *wrapperReleaseDate = TEXT("20100803"); - TCHAR *wrapperReleaseTime = TEXT("0000"); --TCHAR *wrapperBuildDate = TEXT("20100805"); --TCHAR *wrapperBuildTime = TEXT("1605"); -+TCHAR *wrapperBuildDate = TEXT("20100809"); -+TCHAR *wrapperBuildTime = TEXT("1744"); - diff -Naur service-wrapper-java-3.5.3/debian//patches/series service-wrapper-java-3.5.9/debian//patches/series --- service-wrapper-java-3.5.3/debian//patches/series 2010-08-09 08:12:09.000000000 +0000 +++ service-wrapper-java-3.5.9/debian//patches/series 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -debian-changes-3.5.3-1 -debian-changes-3.5.3-2 diff -Naur service-wrapper-java-3.5.3/debian//preinst service-wrapper-java-3.5.9/debian//preinst --- service-wrapper-java-3.5.3/debian//preinst 1970-01-01 00:00:00.000000000 +0000 +++ service-wrapper-java-3.5.9/debian//preinst 2011-05-20 14:36:12.000000000 +0000 @@ -0,0 +1,12 @@ +#!/bin/sh -e + +if [ ! -z $2 ]; then + if dpkg --compare-versions $2 lt 3.5.9-1; then + test -d /usr/share/doc/libservice-wrapper-java \ + && rm -rf /usr/share/doc/libservice-wrapper-java + test -d /usr/share/doc/libservice-wrapper-jni \ + && rm -rf /usr/share/doc/libservice-wrapper-jni + fi +fi + +#DEBHELPER# diff -Naur service-wrapper-java-3.5.3/debian//rules service-wrapper-java-3.5.9/debian//rules --- service-wrapper-java-3.5.3/debian//rules 2010-08-11 14:45:18.000000000 +0000 +++ service-wrapper-java-3.5.9/debian//rules 2011-05-20 14:36:12.000000000 +0000 @@ -1,116 +1,37 @@ -#!/usr/bin/make -f +#!/usr/bin/make -f +# -*- makefile -*- +# Sample debian/rules that uses debhelper. +# This file was originally written by Joey Hess and Craig Small. +# As a special exception, when this file is copied by dh-make into a +# dh-make output file, you may use that output file without restriction. +# This special exception was added by Craig Small in version 0.37 of dh-make. -DH_VERBOSE=1 -CLASSPATH="/usr/share/java/junit4.jar:/usr/share/java/junit.jar:/usr/share/java/commons-collections.jar" -export CLASSPATH +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +export CLASSPATH="/usr/share/java/junit4.jar:/usr/share/java/junit.jar:/usr/share/java/commons-collections.jar" export DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH) export DEB_HOST_ARCH_CPU := $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU) -#DEB_DESTDIR=debian/acgvision-agent - -build: build-arch-stamp build-indep-stamp - dh_testdir - if test i386 = $(DEB_HOST_ARCH_CPU); then \ - make -f Makefile-linux-x86-32.make -C src/c; fi - if test amd64 = $(DEB_HOST_ARCH_CPU); then \ - make -f Makefile-linux-x86-64.make -C src/c; fi - if test ia64 = $(DEB_HOST_ARCH_CPU); then \ - make -f Makefile-linux-ia-64.make -C src/c; fi - if test powerpc = $(DEB_HOST_ARCH_CPU); then \ - make -f Makefile-linux-ppc-32.make -C src/c; fi - jh_build - -build-arch: build-arch-stamp -build-arch-stamp: - dh_testdir - if test i386 = $(DEB_HOST_ARCH_CPU); then \ - make -f Makefile-linux-x86-32.make -C src/c; fi - if test amd64 = $(DEB_HOST_ARCH_CPU); then \ - make -f Makefile-linux-x86-64.make -C src/c; fi - if test ia64 = $(DEB_HOST_ARCH_CPU); then \ - make -f Makefile-linux-ia-64.make -C src/c; fi - if test powerpc = $(DEB_HOST_ARCH_CPU); then \ - make -f Makefile-linux-ppc-32.make -C src/c; fi - touch $@ - -build-indep: build-indep-stamp -build-indep-stamp: - dh_testdir - # Build the package - jh_build - touch $@ + +export JAVA_HOME=/usr/lib/jvm/java-6-openjdk +%: + dh $@ --with javahelper -clean: - dh_testdir - dh_testroot +override_dh_auto_clean: + -ant -f build.xml -Dbits=$$(dpkg-architecture -qDEB_HOST_ARCH_BITS) total-clean jh_build --clean - dh_clean - rm -f lib/*.jar - rm -f lib/*.so - rm -f src/c/*.o - rm -f bin/wrapper + rm -f bin/* build/* conf/* lib/* logs/* test/* src/c/*.o -install-indep: build-indep +override_dh_auto_build: + ant -f build.xml -Dbits=$$(dpkg-architecture -qDEB_HOST_ARCH_BITS) compile-c-unix dh_testdir - dh_testroot - dh_clean -k - dh_installdirs - -binary-arch: build-arch - # Create the package here - dh_testdir - dh_testroot - dh_clean -k - dh_install -a - #jh_installlibs wrapper.jar -plibservice-wrapper-java - dh_installdocs -a - dh_installchangelogs -a - dh_installman debian/wrapper.1 - #jh_depends - dh_link -a - dh_strip -a - #Depends - dh_shlibdeps -a - #Compress - dh_compress -a - dh_fixperms -a - dh_installdeb -a - dh_gencontrol -a - dh_md5sums -a - dh_builddeb -a - - -binary-indep: build-indep install-indep - # Create the package here - dh_testdir - dh_testroot -i - dh_clean -k - dh_install -i - jh_installlibs wrapper.jar -plibservice-wrapper-java - dh_installdocs -i - dh_installchangelogs -i - jh_depends -i - dh_link -i - dh_strip -i - #Depends - dh_shlibdeps -i - #Compress - dh_compress -i - dh_fixperms -i - dh_installdeb -i - dh_gencontrol -i - dh_md5sums -i - dh_builddeb -i + jh_build +override_dh_installchangelogs: + dh_installchangelogs debian/changelog doc/revisions.txt -post-clean: - dh_clean - jh_build --clean - dh_clean - rm -f lib/*.jar - rm -f lib/*.so - rm -f src/c/*.o - rm -f bin/wrapper +override_dh_installdocs: + dh_installdocs -p libservice-wrapper-java -p libservice-wrapper-jni --link-doc=service-wrapper + dh_installdocs --remaining-packages -binary: binary-indep binary-arch -.PHONY: build build-arch build-indep clean binary-indep binary-arch binary install-indep post-clean diff -Naur service-wrapper-java-3.5.3/debian//service-wrapper-java.debhelper.log service-wrapper-java-3.5.9/debian//service-wrapper-java.debhelper.log --- service-wrapper-java-3.5.3/debian//service-wrapper-java.debhelper.log 2010-08-10 15:46:52.000000000 +0000 +++ service-wrapper-java-3.5.9/debian//service-wrapper-java.debhelper.log 1970-01-01 00:00:00.000000000 +0000 @@ -1,14 +0,0 @@ -dh_installdirs -dh_install -dh_installdocs -dh_installchangelogs -dh_installman -dh_link -dh_strip -dh_shlibdeps -dh_compress -dh_fixperms -dh_installdeb -dh_gencontrol -dh_md5sums -dh_builddeb diff -Naur service-wrapper-java-3.5.3/debian//service-wrapper-java.substvars service-wrapper-java-3.5.9/debian//service-wrapper-java.substvars --- service-wrapper-java-3.5.3/debian//service-wrapper-java.substvars 2010-08-10 15:46:52.000000000 +0000 +++ service-wrapper-java-3.5.9/debian//service-wrapper-java.substvars 1970-01-01 00:00:00.000000000 +0000 @@ -1,3 +0,0 @@ -java:Depends=junit, junit4, libcommons-collections-java -shlibs:Depends=libc6 (>= 2.3.6-6~), libc6 (>= 2.4) -misc:Depends= diff -Naur service-wrapper-java-3.5.3/debian//source/local-options service-wrapper-java-3.5.9/debian//source/local-options --- service-wrapper-java-3.5.3/debian//source/local-options 1970-01-01 00:00:00.000000000 +0000 +++ service-wrapper-java-3.5.9/debian//source/local-options 2011-05-20 14:36:12.000000000 +0000 @@ -0,0 +1,2 @@ +unapply-patches +abort-on-upstream-changes
