[med-svn] r7893 - trunk/packages/pixelmed/trunk/debian
Mathieu Malaterre
malat-guest at alioth.debian.org
Tue Sep 20 19:44:04 UTC 2011
Author: malat-guest
Date: 2011-09-20 19:44:03 +0000 (Tue, 20 Sep 2011)
New Revision: 7893
Added:
trunk/packages/pixelmed/trunk/debian/get-orig-source
trunk/packages/pixelmed/trunk/debian/pixelmed-java.install
trunk/packages/pixelmed/trunk/debian/pixelmed-java.manpages
Modified:
trunk/packages/pixelmed/trunk/debian/changelog
trunk/packages/pixelmed/trunk/debian/compat
trunk/packages/pixelmed/trunk/debian/control
trunk/packages/pixelmed/trunk/debian/rules
Log:
switch to dh 8
Modified: trunk/packages/pixelmed/trunk/debian/changelog
===================================================================
--- trunk/packages/pixelmed/trunk/debian/changelog 2011-09-20 14:33:59 UTC (rev 7892)
+++ trunk/packages/pixelmed/trunk/debian/changelog 2011-09-20 19:44:03 UTC (rev 7893)
@@ -1,3 +1,10 @@
+pixelmed (20110901-1) UNRELEASED; urgency=low
+
+ * New upstream
+ * Switch to dch 8
+
+ -- Mathieu Malaterre <mathieu.malaterre at gmail.com> Tue, 20 Sep 2011 21:13:59 +0200
+
pixelmed (20110717-1) unstable; urgency=low
* New upstream
Modified: trunk/packages/pixelmed/trunk/debian/compat
===================================================================
--- trunk/packages/pixelmed/trunk/debian/compat 2011-09-20 14:33:59 UTC (rev 7892)
+++ trunk/packages/pixelmed/trunk/debian/compat 2011-09-20 19:44:03 UTC (rev 7893)
@@ -1 +1 @@
-7
+8
Modified: trunk/packages/pixelmed/trunk/debian/control
===================================================================
--- trunk/packages/pixelmed/trunk/debian/control 2011-09-20 14:33:59 UTC (rev 7892)
+++ trunk/packages/pixelmed/trunk/debian/control 2011-09-20 19:44:03 UTC (rev 7893)
@@ -4,18 +4,17 @@
Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
DM-Upload-Allowed: yes
Uploaders: Mathieu Malaterre <mathieu.malaterre at gmail.com>
-Build-Depends: debhelper (>= 7), quilt
+Build-Depends: debhelper (>= 8), quilt
Build-Depends-Indep: javahelper, default-jdk, libhsqldb-java, libcommons-net2-java (>= 2.0), libvecmath-java, libjmdns-java (>= 3.4), junit4
Standards-Version: 3.9.2
-Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/pixelmed/trunk/?rev=0&sc=0
+Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/pixelmed/trunk/
Vcs-Svn: svn://svn.debian.org/svn/debian-med/trunk/packages/pixelmed/trunk/
Homepage: http://www.pixelmed.com
Package: pixelmed-java
Section: java
Architecture: all
-Depends: libhsqldb-java, libcommons-net-java, libvecmath-java, libcommons-codec-java, libbcprov-java, ${java:Depends}, ${misc:Depends}, java-gcj-compat | java1-runtime | java2-runtime, java-wrappers (>= 0.1.15)
-Suggests: java-virtual-machine
+Depends: ${java:Depends}, ${misc:Depends}
Description: DICOM implementation containing Image Viewer and a ECG Viewer
This is a stand-alone DICOM toolkit that implements code for reading
and creating DICOM data, DICOM network and file support, a database of
Added: trunk/packages/pixelmed/trunk/debian/get-orig-source
===================================================================
--- trunk/packages/pixelmed/trunk/debian/get-orig-source (rev 0)
+++ trunk/packages/pixelmed/trunk/debian/get-orig-source 2011-09-20 19:44:03 UTC (rev 7893)
@@ -0,0 +1,42 @@
+#!/bin/sh
+set -ex
+
+PACKAGE=pixelmed
+
+VERSION=${VERSION:-$2}
+TARFILE=${TARFILE:-$3}
+
+if [ -z ${VERSION}]; then
+VERSION=`dpkg-parsechangelog | sed -n -e 's/^Version: \(.*\)-[^-]*$/\1/p'`
+fi
+
+REVISION=`echo $VERSION | sed -e 's/^.*svn//g'`
+
+
+if [ -z ${TARFILE}]; then
+TARFILE=${PACKAGE}_${VERSION}.orig.tar.gz
+fi
+
+FOLDER=${PACKAGE}-${VERSION}
+
+UPSTREAM_SRC=pixelmedjavadicom_sourcerelease.${VERSION}
+wget -c http://www.dclunie.com/pixelmed/software/${VERSION}_current/${UPSTREAM_SRC}.tar.bz2
+mkdir ${FOLDER}
+tar xjf ${UPSTREAM_SRC}.tar.bz2 -C ${FOLDER}
+# Upstream confirmed this was left over from tests:
+rm -rf ${FOLDER}/com/pixelmed/display/cleanersrc.data
+rm -rf ${FOLDER}/com/pixelmed/display/cleanerdst.data
+rm -rf ${FOLDER}/com/pixelmed/dicom/JIS0208Mapping.dat
+rm -rf ${FOLDER}/com/pixelmed/displaywave/PFE105.dat
+# some more data files:
+rm -rf ${FOLDER}/com/pixelmed/displaywave/PFE105_redred.scp
+rm -rf ${FOLDER}/com/pixelmed/displaywave/PFE105_high.scp
+rm -rf ${FOLDER}/com/pixelmed/network/.com.pixelmed.display.DicomImageViewer.database.lck
+rm -rf ${FOLDER}/com/pixelmed/network/.com.pixelmed.display.DicomImageViewer.database.data
+# Remove broken symlink
+rm -rf ${FOLDER}/com/pixelmed/display/testmammohome
+# Remove AppleDouble encoded Macintosh file
+find ${FOLDER} -name ._\* -exec rm {} \;
+
+GZIP="--best --no-name" tar czf ${TARFILE} ${FOLDER}
+rm -rf ${FOLDER}
Property changes on: trunk/packages/pixelmed/trunk/debian/get-orig-source
___________________________________________________________________
Added: svn:executable
+ *
Added: trunk/packages/pixelmed/trunk/debian/pixelmed-java.install
===================================================================
--- trunk/packages/pixelmed/trunk/debian/pixelmed-java.install (rev 0)
+++ trunk/packages/pixelmed/trunk/debian/pixelmed-java.install 2011-09-20 19:44:03 UTC (rev 7893)
@@ -0,0 +1,4 @@
+debian/dicomimageviewer usr/bin
+debian/ecgviewer usr/bin
+debian/doseutility usr/bin
+.com.pixelmed.display.DicomImageViewer.properties etc/pixelmed
Added: trunk/packages/pixelmed/trunk/debian/pixelmed-java.manpages
===================================================================
--- trunk/packages/pixelmed/trunk/debian/pixelmed-java.manpages (rev 0)
+++ trunk/packages/pixelmed/trunk/debian/pixelmed-java.manpages 2011-09-20 19:44:03 UTC (rev 7893)
@@ -0,0 +1,3 @@
+debian/dicomimageviewer.1
+debian/ecgviewer.1
+debian/doseutility.1
Modified: trunk/packages/pixelmed/trunk/debian/rules
===================================================================
--- trunk/packages/pixelmed/trunk/debian/rules 2011-09-20 14:33:59 UTC (rev 7892)
+++ trunk/packages/pixelmed/trunk/debian/rules 2011-09-20 19:44:03 UTC (rev 7893)
@@ -1,109 +1,10 @@
#!/usr/bin/make -f
-
-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
export JAVA_HOME=/usr/lib/jvm/default-java
-VER_FULL = $(shell dpkg-parsechangelog | grep '^Version' | cut -d' ' -f2 | cut -f1 -d-)
+%:
+ dh $@ --with javahelper
-UPSTREAM_SRC = pixelmedjavadicom_sourcerelease.$(VER_FULL)
-DEBIAN_SRC_DIR = pixelmed-$(VER_FULL)
-DEBIAN_SRC_TAR = pixelmed_$(VER_FULL).orig.tar.gz
-
-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
- touch 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
- rm -f build-arch-stamp build-indep-stamp pixelmed.jar
- dh_clean
-
-install-indep: build-indep
- dh_testdir
- dh_testroot
- #dh_clean -k
- dh_prep
- dh_installdirs
-
-binary-arch: build-arch
- # Java packages are arch: all, nothing to do here
-
-binary-indep: build-indep install-indep
- # FIXME: isn't there something easier:
- cp sample.com.pixelmed.display.DicomImageViewer.properties .com.pixelmed.display.DicomImageViewer.properties
- # executable-not-elf-or-script ./etc/pixelmed/.com.pixelmed.display.DicomImageViewer.properties
- chmod -x .com.pixelmed.display.DicomImageViewer.properties
- # Create the package here
- dh_testdir
- dh_testroot
- dh_installchangelogs
- dh_installdocs
- dh_installexamples
- #dh_install --list-missing
- dh_install debian/dicomimageviewer usr/bin
- dh_install debian/ecgviewer usr/bin
- dh_install debian/doseutility usr/bin
- dh_install .com.pixelmed.display.DicomImageViewer.properties etc/pixelmed
- #rm -rf webstart/._*
- #rm -rf webstart/images/._*
- #dh_install webstart usr/share/doc/pixelmed-java
- #rm -rf icons/._*
- #dh_install icons usr/share/doc/pixelmed-java/webstart
- dh_installman debian/dicomimageviewer.1
- dh_installman debian/ecgviewer.1
- dh_installman debian/doseutility.1
- #dh_javadoc -i --sourcedir=src
- jh_installlibs -i
- jh_manifest -i
- jh_depends -i
- dh_compress
- dh_fixperms
- dh_installdeb
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-$(UPSTREAM_SRC).tar.bz2:
- wget -c http://www.dclunie.com/pixelmed/software/$(VER_FULL)_current/$@
-
-get-orig-source: $(UPSTREAM_SRC).tar.bz2
- #uscan --verbose --force-download --repack
- mkdir $(DEBIAN_SRC_DIR)
- tar xjf $(UPSTREAM_SRC).tar.bz2 -C $(DEBIAN_SRC_DIR)
- # Upstream confirmed this was left over from tests:
- rm -rf $(DEBIAN_SRC_DIR)/com/pixelmed/display/cleanersrc.data
- rm -rf $(DEBIAN_SRC_DIR)/com/pixelmed/display/cleanerdst.data
- rm -rf $(DEBIAN_SRC_DIR)/com/pixelmed/dicom/JIS0208Mapping.dat
- rm -rf $(DEBIAN_SRC_DIR)/com/pixelmed/displaywave/PFE105.dat
- # some more data files:
- rm -rf $(DEBIAN_SRC_DIR)/com/pixelmed/displaywave/PFE105_redred.scp
- rm -rf $(DEBIAN_SRC_DIR)/com/pixelmed/displaywave/PFE105_high.scp
- rm -rf $(DEBIAN_SRC_DIR)/com/pixelmed/network/.com.pixelmed.display.DicomImageViewer.database.lck
- rm -rf $(DEBIAN_SRC_DIR)/com/pixelmed/network/.com.pixelmed.display.DicomImageViewer.database.data
- # Remove broken symlink
- rm -rf $(DEBIAN_SRC_DIR)/com/pixelmed/display/testmammohome
- # Remove AppleDouble encoded Macintosh file
- (cd $(DEBIAN_SRC_DIR) && find . -name ._\* -exec rm {} \;)
- GZIP="--best --no-name" tar czf $(DEBIAN_SRC_TAR) $(DEBIAN_SRC_DIR)
- rm -rf $(DEBIAN_SRC_DIR)
-
-binary: binary-indep binary-arch
-.PHONY: build build-arch build-indep clean binary-indep binary-arch binary install-indep
+get-orig-source:
+ ./debian/get-orig-source
More information about the debian-med-commit
mailing list