[pkg-java] r4811 - trunk/libjcip-annotations-java/debian

[twerner at alioth.debian.org]

Author: twerner
Date: 2007-11-22 21:50:14 +0000 (Thu, 22 Nov 2007)
New Revision: 4811

Added:
   trunk/libjcip-annotations-java/debian/libjcip-annotations-java-doc.doc-base
   trunk/libjcip-annotations-java/debian/libjcip-annotations-java.install
Removed:
   trunk/libjcip-annotations-java/debian/doc-base
Modified:
   trunk/libjcip-annotations-java/debian/
   trunk/libjcip-annotations-java/debian/build.xml
   trunk/libjcip-annotations-java/debian/control
   trunk/libjcip-annotations-java/debian/rules
Log:
the package builds now



Property changes on: trunk/libjcip-annotations-java/debian
___________________________________________________________________
Name: mergeWithUpstream
   + 1

Modified: trunk/libjcip-annotations-java/debian/build.xml
===================================================================
--- trunk/libjcip-annotations-java/debian/build.xml	2007-11-22 21:30:41 UTC (rev 4810)
+++ trunk/libjcip-annotations-java/debian/build.xml	2007-11-22 21:50:14 UTC (rev 4811)
@@ -1,4 +1,4 @@
-<project name="jcip-annotations" default="dist" basedir=".">
+<project name="jcip-annotations" default="dist" basedir="..">
 
     <property name="root.dir" value="${basedir}"/>
     <property name="src.dir" value="${root.dir}/src"/>
@@ -77,4 +77,4 @@
     
     <target name="dist" description="Build binary distribution" depends="prepare,jar,javadoc"/>
     
-</project>
\ No newline at end of file
+</project>

Modified: trunk/libjcip-annotations-java/debian/control
===================================================================
--- trunk/libjcip-annotations-java/debian/control	2007-11-22 21:30:41 UTC (rev 4810)
+++ trunk/libjcip-annotations-java/debian/control	2007-11-22 21:50:14 UTC (rev 4811)
@@ -15,7 +15,7 @@
 
 Package: libjcip-annotations-java-doc
 Architecture: all
-Section: docs
+Section: doc
 Suggests: libjcip-annotations-java
 Description: Java Concurrency In Practice annotations library documentation
  This is a package with classes from Java Concurrency In Practice

Deleted: trunk/libjcip-annotations-java/debian/doc-base
===================================================================
--- trunk/libjcip-annotations-java/debian/doc-base	2007-11-22 21:30:41 UTC (rev 4810)
+++ trunk/libjcip-annotations-java/debian/doc-base	2007-11-22 21:50:14 UTC (rev 4811)
@@ -1,8 +0,0 @@
-Document: libjcip-annitations-java-doc
-Title: JCIP Annotations
-Authors: xxx
-Abstract: Java Concurrency In Practice
-Section: Programming
-
-Format: HTML
-Index: /usr/share/doc/libjcip-annotations-java-doc/api/index.html

Copied: trunk/libjcip-annotations-java/debian/libjcip-annotations-java-doc.doc-base (from rev 4810, trunk/libjcip-annotations-java/debian/doc-base)
===================================================================
--- trunk/libjcip-annotations-java/debian/libjcip-annotations-java-doc.doc-base	                        (rev 0)
+++ trunk/libjcip-annotations-java/debian/libjcip-annotations-java-doc.doc-base	2007-11-22 21:50:14 UTC (rev 4811)
@@ -0,0 +1,8 @@
+Document: libjcip-annitations-java-doc
+Title: JCIP Annotations
+Authors: xxx
+Abstract: Java Concurrency In Practice
+Section: Programming
+
+Format: HTML
+Index: /usr/share/doc/libjcip-annotations-java-doc/javadoc/index.html

Added: trunk/libjcip-annotations-java/debian/libjcip-annotations-java.install
===================================================================
--- trunk/libjcip-annotations-java/debian/libjcip-annotations-java.install	                        (rev 0)
+++ trunk/libjcip-annotations-java/debian/libjcip-annotations-java.install	2007-11-22 21:50:14 UTC (rev 4811)
@@ -0,0 +1 @@
+debian/tmp/usr/share/java/*.jar

Modified: trunk/libjcip-annotations-java/debian/rules
===================================================================
--- trunk/libjcip-annotations-java/debian/rules	2007-11-22 21:30:41 UTC (rev 4810)
+++ trunk/libjcip-annotations-java/debian/rules	2007-11-22 21:50:14 UTC (rev 4811)
@@ -7,7 +7,8 @@
 
 JAVA_HOME 		:= /usr/lib/jvm/java-6-sun
 DEB_ANT_BUILD_TARGET	:= dist
+DEB_ANT_BUILDFILE       := debian/build.xml
 
-install/jcip::
+install/libjcip-annotations-java::
 	install -m 644 -D dist/jcip.jar $(DEB_DESTDIR)/usr/share/java/jcip-$(DEB_UPSTREAM_VERSION).jar
 	dh_link /usr/share/java/jcip-$(DEB_UPSTREAM_VERSION).jar /usr/share/java/jcip.jar