[pkg-java] r4270 - in trunk/jakarta-log4j/debian: . patches
kumanna-guest at alioth.debian.org
kumanna-guest at alioth.debian.org
Wed Sep 26 07:30:55 UTC 2007
Author: kumanna-guest
Date: 2007-09-26 07:30:54 +0000 (Wed, 26 Sep 2007)
New Revision: 4270
Added:
trunk/jakarta-log4j/debian/README.Debian-source
trunk/jakarta-log4j/debian/orig-tar.sh
trunk/jakarta-log4j/debian/patches/
trunk/jakarta-log4j/debian/patches/01_build_fix.patch
trunk/jakarta-log4j/debian/watch
Removed:
trunk/jakarta-log4j/debian/liblog4j1.2-java.links
Modified:
trunk/jakarta-log4j/debian/changelog
trunk/jakarta-log4j/debian/compat
trunk/jakarta-log4j/debian/control
trunk/jakarta-log4j/debian/copyright
trunk/jakarta-log4j/debian/liblog4j1.2-java-doc.doc-base
trunk/jakarta-log4j/debian/rules
Log:
* New upstream release.
* debian/compat: bumped to 5.
* debian/watch: Added file.
* debian/control:
+ Added Kumar Appaiah and Varun Hiremath to Uploaders.
+ Moved all build dependencencies (other than debhelper) to Build-Depends-Indep.
+ Depend on cdbs.
+ Added Homepage, XS-Vcs-Svn and XS-Vcs-Browser fields.
* debian/liblog4j1.2-java-doc.doc-base: Specigy API doc location.
* debian/liblog4j1.2-java.links: Removed. Functionality in debian/rules.
* debian/orig-tar.sh: Added to ease repackaging.
* debian/README.Debian-source: Added to explain repackaging.
* debian/patches/01_build_fix.patch: Fix javadoc issues and compiler target versions.
* debian/rules: Move to cdbs.
Added: trunk/jakarta-log4j/debian/README.Debian-source
===================================================================
--- trunk/jakarta-log4j/debian/README.Debian-source (rev 0)
+++ trunk/jakarta-log4j/debian/README.Debian-source 2007-09-26 07:30:54 UTC (rev 4270)
@@ -0,0 +1,8 @@
+jakarta-log4j1.2
+----------------
+
+The package includes jars and a Windows binary DLL, which are not be
+included in the original tarball. The orig-tar.sh in this directory is
+used to recreate a clean tarball by removing the jar and DLL.
+
+ -- Kumar Appaiah <akumar at ee.iitm.ac.in>, Wed, 26 Sep 2007 13:03:52 +0530
Modified: trunk/jakarta-log4j/debian/changelog
===================================================================
--- trunk/jakarta-log4j/debian/changelog 2007-09-26 03:05:15 UTC (rev 4269)
+++ trunk/jakarta-log4j/debian/changelog 2007-09-26 07:30:54 UTC (rev 4270)
@@ -1,3 +1,22 @@
+jakarta-log4j (1.2.15-1) unstable; urgency=low
+
+ * New upstream release.
+ * debian/compat: bumped to 5.
+ * debian/watch: Added file.
+ * debian/control:
+ + Added Kumar Appaiah and Varun Hiremath to Uploaders.
+ + Moved all build dependencencies (other than debhelper) to Build-Depends-Indep.
+ + Depend on cdbs.
+ + Added Homepage, XS-Vcs-Svn and XS-Vcs-Browser fields.
+ * debian/liblog4j1.2-java-doc.doc-base: Specigy API doc location.
+ * debian/liblog4j1.2-java.links: Removed. Functionality in debian/rules.
+ * debian/orig-tar.sh: Added to ease repackaging.
+ * debian/README.Debian-source: Added to explain repackaging.
+ * debian/patches/01_build_fix.patch: Fix javadoc issues and compiler target versions.
+ * debian/rules: Move to cdbs.
+
+ -- Kumar Appaiah <akumar at ee.iitm.ac.in> Wed, 26 Sep 2007 12:55:30 +0530
+
jakarta-log4j (1.2.13-5) unstable; urgency=low
* Rename source package. Closes: #308339.
Modified: trunk/jakarta-log4j/debian/compat
===================================================================
--- trunk/jakarta-log4j/debian/compat 2007-09-26 03:05:15 UTC (rev 4269)
+++ trunk/jakarta-log4j/debian/compat 2007-09-26 07:30:54 UTC (rev 4270)
@@ -1 +1 @@
-4
+5
Modified: trunk/jakarta-log4j/debian/control
===================================================================
--- trunk/jakarta-log4j/debian/control 2007-09-26 03:05:15 UTC (rev 4269)
+++ trunk/jakarta-log4j/debian/control 2007-09-26 07:30:54 UTC (rev 4270)
@@ -2,9 +2,13 @@
Section: libs
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Kalle Kivimaa <killer at debian.org>, Michael Koch <konqueror at gmx.de>
-Build-Depends: debhelper (>= 4.2.30), java-gcj-compat-dev, ant, libgnujaf-java, libgnumail-java
+Uploaders: Kalle Kivimaa <killer at debian.org>, Michael Koch <konqueror at gmx.de>, Varun Hiremath <varunhiremath at gmail.com>, Kumar Appaiah <akumar at ee.iitm.ac.in>
+Build-Depends: debhelper (>= 5), cdbs
+Build-Depends-Indep: java-gcj-compat-dev, ant, libgnujaf-java, libgnumail-java
Standards-Version: 3.7.2
+Homepage: http://jakarta.apache.org/log4j
+XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/jakarta-log4j
+XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/jakarta-log4j
Package: liblog4j1.2-java
Architecture: all
@@ -32,8 +36,6 @@
The format of the output can be defined using one of the various layout
(or user defined layout) like: simple text, html, date, pattern defined and
XML.
- .
- Homepage: http://jakarta.apache.org/log4j
Package: liblog4j1.2-java-gcj
Architecture: any
@@ -61,8 +63,6 @@
XML.
.
This package contains the natively compiled code for use by gij.
- .
- Homepage: http://jakarta.apache.org/log4j
Package: liblog4j1.2-java-doc
Architecture: all
@@ -71,5 +71,3 @@
The javadoc api documentation for the logging library
from the Apache Jakarta project. The documentation is
for the version 1.2 of the log4j API.
- .
- Homepage: http://jakarta.apache.org/log4j
Modified: trunk/jakarta-log4j/debian/copyright
===================================================================
--- trunk/jakarta-log4j/debian/copyright 2007-09-26 03:05:15 UTC (rev 4269)
+++ trunk/jakarta-log4j/debian/copyright 2007-09-26 07:30:54 UTC (rev 4270)
@@ -193,3 +193,11 @@
defend, and hold each Contributor harmless for any liability
incurred by, or claims asserted against, such Contributor by reason
of your accepting any such warranty or additional liability.
+
+Debian packaging: (C) 2001 - 2004, Benoit Joly <benoit at debian.org>
+ (C) 2005 - 2007, Kalle Kivimaa <killer at debian.org>
+ (C) 2005 - 2007, Wolfgang Baer <WBaer at gmx.de>, Michael Koch <konqueror at gmx.de>
+ (C) 2007 Varun Hiremath <varunhiremath at gmail.com>, Kumar Appaiah <akumar at ee.iitm.ac.in>
+
+The Debian packaging of this package is licensed under the Apache
+Software License 2.0 (see above).
Modified: trunk/jakarta-log4j/debian/liblog4j1.2-java-doc.doc-base
===================================================================
--- trunk/jakarta-log4j/debian/liblog4j1.2-java-doc.doc-base 2007-09-26 03:05:15 UTC (rev 4269)
+++ trunk/jakarta-log4j/debian/liblog4j1.2-java-doc.doc-base 2007-09-26 07:30:54 UTC (rev 4270)
@@ -6,5 +6,5 @@
Section: Programming
Format: HTML
-Index: /usr/share/doc/liblog4j1.2-java-doc/docs/index.html
-Files: /usr/share/doc/liblog4j1.2-java-doc/docs/*.html
+Index: /usr/share/doc/liblog4j1.2-java-doc/docs/api/index.html
+Files: /usr/share/doc/liblog4j1.2-java-doc/docs/api/*.html
Deleted: trunk/jakarta-log4j/debian/liblog4j1.2-java.links
===================================================================
--- trunk/jakarta-log4j/debian/liblog4j1.2-java.links 2007-09-26 03:05:15 UTC (rev 4269)
+++ trunk/jakarta-log4j/debian/liblog4j1.2-java.links 2007-09-26 07:30:54 UTC (rev 4270)
@@ -1 +0,0 @@
-usr/share/java/log4j-1.2.13.jar usr/share/java/log4j-1.2.jar
Added: trunk/jakarta-log4j/debian/orig-tar.sh
===================================================================
--- trunk/jakarta-log4j/debian/orig-tar.sh (rev 0)
+++ trunk/jakarta-log4j/debian/orig-tar.sh 2007-09-26 07:30:54 UTC (rev 4270)
@@ -0,0 +1,21 @@
+#!/bin/sh -e
+
+# called by uscan with '--upstream-version' <version> <file>
+TAR=../apache-log4j-$2.tar.gz
+DIR=jakarta-log4j-$2.orig
+
+# clean up the upstream tarball
+mv $TAR $3
+tar zxf $3
+mv apache-log4j-$2 $DIR
+GZIP=--best tar czf $3 --exclude '*jar' --exclude '*dll' $DIR
+rm -rf $TAR $DIR
+
+# move to directory 'tarballs'
+if [ -r .svn/deb-layout ]; then
+ . .svn/deb-layout
+ mv $3 $origDir
+ echo "moved $3 to $origDir"
+fi
+
+exit 0
Property changes on: trunk/jakarta-log4j/debian/orig-tar.sh
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/jakarta-log4j/debian/patches/01_build_fix.patch
===================================================================
--- trunk/jakarta-log4j/debian/patches/01_build_fix.patch (rev 0)
+++ trunk/jakarta-log4j/debian/patches/01_build_fix.patch 2007-09-26 07:30:54 UTC (rev 4270)
@@ -0,0 +1,31 @@
+diff -Nur jakarta-log4j-1.2.15/build.xml jakarta-log4j-1.2.15.new/build.xml
+--- jakarta-log4j-1.2.15/build.xml 2007-08-25 09:39:43.000000000 +0530
++++ jakarta-log4j-1.2.15.new/build.xml 2007-09-26 11:56:11.000000000 +0530
+@@ -97,8 +97,8 @@
+ <!-- Directory for temporary files. -->
+ <property name="dist.tmp" value="${dist.dir}/tmp"/>
+
+- <property name="javac.source" value="1.2"/>
+- <property name="javac.target" value="1.1"/>
++ <property name="javac.source" value="1.3"/>
++ <property name="javac.target" value="1.3"/>
+
+ <!-- destination for generated documentation on Apache web host -->
+ <property name="apache.javadoc_dest" value="/www/logging.apache.org/log4j/docs"/>
+@@ -497,7 +497,6 @@
+ protected="true"
+ author="true"
+ use="true"
+- overview="${docs.dest}/overview.html"
+ doctitle="log4j version ${version}<br>API Specification"
+ windowtitle="Log4j Version ${version}"
+ header='<b>Log4j ${version}</b><!-- Licensed to the Apache Software Foundation (ASF) under one or more
+@@ -517,8 +516,6 @@
+ -->'
+ bottom="Copyright 2000-2007 Apache Software Foundation.">
+
+- <link href="http://java.sun.com/j2se/1.3/docs/api/"/>
+- <link href="http://java.sun.com/j2ee/sdk_1.3/techdocs/api/"/>
+ <classpath refid="compile.classpath"/>
+ </javadoc>
+
Modified: trunk/jakarta-log4j/debian/rules
===================================================================
--- trunk/jakarta-log4j/debian/rules 2007-09-26 03:05:15 UTC (rev 4269)
+++ trunk/jakarta-log4j/debian/rules 2007-09-26 07:30:54 UTC (rev 4270)
@@ -1,99 +1,18 @@
#!/usr/bin/make -f
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 by Joey Hess.
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/ant.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
-VERSION=1.2.13
-JARNAME=log4j
+JAVA_HOME := /usr/lib/jvm/java-gcj/
+ANT_HOME := /usr/share/ant
-JAVA_HOME := /usr/lib/jvm/java-gcj
+DEB_JARS := gnumail activation
+DEB_ANT_BUILD_TARGET := jar javadoc
-DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
-include /usr/share/gcj/debian_defaults
-ifneq (,$(filter $(DEB_HOST_ARCH), $(gcj_native_archs)))
- with_gcj_native := yes
-endif
+install/liblog4j1.2-java::
+ dh_install dist/lib/log4j-$(DEB_UPSTREAM_VERSION).jar usr/share/java
+ dh_link usr/share/java/log4j-$(DEB_UPSTREAM_VERSION).jar usr/share/java/log4j.jar
-configure: configure-stamp
-configure-stamp:
- dh_testdir
- rm -rf src/java/org/apache/log4j/jmx src/java/org/apache/log4j/or/jms src/java/org/apache/log4j/net/JMS*.java src/java/org/apache/log4j/lf5
- find src/java -name \*.java > list.sources
- touch configure-stamp
-
-build: configure-stamp build-stamp
-build-stamp:
- dh_testdir
-
- # Add here commands to compile the package.
- mkdir -p dist/classes
- $(JAVA_HOME)/bin/javac -classpath /usr/share/java/activation.jar:/usr/share/java/gnumail.jar -sourcepath src/java -d dist/classes @list.sources
- cp src/java/org/apache/log4j/xml/log4j.dtd dist/classes/org/apache/log4j/xml/
- $(JAVA_HOME)/bin/jar -cf dist/lib/${JARNAME}-${VERSION}.jar -C dist/classes org
- gjdoc -d docs/api -sourcepath src/java -all
- touch build-stamp
-
-clean:
- dh_testdir
- dh_testroot
- rm -f build-stamp configure-stamp
- rm -rf dist/classes dist/lib/*
- rm -rf docs/api
- rm -f build.properties list.sources gjdoc.sources
- find src -name "*.class" -exec rm {} \;
- # Add here commands to clean up after the build process.
- dh_clean
-
-install: DH_OPTIONS=
-install: build
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs
-
- # Add here commands to install the package into debian/jakarta-log4j1.2.
- install -m 644 dist/lib/${JARNAME}-${VERSION}.jar debian/liblog4j1.2-java/usr/share/java/${JARNAME}-${VERSION}.jar
-
- dh_movefiles --sourcedir=debian/liblog4j1.2-java
-
-ifeq ($(with_gcj_native),yes)
- dh_nativejava -pliblog4j1.2-java-gcj
-endif
-
-# Build architecture-independent files here.
-# Pass -i to all debhelper commands in this target to reduce clutter.
-binary-indep: build install
- dh_testdir -i
- dh_testroot -i
- dh_installdocs -i docs
- rm -rf debian/liblog4j1.2-java/usr/share/doc/liblog4j1.2-java/docs
- dh_installexamples -i
- dh_installchangelogs -i docs/HISTORY.txt
- dh_link -i
- dh_compress -i
- dh_fixperms -i
- dh_installdeb -i
- dh_gencontrol -i
- dh_md5sums -i
- dh_builddeb -i
-
-binary-arch: build install
- dh_testdir -a
- dh_testroot -a
-ifeq ($(with_gcj_native),yes)
- dh_installdocs -a
- dh_installchangelogs -a
- dh_compress -a
- dh_fixperms -a
- dh_strip -a
- dh_shlibdeps -a
- dh_installdeb -a
- dh_gencontrol -a
- dh_md5sums -a
- dh_builddeb -a
-endif
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
+get-orig-source:
+ -uscan --upstream-version 0 --rename
Added: trunk/jakarta-log4j/debian/watch
===================================================================
--- trunk/jakarta-log4j/debian/watch (rev 0)
+++ trunk/jakarta-log4j/debian/watch 2007-09-26 07:30:54 UTC (rev 4270)
@@ -0,0 +1,2 @@
+version=3
+http://www.apache.org/dist/logging/log4j/(1.2.[\d]+)/apache-log4j-(1.2.[\d]+).tar.gz
More information about the pkg-java-commits
mailing list