[pkg-java] r11495 - trunk/freemind/debian

[Eric Lavarde]

Author: ewl-guest
Date: 2010-02-02 19:21:43 +0000 (Tue, 02 Feb 2010)
New Revision: 11495

Modified:
   trunk/freemind/debian/changelog
   trunk/freemind/debian/control
Log:
Change JiBX dependency to libjibx1.1-java (or libjibx-java 1.1.x for Ubuntu).


Modified: trunk/freemind/debian/changelog
===================================================================
--- trunk/freemind/debian/changelog	2010-02-02 19:02:03 UTC (rev 11494)
+++ trunk/freemind/debian/changelog	2010-02-02 19:21:43 UTC (rev 11495)
@@ -1,5 +1,7 @@
 freemind (0.9.0~rc6+dfsg-2) unstable; urgency=low
 
+  * Change JiBX dependency to libjibx1.1-java (or libjibx-java 1.1.x for
+    Ubuntu).
   * Fix obsolete-relation-form-in-source in freemind depends: simplyhtml
     (> 0.13).
   * Improve existing MIME support and add MIME support for KDE3

Modified: trunk/freemind/debian/control
===================================================================
--- trunk/freemind/debian/control	2010-02-02 19:02:03 UTC (rev 11494)
+++ trunk/freemind/debian/control	2010-02-02 19:21:43 UTC (rev 11495)
@@ -3,14 +3,16 @@
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Eric Lavarde <deb at zorglub.s.bawue.de>
-Build-Depends-Indep: docbook-to-man, ant, ant-optional, openjdk-6-jdk, imagemagick, libcommons-lang-java, libbatik-java (>= 1.6), rhino, libjgoodies-forms-java, groovy, libjibx-java, simplyhtml (>> 0.13), javahelp2, fop
+# FreeMind can be built with JiBX 1.0, 1.1 and 1.2, but the result does only
+# run with the version it was built with.
+Build-Depends-Indep: docbook-to-man, ant, ant-optional, openjdk-6-jdk, imagemagick, libcommons-lang-java, libbatik-java (>= 1.6), rhino, libjgoodies-forms-java, groovy, libjibx1.1-java | libjibx-java (>= 1.1), libjibx1.1-java | libjibx-java (<< 1.2), simplyhtml (>> 0.13), javahelp2, fop
 Build-Depends: debhelper (>= 5.0), cdbs (>= 0.4.8)
 Homepage: http://freemind.sourceforge.net/
 Standards-Version: 3.8.3.0
 
 Package: freemind
 Architecture: all
-Depends: openjdk-6-jre | sun-java5-jre | sun-java6-jre | java2-runtime, libcommons-lang-java, libjgoodies-forms-java, libjibx-java, simplyhtml (>> 0.13), ${misc:Depends}
+Depends: openjdk-6-jre | sun-java5-jre | sun-java6-jre | java2-runtime, libcommons-lang-java, libjgoodies-forms-java, libjibx1.1-java | libjibx-java (>= 1.1), libjibx1.1-java | libjibx-java (<< 1.2), simplyhtml (>> 0.13), ${misc:Depends}
 Recommends: freemind-doc, xdg-utils
 Suggests: freemind-plugins-help, freemind-plugins-svg, freemind-plugins-script, freemind-browser
 Conflicts: freemind-plugins-time (<< ${binary:Version})