[pkg-java] r11955 - trunk/qdox/debian

[Ludovic Claude]

Author: ludovicc-guest
Date: 2010-03-28 21:18:56 +0000 (Sun, 28 Mar 2010)
New Revision: 11955

Modified:
   trunk/qdox/debian/build.xml
   trunk/qdox/debian/changelog
   trunk/qdox/debian/control
Log:


Modified: trunk/qdox/debian/build.xml
===================================================================
--- trunk/qdox/debian/build.xml	2010-03-28 20:42:44 UTC (rev 11954)
+++ trunk/qdox/debian/build.xml	2010-03-28 21:18:56 UTC (rev 11955)
@@ -43,6 +43,8 @@
         <java classpath="/usr/share/java/JFlex.jar" classname="JFlex.Main" fork="true">
               <arg value="-d" />
               <arg value="${build.directory}/generated-sources/com/thoughtworks/qdox/parser/impl" />
+              <arg value="--skel" />
+              <arg value="src/grammar/skeleton.inner" />
               <arg value="src/grammar/lexer.flex" />
         </java>
         <exec executable="${qdox.byaccj.executable}" dir="${build.directory}/generated-sources/com/thoughtworks/qdox/parser/impl"

Modified: trunk/qdox/debian/changelog
===================================================================
--- trunk/qdox/debian/changelog	2010-03-28 20:42:44 UTC (rev 11954)
+++ trunk/qdox/debian/changelog	2010-03-28 21:18:56 UTC (rev 11955)
@@ -1,3 +1,13 @@
+qdox (1.11-2) unstable; urgency=low
+
+  * New upstream release
+  * debian/control: update jflex to 1.4.3
+  * debian/build.xml: add missing option to JFlex
+  * use default-jdk-doc instead of classpath-doc/openjdk-6-doc,
+    add Recommends default-jdk-doc on libqdox-java-doc (Closes: #567291)
+
+ -- Ludovic Claude <ludovic.claude at laposte.net>  Fri, 26 Mar 2010 22:52:29 +0100
+
 qdox (1.10-1) UNRELEASED; urgency=low
 
   [ Michael Koch ]

Modified: trunk/qdox/debian/control
===================================================================
--- trunk/qdox/debian/control	2010-03-28 20:42:44 UTC (rev 11954)
+++ trunk/qdox/debian/control	2010-03-28 21:18:56 UTC (rev 11955)
@@ -6,7 +6,7 @@
  Damien Raude-Morvan <drazzib at debian.org>
 Build-Depends: debhelper (>= 7), cdbs, default-jdk, byacc-j
 Build-Depends-Indep: maven-repo-helper, maven-ant-helper (>> 4), ant, ant-optional, 
- jflex (>= 1.4.1), junit (>= 3.8.1), libjmock-java (>= 1.0.1), openjdk-6-doc
+ jflex (>= 1.4.3), junit (>= 3.8.1), libjmock-java (>= 1.0.1), default-jdk-doc
 Standards-Version: 3.8.4
 Homepage: http://qdox.codehaus.org/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/qdox
@@ -33,6 +33,7 @@
 Section: doc
 Architecture: all
 Depends: ${misc:Depends}
+Recommends: default-jdk-doc
 Suggests: libqdox-java
 Description: Documentation for qdox (javadoc)
  This package contains the documentation for qdox, generated from