[pkg-java] r5470 - in trunk/libjboss-microcontainer-java/debian: . patches

[varun at alioth.debian.org]

Author: varun
Date: 2008-01-18 11:23:34 +0000 (Fri, 18 Jan 2008)
New Revision: 5470

Added:
   trunk/libjboss-microcontainer-java/debian/patches/
   trunk/libjboss-microcontainer-java/debian/patches/override.diff
   trunk/libjboss-microcontainer-java/debian/patches/series
Modified:
   trunk/libjboss-microcontainer-java/debian/changelog
   trunk/libjboss-microcontainer-java/debian/compat
   trunk/libjboss-microcontainer-java/debian/control
   trunk/libjboss-microcontainer-java/debian/orig-tar.sh
   trunk/libjboss-microcontainer-java/debian/rules
   trunk/libjboss-microcontainer-java/debian/watch
Log:
* New upstream release
* debian/control: Build-Depend on debhelper >=6
* debian/compat: Bump to 6
* Add patches/override.diff to fix a build issue
* Fix watch file and orig-tar.sh to directly read the upstream tag
  version and create orig.tar.gz

Modified: trunk/libjboss-microcontainer-java/debian/changelog
===================================================================
--- trunk/libjboss-microcontainer-java/debian/changelog	2008-01-18 09:44:50 UTC (rev 5469)
+++ trunk/libjboss-microcontainer-java/debian/changelog	2008-01-18 11:23:34 UTC (rev 5470)
@@ -1,3 +1,14 @@
+libjboss-microcontainer-java (2.0.0~Beta9-1) unstable; urgency=low
+
+  * New upstream release
+  * debian/control: Build-Depend on debhelper >=6
+  * debian/compat: Bump to 6
+  * Add patches/override.diff to fix a build issue
+  * Fix watch file and orig-tar.sh to directly read the upstream tag
+    version and create orig.tar.gz
+
+ -- Varun Hiremath <varun at debian.org>  Fri, 18 Jan 2008 17:03:37 +0530
+
 libjboss-microcontainer-java (2.0.0~Beta7-1) unstable; urgency=low
 
   * new upstream release

Modified: trunk/libjboss-microcontainer-java/debian/compat
===================================================================
--- trunk/libjboss-microcontainer-java/debian/compat	2008-01-18 09:44:50 UTC (rev 5469)
+++ trunk/libjboss-microcontainer-java/debian/compat	2008-01-18 11:23:34 UTC (rev 5470)
@@ -1 +1 @@
-5
+6

Modified: trunk/libjboss-microcontainer-java/debian/control
===================================================================
--- trunk/libjboss-microcontainer-java/debian/control	2008-01-18 09:44:50 UTC (rev 5469)
+++ trunk/libjboss-microcontainer-java/debian/control	2008-01-18 11:23:34 UTC (rev 5470)
@@ -2,8 +2,8 @@
 Section: contrib/libs
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Varun Hiremath <varunhiremath at gmail.com>, Torsten Werner <twerner at debian.org>
-Build-Depends: cdbs, debhelper (>= 5), quilt
+Uploaders: Varun Hiremath <varun at debian.org>, Torsten Werner <twerner at debian.org>
+Build-Depends: cdbs, debhelper (>= 6), quilt
 Build-Depends-Indep: ant, sun-java6-jdk, junit, libxerces2-java, 
  libjboss-common-java, libjboss-test-java, libjboss-xml-binding-java,
  libjboss-integration-java, libjavassist-java

Modified: trunk/libjboss-microcontainer-java/debian/orig-tar.sh
===================================================================
--- trunk/libjboss-microcontainer-java/debian/orig-tar.sh	2008-01-18 09:44:50 UTC (rev 5469)
+++ trunk/libjboss-microcontainer-java/debian/orig-tar.sh	2008-01-18 11:23:34 UTC (rev 5470)
@@ -1,14 +1,15 @@
 #!/bin/sh -e
 
 # $1 = version
-TAR=../libjboss-microcontainer-java_$1.orig.tar.gz
-DIR=libjboss-microcontainer-java-$1.orig
-TAG=$(echo $1 | sed -e 's/~/./')
+TAR=../libjboss-microcontainer-java_$2.orig.tar.gz
+DIR=libjboss-microcontainer-java-$2.orig
+TAG=$(echo $2 | sed -e 's/~/./')
 
 # clean up the upstream tarball
 svn export http://anonsvn.jboss.org/repos/jbossas/projects/microcontainer/tags/$TAG $DIR
 GZIP=--best tar -c -z -f $TAR $DIR
-rm -rf $DIR
+rm -rf $DIR 
+rm ../$TAG
 
 # move to directory 'tarballs'
 if [ -r .svn/deb-layout ]; then

Added: trunk/libjboss-microcontainer-java/debian/patches/override.diff
===================================================================
--- trunk/libjboss-microcontainer-java/debian/patches/override.diff	                        (rev 0)
+++ trunk/libjboss-microcontainer-java/debian/patches/override.diff	2008-01-18 11:23:34 UTC (rev 5470)
@@ -0,0 +1,12 @@
+Index: libjboss-microcontainer-java-2.0.0~Beta9/container/src/main/org/jboss/reflect/plugins/introspection/IntrospectionTypeInfoFactoryImpl.java
+===================================================================
+--- libjboss-microcontainer-java-2.0.0~Beta9.orig/container/src/main/org/jboss/reflect/plugins/introspection/IntrospectionTypeInfoFactoryImpl.java	2008-01-18 16:49:23.000000000 +0530
++++ libjboss-microcontainer-java-2.0.0~Beta9/container/src/main/org/jboss/reflect/plugins/introspection/IntrospectionTypeInfoFactoryImpl.java	2008-01-18 16:49:31.000000000 +0530
+@@ -350,7 +350,6 @@
+     * @param type the array type
+     * @return the info
+     */
+-   @Override
+    protected TypeInfo getGenericArrayType(GenericArrayType type)
+    {
+       Type compType = type.getGenericComponentType();

Added: trunk/libjboss-microcontainer-java/debian/patches/series
===================================================================
--- trunk/libjboss-microcontainer-java/debian/patches/series	                        (rev 0)
+++ trunk/libjboss-microcontainer-java/debian/patches/series	2008-01-18 11:23:34 UTC (rev 5470)
@@ -0,0 +1 @@
+override.diff

Modified: trunk/libjboss-microcontainer-java/debian/rules
===================================================================
--- trunk/libjboss-microcontainer-java/debian/rules	2008-01-18 09:44:50 UTC (rev 5469)
+++ trunk/libjboss-microcontainer-java/debian/rules	2008-01-18 11:23:34 UTC (rev 5470)
@@ -2,6 +2,7 @@
 
 include /usr/share/cdbs/1/class/ant.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
 JAVA_HOME 		:= /usr/lib/jvm/java-6-sun
 DEB_ANT_BUILD_TARGET	:= jar

Modified: trunk/libjboss-microcontainer-java/debian/watch
===================================================================
--- trunk/libjboss-microcontainer-java/debian/watch	2008-01-18 09:44:50 UTC (rev 5469)
+++ trunk/libjboss-microcontainer-java/debian/watch	2008-01-18 11:23:34 UTC (rev 5470)
@@ -1,2 +1,3 @@
 version=3
-http://sf.net/jboss/ microcontainer-(.*)-src\.tar\.gz debian debian/orig-tar.sh
+opts="uversionmangle=s/.Beta/~Beta/" \
+http://anonsvn.jboss.org/repos/jbossas/projects/microcontainer/tags/ ([0-9].*)/ debian debian/orig-tar.sh