[med-svn] r4017 - trunk/packages/imagej/trunk/debian

[Andreas Tille]

Author: tille
Date: 2009-09-25 10:01:37 +0000 (Fri, 25 Sep 2009)
New Revision: 4017

Modified:
   trunk/packages/imagej/trunk/debian/changelog
   trunk/packages/imagej/trunk/debian/control
   trunk/packages/imagej/trunk/debian/rules
Log:
Use short dh rules instead of cdbs


Modified: trunk/packages/imagej/trunk/debian/changelog
===================================================================
--- trunk/packages/imagej/trunk/debian/changelog	2009-09-25 09:42:39 UTC (rev 4016)
+++ trunk/packages/imagej/trunk/debian/changelog	2009-09-25 10:01:37 UTC (rev 4017)
@@ -1,3 +1,12 @@
+imagej (1.43g-2) UNRELEASED; urgency=low
+
+  * debian/control:
+    - s/Debian-Med/Debian Med/
+    - dropped cdbs depencency
+  * debian/rules: rewritten, drastically simplified using dh
+
+ -- Andreas Tille <tille at debian.org>  Fri, 25 Sep 2009 11:45:16 +0200
+
 imagej (1.43g-1) unstable; urgency=low
 
   * New upstream version

Modified: trunk/packages/imagej/trunk/debian/control
===================================================================
--- trunk/packages/imagej/trunk/debian/control	2009-09-25 09:42:39 UTC (rev 4016)
+++ trunk/packages/imagej/trunk/debian/control	2009-09-25 10:01:37 UTC (rev 4017)
@@ -1,11 +1,11 @@
 Source: imagej
 Section: science
 Priority: optional
-Maintainer: Debian-Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
+Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
 DM-Upload-Allowed: yes
 Uploaders: Paolo Ariano <paolo.ariano at unito.it>,
  Andreas Tille <tille at debian.org>
-Build-Depends: openjdk-6-jdk, cdbs, debhelper (>=7), ant, gif2png
+Build-Depends: openjdk-6-jdk, debhelper (>=7.1), ant, gif2png
 Standards-Version: 3.8.3
 Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/imagej/trunk/?rev=0&sc=0
 Vcs-Svn: svn://svn.debian.org/svn/debian-med/trunk/packages/imagej/trunk/

Modified: trunk/packages/imagej/trunk/debian/rules
===================================================================
--- trunk/packages/imagej/trunk/debian/rules	2009-09-25 09:42:39 UTC (rev 4016)
+++ trunk/packages/imagej/trunk/debian/rules	2009-09-25 10:01:37 UTC (rev 4017)
@@ -1,35 +1,12 @@
 #!/usr/bin/make -f
-# debian/rules for imagej (uses CDBS)
+# debian/rules for imagej
 
-# Uncomment this to turn on verbose mode.
-export DH_VERBOSE=1
+%:
+	dh $@
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/ant.mk
-# include /usr/share/cdbs/1/rules/patchsys-quilt.mk
-
-# when open_jdk will be jpeg compliant i will use /usr/lib/jvm/java-6-openjdk/
- JAVA_HOME		:= $(shell /usr/sbin/update-java-alternatives -l | head -1 | cut -d' ' -f 3)
-# Use gcj as java home or search for other installed JVM
-#JAVA_HOME = $(or $(shell [ -x /usr/lib/jvm/java-gcj ] && echo "/usr/lib/jvm/java-gcj"), $(shell ls -L /usr/lib/jvm/ | grep -v -e "[0-9]$" -e "-gcj$" | head -1 ))
-
-
-ANT = JAVA_HOME=$(JAVA_HOME) TEX4HTENV=/etc/tex4ht/tex4ht.env ant
-
-JAVACMD			:= $(JAVA_HOME)/bin/java
-DEB_BUILDDIR		:= $(CURDIR)
-DEB_ANT_BUILD_TARGET	:= build
-ANT_HOME		:= /usr/share/ant
-DEB_CLASSPATH		:= $(ANT_HOME)/lib/ant.jar:$(ANT_HOME)/lib/ant-launcher.jar:$(JAVA_HOME)/lib/tools.jar
-VERSION			:= $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' ' | cut -f 1 -d '-')
-
-install/imagej::
-	# install -m 644 $(DEB_BUILDDIR)/ij.jar $(CURDIR)/debian/imagej/usr/share/java/
-	# install -m 755 $(CURDIR)/debian/imagej.sh $(CURDIR)/debian/imagej/usr/bin/imagej
+# install/imagej::
+override_dh_auto_install:
 	cp -a $(CURDIR)/debian/imagej.sh $(CURDIR)/debian/imagej/usr/bin/imagej
-	# cp -r $(CURDIR)/plugins/*.class $(CURDIR)/debian/imagej/usr/share/imagej/plugins/
-	# cp -r $(CURDIR)/build/macros/* $(CURDIR)/debian/imagej/usr/share/imagej/macros/
-	# dh_installman -i debian/imagej.1
 
 get-orig-source:
 	. debian/get-orig-source