[pkg-java] r5889 - trunk/asm2/debian

mkoch at alioth.debian.org mkoch at alioth.debian.org
Tue Feb 26 12:28:06 UTC 2008


Author: mkoch
Date: 2008-02-26 12:28:05 +0000 (Tue, 26 Feb 2008)
New Revision: 5889

Modified:
   trunk/asm2/debian/changelog
   trunk/asm2/debian/control
   trunk/asm2/debian/copyright
   trunk/asm2/debian/rules
Log:
asm2 (2.2.3-2) unstable; urgency=low

  * Clarified debian/copyright.
  * Moved debian/rules to CDBS.
  * Removed -1 form versions in Build-Depends.
  * Removed Wolfgang from Uploaders.
  * Updated to debhelper level 5.
  * Added Homepage, Vcs-Svn and Svn-Browser fields.
  * Changed watch file to another mirror.
  * Updated Standards-Version to 3.7.3.

 -- Michael Koch <konqueror at gmx.de>  Tue, 26 Feb 2008 12:36:13 +0100



Modified: trunk/asm2/debian/changelog
===================================================================
--- trunk/asm2/debian/changelog	2008-02-26 11:31:45 UTC (rev 5888)
+++ trunk/asm2/debian/changelog	2008-02-26 12:28:05 UTC (rev 5889)
@@ -1,8 +1,15 @@
-asm2 (2.2.3-2) UNRELEASED; urgency=low
+asm2 (2.2.3-2) unstable; urgency=low
 
+  * Clarified debian/copyright.
+  * Moved debian/rules to CDBS.
+  * Removed -1 form versions in Build-Depends.
+  * Removed Wolfgang from Uploaders.
+  * Updated to debhelper level 5.
+  * Added Homepage, Vcs-Svn and Svn-Browser fields.
   * Changed watch file to another mirror.
+  * Updated Standards-Version to 3.7.3.
 
- -- Michael Koch <konqueror at gmx.de>  Fri, 22 Feb 2008 12:17:32 +0100
+ -- Michael Koch <konqueror at gmx.de>  Tue, 26 Feb 2008 12:36:13 +0100
 
 asm2 (2.2.3-1) unstable; urgency=low
 

Modified: trunk/asm2/debian/control
===================================================================
--- trunk/asm2/debian/control	2008-02-26 11:31:45 UTC (rev 5888)
+++ trunk/asm2/debian/control	2008-02-26 12:28:05 UTC (rev 5889)
@@ -2,10 +2,13 @@
 Section: devel
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Marcus Crafter <crafterm at debian.org>, Barry Hawkins <barry at alltc.com>, Wolfgang Baer <WBaer at gmx.de>, Michael Koch <konqueror at gmx.de>
-Build-Depends: debhelper (>= 4.0.0), dpatch (>= 2.0.14)
-Build-Depends-Indep: ant (>= 1.6.5-1), java-gcj-compat-dev, libow-util-ant-tasks-java (>= 1.3-2)
-Standards-Version: 3.7.2
+Uploaders: Marcus Crafter <crafterm at debian.org>, Barry Hawkins <barry at alltc.com>, Michael Koch <konqueror at gmx.de>
+Build-Depends: debhelper (>= 5), cdbs
+Build-Depends-Indep: ant (>= 1.6.5), java-gcj-compat-dev, libow-util-ant-tasks-java (>= 1.3-2)
+Standards-Version: 3.7.3
+Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/asm2
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/asm2
+Homepage: http://asm.objectweb.org/
 
 Package: libasm2-java
 Architecture: all

Modified: trunk/asm2/debian/copyright
===================================================================
--- trunk/asm2/debian/copyright	2008-02-26 11:31:45 UTC (rev 5888)
+++ trunk/asm2/debian/copyright	2008-02-26 12:28:05 UTC (rev 5889)
@@ -5,7 +5,18 @@
 
 Upstream Authors: Eric Bruneton, Eugene Kuleshov
 
-Copyright:
+Copyright: (C) 2003-2008 Eric Bruneton, Eugene Kuleshov
 
-ASM is licensed under the BSD license, a copy of which is available
-in /usr/share/common-licenses/BSD
+License:
+
+    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. Neither the name of the copyright holders nor the names of its
+       contributors may be used to endorse or promote products derived from
+       this software without specific prior written permission.
+
+ASM is licensed under the BSD license, a complete copy of which is available
+in /usr/share/common-licenses/BSD.

Modified: trunk/asm2/debian/rules
===================================================================
--- trunk/asm2/debian/rules	2008-02-26 11:31:45 UTC (rev 5888)
+++ trunk/asm2/debian/rules	2008-02-26 12:28:05 UTC (rev 5889)
@@ -1,93 +1,23 @@
 #!/usr/bin/make -f
-# -*- makefile -*-
-# 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
+include /usr/share/cdbs/1/class/ant.mk
+include /usr/share/cdbs/1/rules/debhelper.mk
 
-# Set a locale; currently using default
-export LANG=C
+JAVA_HOME := /usr/lib/jvm/java-gcj
 
