Bug#311055: migrate debian/ to cdbs

Jan Alonzo Jan Alonzo <jmalonzo@unpluggable.com>, 311055@bugs.debian.org
Sat May 28 07:39:01 2005


This is a multi-part MIME message sent by reportbug.


--===============0038758407==
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

Package: liblogkit-java
Version: 1.2.2-2
Severity: normal
Tags: patch

Hi,

I've attached a patch to use cdbs for this package. Please let me know of any
comments, suggestions, or whatnot. The package works inside pbuilder btw.

Cheers,

-- System Information:
Debian Release: 3.1
Architecture: i386 (i686)
Shell:  /bin/sh linked to /bin/bash
Kernel: Linux 2.6.11custom
Locale: LANG=en_US, LC_CTYPE=en_US (charmap=ISO-8859-1)

Versions of packages liblogkit-java depends on:
ii  gij-4.0 [java1-runtime]   4.0.0-7ubuntu6 The GNU Java bytecode interpreter
ii  kaffe                     2:1.1.5-3      A JVM to run Java bytecode
ii  kaffe-pthreads [kaffe]    2:1.1.5-3      A POSIX threads enabled version of
ii  sun-j2sdk1.5 [java2-runti 1.5.0+update03 Java(TM) 2 SDK, Standard Edition, 

-- no debconf information

--===============0038758407==
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename="liblogkit-java_1.2.2-2.diff"

--- liblogkit-java-1.2.2.orig/build.xml
+++ liblogkit-java-1.2.2/build.xml
@@ -118,22 +118,16 @@
     <path refid="project.class.path"/>
   </path>
 
-  &check-targets;
+<!--  &check-targets; -->
 
   <!-- defer to check-targets.ent for figuring out dependencies -->
-  <target name="check-dependencies"
-          depends="jdk14-check,
-                   javamail-check,
-                   jdbc-check,
-                   jms-check,
-                   junit-check,
-                   log4j-check,
-                   framework-check,
-                   servletapi-check"/>
+  <target name="check-dependencies" />
 
   <!-- defer to check-targets.ent for downloading dependencies -->
+<!--
   <target name="import-dependencies"
           depends="import-junit,import-log4j"/>
+-->
 
   <!-- Main target -->
   <target name="main" depends="jar" description="Build complete"/>
@@ -159,7 +153,7 @@
     <echo message=""/>
   </target>
 
-  <target name="import-avalon-site" description="Imports the avalon-site" depends="import-log4j">
+  <target name="import-avalon-site" description="Imports the avalon-site">
     <!-- these are really old releases. Need to verify we can get the
          latest of everything and just download that! -->
     <mkdir dir="${avalon-site.dir}"/>
@@ -240,7 +234,7 @@
 
   <!-- Prepares the build directory -->
   <target name="compile"
-          depends="setup-dependencies,prepare"
+          depends="prepare"
           description="Compile project">
 
 
@@ -255,7 +249,7 @@
         <path refid="tools.class.path"/>
       </classpath>
       <src path="${test.dir}"/>
-      <src path="${compat.dir}"/>
+<!--      <src path="${compat.dir}"/>-->
       <exclude name="org/apache/log/output/ServletOutputLogTarget.java"
                unless="javax.servlet.present"/>
       <exclude name="org/apache/log/output/net/SMTPOutputLogTarget.java"
--- liblogkit-java-1.2.2.orig/debian/compat
+++ liblogkit-java-1.2.2/debian/compat
@@ -0,0 +1 @@
+4
--- liblogkit-java-1.2.2.orig/debian/rules
+++ liblogkit-java-1.2.2/debian/rules
@@ -0,0 +1,27 @@
+#!/usr/bin/make -f
+# debian/rules file for liblogkit-java (used cdbs)
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/ant.mk
+
+export LANG=en_US.ISO-8859-1
+
+JAVA_HOME	 := /usr/lib/kaffe
+ANT_HOME	 := /usr/share/ant1.6
+UPSTREAM_VERSION := $(shell echo $(DEB_VERSION) | cut -d- -f1)
+DEB_JARS 	 := $(ANT_HOME)/lib/ant-launcher.jar 
+DEB_ANT_COMPILER := jikes
+DEB_INSTALL_DIRS_liblogkit-java	:= usr/share/java
+DEB_INSTALL_DOCS_liblogkit-java := LICENSE.txt README.txt
+
+DEB_ANT_BUILD_TARGET 	:= jar
+DEB_ANT_CLEAN_TARGET 	:= clean
+JARNAME		 	 = logkit
+
+configure/liblogkit-java::
+	mkdir -p lib
+
+install/liblogkit-java::
+# 	Add here commands to install the package into debian/logkit.
+	install -m 644 build/lib/${JARNAME}.jar $(CURDIR)/debian/liblogkit-java/usr/share/java/${JARNAME}-${UPSTREAM_VERSION}.jar
+	dh_link -pliblogkit-java usr/share/java/logkit-1.2.2.jar usr/share/java/logkit.jar
--- liblogkit-java-1.2.2.orig/debian/README.debian
+++ liblogkit-java-1.2.2/debian/README.debian
@@ -0,0 +1 @@
+Currently, liblogkit-java doesn't support JDBC and JMS function.
--- liblogkit-java-1.2.2.orig/debian/rules.old
+++ liblogkit-java-1.2.2/debian/rules.old
@@ -0,0 +1,71 @@
+#!/usr/bin/make -f
+# Sample debian/rules that uses debhelper.
+# GNU copyright 1997 to 1999 by Joey Hess.
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+# This is the debhelper compatability version to use.
+export DH_COMPAT=3
+export LANG=C
+
+jdk_dirs:=/usr/lib/kaffe
+export JAVA_HOME=$(shell for jdir in $(jdk_dirs); do if [ -d "$$jdir" ]; then echo $$jdir; exit 0; fi; done)
+
+export CLASSPATH=.:/usr/share/ant1.6/lib/ant-junit.jar:/usr/share/ant1.6/lib/ant-launcher.jar:/usr/share/ant1.6/lib/ant-nodeps.jar:/usr/share/ant1.6/lib/ant-trax.jar:/usr/share/ant1.6/lib/ant.jar:/usr/share/java/junit.jar:/usr/share/java/servlet-2.3.jar:/usr/share/java/avalon-framework.jar:/usr/share/java/oro.jar
+
+VERSION=1.2.2
+JARNAME=logkit
+
+build: build-stamp
+build-stamp:
+	dh_testdir
+
+	# Add here commands to compile the package.
+	mkdir lib
+	${JAVA_HOME}/bin/java -classpath ${CLASSPATH} org.apache.tools.ant.Main -Dbuild.compiler=jikes jar
+
+#	ant docs
+
+	touch build-stamp
+
+clean:
+	dh_testdir
+	dh_testroot
+	rm -rf build-stamp lib
+
+	# Add here commands to clean up after the build process.
+	${JAVA_HOME}/bin/java -classpath ${CLASSPATH} org.apache.tools.ant.Main clean
+
+	dh_clean
+
+install: build
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_installdirs
+
+	# Add here commands to install the package into debian/logkit.
+	install -m 644 build/lib/${JARNAME}.jar $(CURDIR)/debian/liblogkit-java/usr/share/java/${JARNAME}-${VERSION}.jar
+
+	dh_movefiles --sourcedir=debian/liblogkit-java
+
+# Build architecture-dependent files here.
+binary-indep: build install
+	dh_testdir -i
+	dh_testroot -i
+	dh_installdocs -i
+	dh_installexamples -i
+	dh_installchangelogs  -i
+	dh_link -i
+	dh_strip -i
+	dh_compress -i
+	dh_fixperms -i
+	dh_installdeb -i
+	dh_shlibdeps -i
+	dh_gencontrol -i
+	dh_md5sums -i
+	dh_builddeb -i
+
+binary: binary-indep
+.PHONY: build clean binary-indep binary install
--- liblogkit-java-1.2.2.orig/debian/control
+++ liblogkit-java-1.2.2/debian/control
@@ -0,0 +1,23 @@
+Source: liblogkit-java
+Section: libs
+Priority: optional
+Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
+Uploaders: Takashi Okamoto <tora@debian.org>
+Build-Depends-Indep: debhelper (>> 3.0.0), libant1.6-java, kaffe (>= 1:1.1.3), liboro-java(>= 2.0.8), jikes (>= 1.18), cdbs (>= 0.4.8)
+Standards-Version: 3.5.8
+
+Package: liblogkit-java
+Architecture: all
+Depends: kaffe (>= 1:1.1.3) | java2-runtime | java1-runtime
+Description: Lightweight and fast designed logging toolkit for Java
+ LogKit is a logging toolkit designed for secure performance orientated
+ logging in Java applications from Jakarta Avalon Project. Log4j is another
+ logging tool for Java. LogKit is more lightweight than Log4j. Log4j has 
+ more functions then LogKit.
+
+#Package: liblogkit-java-doc
+#Architecture: all
+#Depends: java-common
+#Description: Documentation for liblogkit-java
+# Documentation for logkit which is light weight logging tool for Java.
+
--- liblogkit-java-1.2.2.orig/debian/liblogkit-java-doc.docs
+++ liblogkit-java-1.2.2/debian/liblogkit-java-doc.docs
@@ -0,0 +1 @@
+docs
--- liblogkit-java-1.2.2.orig/debian/changelog
+++ liblogkit-java-1.2.2/debian/changelog
@@ -0,0 +1,56 @@
+liblogkit-java (1.2.2-2) unstable; urgency=low
+
+  * compile with jikes to avoid kjc bug.
+
+ -- Takashi Okamoto <tora@debian.org>  Sun,  2 May 2004 22:01:59 +0900
+
+liblogkit-java (1.2.2-1) unstable; urgency=low
+
+  * New upstream release.
+  * close request new upstream.(closes:#184468)
+  * remove liblogkit-java-doc because javadoc tools isn't supported
+    enough for main.
+
+ -- Takashi Okamoto <tora@debian.org>  Sun,  2 May 2004 01:28:49 +0900
+
+logkit (1.1-2) unstable; urgency=low
+
+  * improved document to refer local api document. (closes: #136169)
+
+ -- Takashi Okamoto <tora@debian.org>  Sat, 26 Oct 2002 20:16:13 +0900
+
+logkit (1.1-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Takashi Okamoto <tora@debian.org>  Sun, 29 Sep 2002 23:07:51 +0900
+
+logkit (1.0.1-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Takashi Okamoto <tora@debian.org>  Sat, 16 Feb 2002 19:54:11 +0900
+
+logkit (1.0-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Takashi Okamoto <tora@debian.org>  Mon, 29 Oct 2001 22:08:32 +0900
+
+logkit (0.99b5-1) unstable; urgency=low
+
+  * New upstream release. 
+  * request for new upstream should be closed. (closes: #113047)
+
+ -- Takashi Okamoto <tora@debian.org>  Tue, 25 Sep 2001 21:02:33 +0900
+
+logkit (0.99b4-1) unstable; urgency=low
+
+  * Initial Release.
+  * closes: #111310 (ITP)
+
+ -- Takashi Okamoto <tora@debian.org>  Fri,  7 Sep 2001 19:59:35 +0900
+
+Local variables:
+mode: debian-changelog
+End:
--- liblogkit-java-1.2.2.orig/debian/copyright
+++ liblogkit-java-1.2.2/debian/copyright
@@ -0,0 +1,56 @@
+This package was debianized by Takashi Okamoto <tora@debian.org> on
+Sat,  1 Sep 2001 16:49:19 +0900.
+
+It was downloaded from http://jakarta.apache.org/avalon.
+
+Upstream Author: Peter Donald <donaldp@apache.org>
+
+
+Copyright:
+
+ ============================================================================
+                   The Apache Software License, Version 1.1
+ ============================================================================
+ 
+ Copyright (C) 2001 The Apache Software Foundation. All rights reserved.
+ 
+ Redistribution and use in source and binary forms, with or without modifica-
+ tion, are permitted provided that the following conditions are met:
+ 
+ 1. Redistributions of  source code must  retain the above copyright  notice,
+    this list of conditions and the following disclaimer.
+ 
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+ 
+ 3. The end-user documentation included with the redistribution, if any, must
+    include  the following  acknowledgment:  "This product includes  software
+    developed  by the  Apache Software Foundation  (http://www.apache.org/)."
+    Alternately, this  acknowledgment may  appear in the software itself,  if
+    and wherever such third-party acknowledgments normally appear.
+ 
+ 4. The names "LogKit", "Jakarta" and "Apache Software Foundation"  must not 
+    be used to endorse or promote products derived from this software without
+    prior written permission. For written permission, please contact 
+    apache@apache.org.
+ 
+ 5. Products  derived from this software may not  be called "Apache", nor may
+    "Apache" appear  in their name,  without prior written permission  of the
+    Apache Software Foundation.
+ 
+ THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
+ INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ FITNESS  FOR A PARTICULAR  PURPOSE ARE  DISCLAIMED.  IN NO  EVENT SHALL  THE
+ APACHE SOFTWARE  FOUNDATION  OR ITS CONTRIBUTORS  BE LIABLE FOR  ANY DIRECT,
+ INDIRECT, INCIDENTAL, SPECIAL,  EXEMPLARY, OR CONSEQUENTIAL  DAMAGES (INCLU-
+ DING, BUT NOT LIMITED TO, PROCUREMENT  OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ OF USE, DATA, OR  PROFITS; OR BUSINESS  INTERRUPTION)  HOWEVER CAUSED AND ON
+ ANY  THEORY OF LIABILITY,  WHETHER  IN CONTRACT,  STRICT LIABILITY,  OR TORT
+ (INCLUDING  NEGLIGENCE OR  OTHERWISE) ARISING IN  ANY WAY OUT OF THE  USE OF
+ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ 
+ This software  consists of voluntary contributions made  by many individuals
+ on  behalf of the Apache Software  Foundation and was  originally created by
+ Stefano Mazzocchi  <stefano@apache.org>. For more  information on the Apache 
+ Software Foundation, please see <http://www.apache.org/>.

--===============0038758407==--