[pkg-java] r11787 - trunk/libjasper-java/debian

[Niels Thykier]

Author: nthykier-guest
Date: 2010-03-01 20:50:39 +0000 (Mon, 01 Mar 2010)
New Revision: 11787

Modified:
   trunk/libjasper-java/debian/changelog
   trunk/libjasper-java/debian/control
   trunk/libjasper-java/debian/rules
Log:
Fixed #572035 and set dist.

Modified: trunk/libjasper-java/debian/changelog
===================================================================
--- trunk/libjasper-java/debian/changelog	2010-03-01 20:23:25 UTC (rev 11786)
+++ trunk/libjasper-java/debian/changelog	2010-03-01 20:50:39 UTC (rev 11787)
@@ -1,3 +1,11 @@
+libjasper-java (5.5.26-5) unstable; urgency=low
+
+  * Removed versionless symlink of jasper.jar to avoid conflict with
+    tomcat6's jasper.jar. (Closes: #572035)
+  * Removed newly obsolete B-D on javahelper.
+
+ -- Niels Thykier <niels at thykier.net>  Mon, 01 Mar 2010 21:50:23 +0100
+
 libjasper-java (5.5.26-4) unstable; urgency=low
 
   * Discard all binary packages and put jasper in its own package.

Modified: trunk/libjasper-java/debian/control
===================================================================
--- trunk/libjasper-java/debian/control	2010-03-01 20:23:25 UTC (rev 11786)
+++ trunk/libjasper-java/debian/control	2010-03-01 20:50:39 UTC (rev 11787)
@@ -8,7 +8,6 @@
                cdbs,
                debhelper (>= 7),
                default-jdk,
-               javahelper (>= 0.28),
                libcommons-el-java,
                libcommons-logging-java,
                libecj-java,

Modified: trunk/libjasper-java/debian/rules
===================================================================
--- trunk/libjasper-java/debian/rules	2010-03-01 20:23:25 UTC (rev 11786)
+++ trunk/libjasper-java/debian/rules	2010-03-01 20:50:39 UTC (rev 11787)
@@ -14,4 +14,5 @@
 install/libjasper-java::
 	cd build/shared/classes/ && zip -r ../../jasper.jar *
 	jar umf debian/osgi.MF build/jasper.jar
-	jh_installlibs -p$(cdbs_curpkg) build/jasper.jar
+	mv build/jasper.jar build/jasper-$(DEB_UPSTREAM_VERSION).jar
+	dh_install -plibjasper-java build/jasper-$(DEB_UPSTREAM_VERSION).jar