[med-svn] r9318 - trunk/packages/netcdf-java/trunk/debian

[Mathieu Malaterre]

Author: malat-guest
Date: 2012-01-16 15:28:35 +0000 (Mon, 16 Jan 2012)
New Revision: 9318

Modified:
   trunk/packages/netcdf-java/trunk/debian/control
   trunk/packages/netcdf-java/trunk/debian/rules
Log:
some tidy up

Modified: trunk/packages/netcdf-java/trunk/debian/control
===================================================================
--- trunk/packages/netcdf-java/trunk/debian/control	2012-01-16 15:14:58 UTC (rev 9317)
+++ trunk/packages/netcdf-java/trunk/debian/control	2012-01-16 15:28:35 UTC (rev 9318)
@@ -7,7 +7,9 @@
 Build-Depends: debhelper (>= 8), javahelper (>=0.25)
 Build-Depends-Indep: default-jdk, default-jdk-doc, ant, libjdom1-java,
  libslf4j-java, libcommons-httpclient-java, libdb-je-java, libehcache-java,
- libprotobuf-java, libquartz-java
+ libprotobuf-java, libquartz-java,
+ libprotobuf-java (>= 2.3), libprotobuf-java (<< 2.4),
+ libjna-java
 Standards-Version: 3.9.2
 Homepage: http://www.unidata.ucar.edu/software/netcdf-java/
 Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/netcdf-java/trunk/

Modified: trunk/packages/netcdf-java/trunk/debian/rules
===================================================================
--- trunk/packages/netcdf-java/trunk/debian/rules	2012-01-16 15:14:58 UTC (rev 9317)
+++ trunk/packages/netcdf-java/trunk/debian/rules	2012-01-16 15:28:35 UTC (rev 9318)
@@ -1,15 +1,17 @@
 #!/usr/bin/make -f
+export DH_VERBOSE=1
 
 JAVA_HOME=/usr/lib/jvm/default-java
 #TODO=/home/mathieu/debian/debian-med/trunk/packages/netcdf-java/trunk/bla/lib/release/opendap-2.2.jar:/home/mathieu/debian/debian-med/trunk/packages/netcdf-java/trunk/bla/lib/external/visad.jar:/home/mathieu/debian/debian-med/trunk/packages/netcdf-java/trunk/bla/lib/release/grib-8.0.jar
 #export CLASSPATH=/usr/share/java/quartz.jar:/usr/share/java/protobuf.jar:/usr/share/java/ehcache.jar:/usr/share/java/jdom1.jar:/usr/share/java/slf4j-api.jar:/usr/share/java/commons-httpclient.jar:/usr/share/java/db-je.jar:$(TODO):/usr/share/java/opendap.jar
-ANT_OPTS=-Dbuild.sysclasspath=first
+#ANT_OPTS=-Dbuild.sysclasspath=first
 
 %:
-	dh $@ --with ant #javahelper
+	dh $@ --sourcedirectory=cdm
 
 override_dh_auto_build:
-	ant $(ANT_OPTS) -f cdm/build.xml makeCore
+	#ant $(ANT_OPTS) -f cdm/build.xml makeCore
+	dh_auto_build -- makeCore
 
 get-orig-source:
 	./debian/get-orig-source