[pkg-java] r15875 - trunk/libjrosetta-java/debian

[Sylvestre Ledru]

Author: sylvestre
Date: 2012-03-25 19:09:32 +0000 (Sun, 25 Mar 2012)
New Revision: 15875

Removed:
   trunk/libjrosetta-java/debian/ant.properties
Modified:
   trunk/libjrosetta-java/debian/changelog
   trunk/libjrosetta-java/debian/control
   trunk/libjrosetta-java/debian/rules
Log:
* Bring back the library (deleted from /usr/share/java/).
maven-debian-helper changed it behaviour
* Get ride of deprecated file (ant.properties)
* Some useless build dependencies removed (jdom1, slf4j)


Deleted: trunk/libjrosetta-java/debian/ant.properties
===================================================================
--- trunk/libjrosetta-java/debian/ant.properties	2012-03-23 15:58:46 UTC (rev 15874)
+++ trunk/libjrosetta-java/debian/ant.properties	2012-03-25 19:09:32 UTC (rev 15875)
@@ -1,2 +0,0 @@
-OS_NAME linux
-sdk.include /usr/

Modified: trunk/libjrosetta-java/debian/changelog
===================================================================
--- trunk/libjrosetta-java/debian/changelog	2012-03-23 15:58:46 UTC (rev 15874)
+++ trunk/libjrosetta-java/debian/changelog	2012-03-25 19:09:32 UTC (rev 15875)
@@ -1,3 +1,12 @@
+libjrosetta-java (1.0.4-3) unstable; urgency=low
+
+  * Bring back the library (deleted from /usr/share/java/).
+  maven-debian-helper changed it behaviour
+  * Get ride of deprecated file (ant.properties)
+  * Some useless build dependencies removed (jdom1, slf4j)
+  
+ -- Sylvestre Ledru <sylvestre at debian.org>  Sun, 25 Mar 2012 19:41:16 +0200
+
 libjrosetta-java (1.0.4-2) unstable; urgency=low
 
   * Update Standards-Version: 3.9.3

Modified: trunk/libjrosetta-java/debian/control
===================================================================
--- trunk/libjrosetta-java/debian/control	2012-03-23 15:58:46 UTC (rev 15874)
+++ trunk/libjrosetta-java/debian/control	2012-03-25 19:09:32 UTC (rev 15875)
@@ -4,9 +4,9 @@
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Sylvestre Ledru <sylvestre at debian.org>,
  Torsten Werner <twerner at debian.org>
-Build-Depends: debhelper (>= 7), cdbs
-Build-Depends-Indep: ant, ant-optional, default-jdk, maven-debian-helper,
- libslf4j-java, libjdom1-java, libmaven-assembly-plugin-java
+Build-Depends: debhelper (>= 7), cdbs, default-jdk, maven-debian-helper (>= 1.5)
+Build-Depends-Indep: junit4
+# default-jdk-doc, libmaven-javadoc-plugin-java 
 Standards-Version: 3.9.3
 Homepage: http://dev.artenum.com/projects/JRosetta/
 Vcs-Svn: svn+ssh://svn.debian.org/svn/pkg-java/trunk/libjrosetta-java
@@ -14,10 +14,26 @@
 
 Package: libjrosetta-java
 Architecture: all
-Depends:  ${misc:Depends}
+Depends: ${misc:Depends}, ${maven:Depends}
+Recommends: ${maven:OptionalDepends}
+#Suggests: libjrosetta-java-doc
 Description: JRosetta - Advanced graphical console engine
  JRosetta provides a common base for graphical component that could be used to
  build a graphical console in Swing with the latest requirements, such as
  command history, completion and so on for instance for scripting language
  or command line.
 
+
+# Package: libjrosetta-java-doc
+# Architecture: all
+# Section: doc
+# Depends: ${misc:Depends}, ${maven:DocDepends}
+# Recommends: ${maven:DocOptionalDepends}
+# Suggests: libjrosetta-java
+# Description: Documentation for JRosetta
+#  JRosetta provides a common base for graphical component that could be used to
+#  build a graphical console in Swing with the latest requirements, such as
+#  command history, completion and so on for instance for scripting language
+#  or command line.
+#  .
+#  This package contains the API documentation of libjrosetta-java.

Modified: trunk/libjrosetta-java/debian/rules
===================================================================
--- trunk/libjrosetta-java/debian/rules	2012-03-23 15:58:46 UTC (rev 15874)
+++ trunk/libjrosetta-java/debian/rules	2012-03-25 19:09:32 UTC (rev 15875)
@@ -3,11 +3,11 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/maven.mk
 
-JAVA_HOME                  := /usr/lib/jvm/default-java
-DEB_JARS                   := ant-nodeps 
-BUILDDIR                   := dist
+JAVA_HOME := /usr/lib/jvm/default-java
+#DEB_MAVEN_DOC_TARGET := javadoc:jar javadoc:aggregate
 DEB_INSTALL_CHANGELOGS_ALL := CHANGE.txt
-DEB_MAVEN_ARGS             := -e
 
 get-orig-source:
-	-uscan --upstream-version 0 --rename	
+	uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename
+
+