[med-svn] r4051 - in trunk/packages/pixelmed/trunk/debian: . patches

Mathieu Malaterre malat-guest at alioth.debian.org
Mon Sep 28 09:10:27 UTC 2009 

Author: malat-guest
Date: 2009-09-28 09:10:24 +0000 (Mon, 28 Sep 2009)
New Revision: 4051

Added:
   trunk/packages/pixelmed/trunk/debian/patches/
   trunk/packages/pixelmed/trunk/debian/patches/Makefile.common.mk.patch
   trunk/packages/pixelmed/trunk/debian/patches/series
   trunk/packages/pixelmed/trunk/debian/pixelmed-java.jlibs
Modified:
   trunk/packages/pixelmed/trunk/debian/
   trunk/packages/pixelmed/trunk/debian/control
   trunk/packages/pixelmed/trunk/debian/rules
Log:
first package


Property changes on: trunk/packages/pixelmed/trunk/debian
___________________________________________________________________
Added: mergeWithUpstream
   + 1

Modified: trunk/packages/pixelmed/trunk/debian/control
===================================================================
--- trunk/packages/pixelmed/trunk/debian/control	2009-09-28 09:08:39 UTC (rev 4050)
+++ trunk/packages/pixelmed/trunk/debian/control	2009-09-28 09:10:24 UTC (rev 4051)
@@ -10,7 +10,8 @@
 Vcs-Svn: svn://svn.debian.org/svn/debian-med/trunk/packages/pixelmed/trunk/
 Homepage: http://www.pixelmed.com
 
-Package: pixelmed-tools
+Package: pixelmed-java
+Section: java
 Architecture: all
 Depends: libhsqldb-java, libvecmath1.2-java | libjava3d-java , libcommons-codec-java
 Description: DICOM

Added: trunk/packages/pixelmed/trunk/debian/patches/Makefile.common.mk.patch
===================================================================
--- trunk/packages/pixelmed/trunk/debian/patches/Makefile.common.mk.patch	                        (rev 0)
+++ trunk/packages/pixelmed/trunk/debian/patches/Makefile.common.mk.patch	2009-09-28 09:10:24 UTC (rev 4051)
@@ -0,0 +1,22 @@
+Set include path according to debian layout
+
+--- pixelmed-20090816/Makefile.common.mk	2007-12-27 21:23:51.000000000 +0100
++++ pixelmed/Makefile.common.mk	2009-09-17 10:02:42.000000000 +0200
+@@ -4,7 +4,8 @@
+ 
+ PATHTOHOME = /Users/dclunie
+ 
+-ADDITIONALJARDIRINROOT = lib/additional
++#ADDITIONALJARDIRINROOT = lib/additional
++#ADDITIONALJARDIRINROOT = /usr/share/java
+ 
+ PATHTODCTOOLSUPPORTFROMROOT = ../../dctool.support
+ 
+@@ -13,6 +14,7 @@
+ PATHTOSCPECGSAMPLESFROMROOT = ../../../Documents/Medical/stuff/ECG/OpenECG
+ 
+ PATHTOADDITIONAL = ${PATHTOROOT}/${ADDITIONALJARDIRINROOT}
++PATHTOADDITIONAL = /usr/share/java
+ 
+ PATHTODCTOOLSUPPORT = ${PATHTOROOT}/${PATHTODCTOOLSUPPORTFROMROOT}
+ 


Property changes on: trunk/packages/pixelmed/trunk/debian/patches/Makefile.common.mk.patch
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:eol-style
   + native

Added: trunk/packages/pixelmed/trunk/debian/patches/series
===================================================================
--- trunk/packages/pixelmed/trunk/debian/patches/series	                        (rev 0)
+++ trunk/packages/pixelmed/trunk/debian/patches/series	2009-09-28 09:10:24 UTC (rev 4051)
@@ -0,0 +1 @@
+Makefile.common.mk.patch


Property changes on: trunk/packages/pixelmed/trunk/debian/patches/series
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:eol-style
   + native

Added: trunk/packages/pixelmed/trunk/debian/pixelmed-java.jlibs
===================================================================
--- trunk/packages/pixelmed/trunk/debian/pixelmed-java.jlibs	                        (rev 0)
+++ trunk/packages/pixelmed/trunk/debian/pixelmed-java.jlibs	2009-09-28 09:10:24 UTC (rev 4051)
@@ -0,0 +1 @@
+pixelmed.jar

Modified: trunk/packages/pixelmed/trunk/debian/rules
===================================================================
--- trunk/packages/pixelmed/trunk/debian/rules	2009-09-28 09:08:39 UTC (rev 4050)
+++ trunk/packages/pixelmed/trunk/debian/rules	2009-09-28 09:10:24 UTC (rev 4051)
@@ -1,16 +1,12 @@
 #!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
 
 include /usr/share/quilt/quilt.make
 
 # Uncomment this to turn on verbose mode.
 export DH_VERBOSE=1
 
+export JAVA_HOME=/usr/lib/jvm/java-6-openjdk
+
 VER_MAJOR = 2009
 VER_MINOR = 08
 VER_PATCH = 16
@@ -21,65 +17,39 @@
 DEBIAN_SRC_DIR = pixelmed-$(VER_FULL)
 DEBIAN_SRC_TAR = pixelmed_$(VER_FULL).orig.tar.gz
 
-# These are used for cross-compiling and for saving the configure script
-# from having to guess our platform (since we know it already)
-DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-
-
-CFLAGS = -Wall -g
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2
-endif
-
-configure: configure-stamp
-configure-stamp: $(QUILT_STAMPFN)
+build: build-arch-stamp build-indep-stamp
+build-arch: build-arch-stamp
+build-arch-stamp: $(QUILT_STAMPFN)
 	dh_testdir
 	# Add here commands to configure the package.
 	#[ -d debian/build ] || mkdir debian/build
-	#[ ! -e CMakeCache.txt ] || rm CMakeCache.txt
-	#cd debian/build; cmake ../..
-
 	touch configure-stamp
 
-build: build-stamp
-build-stamp: configure-stamp 
+build-indep: build-indep-stamp
+build-indep-stamp:
 	dh_testdir
-
 	# Add here commands to compile the package.
 	$(MAKE)
-
 	touch $@
 
 clean:
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp configure-stamp
-
-	# Add here commands to clean up after the build process.
-	#rm -rf debian/build
-
+	rm -f build-arch-stamp build-indep-stamp pixelmed.jar
 	dh_clean 
 
-install: build
+install-indep: build-indep
 	dh_testdir
 	dh_testroot
 	dh_clean -k 
 	dh_installdirs
 
-	# Add here commands to install the package into debian/tmp
-	$(MAKE) install
+binary-arch: build-arch
+	# Java packages are arch: all, nothing to do here
 
-
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
+binary-indep: build-indep install-indep
+	# Create the package here
 	dh_testdir
 	dh_testroot
 	dh_installchangelogs
@@ -87,12 +57,13 @@
 	dh_installexamples
 	dh_install --list-missing
 	dh_installman
-	dh_link
-	dh_strip
+	#dh_javadoc -i --sourcedir=src 
+	jh_installlibs -i
+	jh_manifest -i
+	jh_depends -i
 	dh_compress
 	dh_fixperms
 	dh_installdeb
-	dh_shlibdeps
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb
@@ -108,4 +79,4 @@
 	rm -rf $(DEBIAN_SRC_DIR)
 
 binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
+.PHONY: build build-arch build-indep clean binary-indep binary-arch binary install-indep

More information about the debian-med-commit mailing list