-# Include to enable dpatch
-#include /usr/share/dpatch/dpatch.make
+DEB_JARS := gnujaxp ant-junit junit xalan2
+DEB_ANT_BUILD_TARGET := dist
 
-# Set JAVA_HOME to be used for Java commands
-JAVA_HOME=/usr/lib/jvm/java-gcj
+install/libasm2-java::
+	mv output/dist/lib/asm-$(DEB_UPSTREAM_VERSION).jar $(CURDIR)/debian/libasm2-java/usr/share/java/asm2-$(DEB_UPSTREAM_VERSION).jar
+	mv output/dist/lib/asm-attrs-$(DEB_UPSTREAM_VERSION).jar $(CURDIR)/debian/libasm2-java/usr/share/java/asm2-attrs-$(DEB_UPSTREAM_VERSION).jar
+	mv output/dist/lib/asm-analysis-$(DEB_UPSTREAM_VERSION).jar $(CURDIR)/debian/libasm2-java/usr/share/java/asm2-analysis-$(DEB_UPSTREAM_VERSION).jar
+	mv output/dist/lib/asm-commons-$(DEB_UPSTREAM_VERSION).jar $(CURDIR)/debian/libasm2-java/usr/share/java/asm2-commons-$(DEB_UPSTREAM_VERSION).jar
+	mv output/dist/lib/asm-tree-$(DEB_UPSTREAM_VERSION).jar $(CURDIR)/debian/libasm2-java/usr/share/java/asm2-tree-$(DEB_UPSTREAM_VERSION).jar
+	mv output/dist/lib/asm-util-$(DEB_UPSTREAM_VERSION).jar $(CURDIR)/debian/libasm2-java/usr/share/java/asm2-util-$(DEB_UPSTREAM_VERSION).jar
+	mv output/dist/lib/asm-xml-$(DEB_UPSTREAM_VERSION).jar $(CURDIR)/debian/libasm2-java/usr/share/java/asm2-xml-$(DEB_UPSTREAM_VERSION).jar
 
-# Set the invocation of the java command
-JAVACMD=${JAVA_HOME}/bin/java
-
-JAVA_LIB=/usr/share/java
-ANT_HOME=/usr/share/ant
-ANT_CLASSPATH=$(JAVA_LIB)/gnujaxp.jar:$(ANT_HOME)/lib/ant.jar:$(ANT_HOME)/lib/ant-launcher.jar:$(ANT_HOME)/lib/ant-junit.jar:$(JAVA_LIB)/junit.jar:$(JAVA_LIB)/xalan2.jar:$(JAVA_HOME)/lib/tools.jar
-
-# Set path to Ant properties file
-ANT_PROPS=debian/ant.properties
-
-# Universal Ant invocation for reliable builds;
-# place '-verbose' before -propertyfile to 
-# obtain detailed build output.
-ANT=$(JAVACMD) -classpath $(ANT_CLASSPATH) \
-        org.apache.tools.ant.Main -propertyfile $(ANT_PROPS)
-
-build: build-stamp
-
-build-stamp:
-#build-stamp: patch-stamp
-	dh_testdir	
-	$(ANT) dist
-	touch build-stamp
-
-clean:
-#clean: unpatch
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp configure-stamp		
-	$(ANT) clean
-
-	dh_clean 
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k 
-	dh_installdirs
-
-	# install the libasm-java jar files
-	mv output/dist/lib/asm-2.2.3.jar $(CURDIR)/debian/libasm2-java/usr/share/java/asm2-2.2.3.jar
-	mv output/dist/lib/asm-attrs-2.2.3.jar $(CURDIR)/debian/libasm2-java/usr/share/java/asm2-attrs-2.2.3.jar
-	mv output/dist/lib/asm-analysis-2.2.3.jar $(CURDIR)/debian/libasm2-java/usr/share/java/asm2-analysis-2.2.3.jar
-	mv output/dist/lib/asm-commons-2.2.3.jar $(CURDIR)/debian/libasm2-java/usr/share/java/asm2-commons-2.2.3.jar
-	mv output/dist/lib/asm-tree-2.2.3.jar $(CURDIR)/debian/libasm2-java/usr/share/java/asm2-tree-2.2.3.jar
-	mv output/dist/lib/asm-util-2.2.3.jar $(CURDIR)/debian/libasm2-java/usr/share/java/asm2-util-2.2.3.jar
-	mv output/dist/lib/asm-xml-2.2.3.jar $(CURDIR)/debian/libasm2-java/usr/share/java/asm2-xml-2.2.3.jar
-	# install the javadocs and examples
+install/libasm2-java-doc::
 	mkdir $(CURDIR)/debian/libasm2-java-doc/usr/share/doc/libasm2-java-doc/api
 	mv output/dist/doc/javadoc/user/* $(CURDIR)/debian/libasm2-java-doc/usr/share/doc/libasm2-java-doc/api
 	mv output/dist/examples $(CURDIR)/debian/libasm2-java-doc/usr/share/doc/libasm2-java-doc
-
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs 
-	dh_installdocs
-	dh_installexamples
-	dh_installman
-	dh_link
-	dh_strip
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure




More information about the pkg-java-commits mailing list