[med-svn] r8654 - in trunk/packages/dicomscope/trunk/debian: . patches
Mathieu Malaterre
malat-guest at alioth.debian.org
Wed Nov 23 11:55:44 UTC 2011
Author: malat-guest
Date: 2011-11-23 11:55:44 +0000 (Wed, 23 Nov 2011)
New Revision: 8654
Added:
trunk/packages/dicomscope/trunk/debian/dicomscope.docs
Removed:
trunk/packages/dicomscope/trunk/debian/docs
trunk/packages/dicomscope/trunk/debian/postinst
Modified:
trunk/packages/dicomscope/trunk/debian/changelog
trunk/packages/dicomscope/trunk/debian/compat
trunk/packages/dicomscope/trunk/debian/control
trunk/packages/dicomscope/trunk/debian/dicomscope.lintian-overrides
trunk/packages/dicomscope/trunk/debian/patches/series
trunk/packages/dicomscope/trunk/debian/rules
Log:
ready to upload
Modified: trunk/packages/dicomscope/trunk/debian/changelog
===================================================================
--- trunk/packages/dicomscope/trunk/debian/changelog 2011-11-23 02:44:05 UTC (rev 8653)
+++ trunk/packages/dicomscope/trunk/debian/changelog 2011-11-23 11:55:44 UTC (rev 8654)
@@ -1,9 +1,15 @@
-dicomscope (3.6.0-7) UNRELEASED; urgency=low
+dicomscope (3.6.0-7) unstable; urgency=low
+ [ Andreas Tille ]
* debian/source/format: 3.0 (quilt)
- -- Andreas Tille <tille at debian.org> Sun, 03 Jul 2011 22:04:00 +0200
+ [ Mathieu Malaterre ]
+ * Standards-Version: 3.9.2. No changes needed.
+ * Fix VCS URLs
+ * Redo the d/rules file for simplification
+ -- Mathieu Malaterre <mathieu.malaterre at gmail.com> Wed, 23 Nov 2011 12:55:20 +0100
+
dicomscope (3.6.0-6.1) unstable; urgency=low
* Non-maintainer upload.
Modified: trunk/packages/dicomscope/trunk/debian/compat
===================================================================
--- trunk/packages/dicomscope/trunk/debian/compat 2011-11-23 02:44:05 UTC (rev 8653)
+++ trunk/packages/dicomscope/trunk/debian/compat 2011-11-23 11:55:44 UTC (rev 8654)
@@ -1 +1 @@
-7
+8
Modified: trunk/packages/dicomscope/trunk/debian/control
===================================================================
--- trunk/packages/dicomscope/trunk/debian/control 2011-11-23 02:44:05 UTC (rev 8653)
+++ trunk/packages/dicomscope/trunk/debian/control 2011-11-23 11:55:44 UTC (rev 8654)
@@ -4,17 +4,17 @@
DM-Upload-Allowed: yes
Uploaders: Mathieu Malaterre <mathieu.malaterre at gmail.com>
Priority: extra
-Build-Depends: debhelper (>= 7), cmake, libdcmtk2-dev (>= 3.6.0), default-jdk,
- libssl-dev, libxml2-dev, quilt
-Standards-Version: 3.9.1
-Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/dicomscope/trunk/?rev=0&sc=0
-Vcs-Svn: svn://svn.debian.org/svn/debian-med/trunk/packages/dicomscope/trunk/
+Build-Depends: debhelper (>= 8), cmake, libdcmtk2-dev (>= 3.6.0), default-jdk,
+ libssl-dev, libxml2-dev
+Standards-Version: 3.9.2
+Vcs-Browser: http://anonscm.debian.org/viewvc/debian-med/trunk/packages/dicomscope/trunk/
+Vcs-Svn: svn://svn.debian.org/debian-med/trunk/packages/dicomscope/trunk/
Homepage: http://dicom.offis.de/dscope.php.en
Package: dicomscope
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, wish | tk8.5 | tk8.4, default-jre
-Description: The OFFIS DICOM Viewer
+Depends: ${shlibs:Depends}, ${misc:Depends}, tk8.6 | tk8.5 | tk8.4 | wish, default-jre
+Description: OFFIS DICOM Viewer
DICOMscope is a free DICOM viewer which can display uncompressed,
monochrome DICOM images from all modalities and which supports
monitor calibration according to DICOM part 14 as well as
Copied: trunk/packages/dicomscope/trunk/debian/dicomscope.docs (from rev 8653, trunk/packages/dicomscope/trunk/debian/docs)
===================================================================
--- trunk/packages/dicomscope/trunk/debian/dicomscope.docs (rev 0)
+++ trunk/packages/dicomscope/trunk/debian/dicomscope.docs 2011-11-23 11:55:44 UTC (rev 8654)
@@ -0,0 +1 @@
+DICOMscope/docs/*
Modified: trunk/packages/dicomscope/trunk/debian/dicomscope.lintian-overrides
===================================================================
--- trunk/packages/dicomscope/trunk/debian/dicomscope.lintian-overrides 2011-11-23 02:44:05 UTC (rev 8653)
+++ trunk/packages/dicomscope/trunk/debian/dicomscope.lintian-overrides 2011-11-23 11:55:44 UTC (rev 8654)
@@ -1,7 +1,5 @@
# W: dicomscope: package-name-doesnt-match-sonames libjInterface
dicomscope: package-name-doesnt-match-sonames
-# W: dicomscope: shlib-without-versioned-soname usr/lib/libjInterface.so libjInterface.so
-dicomscope: shlib-without-versioned-soname
# the suspected openssl-gpl conflict is due to
# the source package being licensed under gpl.
# therefore, we provide an explicit override
Deleted: trunk/packages/dicomscope/trunk/debian/docs
===================================================================
--- trunk/packages/dicomscope/trunk/debian/docs 2011-11-23 02:44:05 UTC (rev 8653)
+++ trunk/packages/dicomscope/trunk/debian/docs 2011-11-23 11:55:44 UTC (rev 8654)
@@ -1 +0,0 @@
-DICOMscope/docs/*
Modified: trunk/packages/dicomscope/trunk/debian/patches/series
===================================================================
--- trunk/packages/dicomscope/trunk/debian/patches/series 2011-11-23 02:44:05 UTC (rev 8653)
+++ trunk/packages/dicomscope/trunk/debian/patches/series 2011-11-23 11:55:44 UTC (rev 8654)
@@ -8,3 +8,4 @@
DSRDocument.cpp.patch
dicom_2009.patch
log4cplus.patch
+debian-changes-3.6.0-7
Deleted: trunk/packages/dicomscope/trunk/debian/postinst
===================================================================
--- trunk/packages/dicomscope/trunk/debian/postinst 2011-11-23 02:44:05 UTC (rev 8653)
+++ trunk/packages/dicomscope/trunk/debian/postinst 2011-11-23 11:55:44 UTC (rev 8654)
@@ -1,12 +0,0 @@
-#!/bin/sh
-set -e
-
-# This should be added by dh_makeshlibs but something seems to go wrong
-# here. So adding the code needed manually for the moment
-if [ "$1" = "configure" ]; then
- ldconfig
-fi
-
-#DEBHELPER#
-
-exit 0
Modified: trunk/packages/dicomscope/trunk/debian/rules
===================================================================
--- trunk/packages/dicomscope/trunk/debian/rules 2011-11-23 02:44:05 UTC (rev 8653)
+++ trunk/packages/dicomscope/trunk/debian/rules 2011-11-23 11:55:44 UTC (rev 8654)
@@ -1,20 +1,43 @@
#!/usr/bin/make -f
-# -*- makefile -*-
-# debian/rules for dicomscope
-# (C) 2008 Mathieu Malaterre <mathieu.malaterre at gmail.com>,
-# Andreas Tille <tille at debian.org
-# License: GPL
+#export DH_VERBOSE=1
-include /usr/share/quilt/quilt.make
+DPKG_EXPORT_BUILDFLAGS = 1
+-include /usr/share/dpkg/buildflags.mk
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+export JAVA_HOME=/usr/lib/jvm/default-java
-# 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)
+CMAKE_FLAGS = -DCMAKE_INSTALL_PREFIX="/usr" \
+ -DDICOMSCOPE_INSTALL_LIB_DIR:STRING=lib/jni \
+ -DDCMTK_config_INCLUDE_DIR:PATH=/usr/include/dcmtk/config \
+ -DDCMTK_dcmdata_INCLUDE_DIR:PATH=/usr/include/dcmtk/dcmdata \
+ -DDCMTK_dcmimgle_INCLUDE_DIR:PATH=/usr/include/dcmtk/dcmimgle \
+ -DDCMTK_dcmpstat_INCLUDE_DIR:PATH=/usr/include/dcmtk/dcmpstat \
+ -DDCMTK_dcmsr_INCLUDE_DIR:PATH=/usr/include/dcmtk/dcmsr \
+ -DDCMTK_dcmjpeg_INCLUDE_DIR:PATH=/usr/include/dcmtk/dcmjpeg \
+ -DDCMTK_ofstd_INCLUDE_DIR:PATH=/usr/include/dcmtk/ofstd
+%:
+ dh $@ --buildsystem=cmake --parallel
+
+override_dh_auto_configure:
+ dh_auto_configure -- $(CMAKE_FLAGS)
+
+override_dh_install:
+ # fix exe bit before install
+ chmod 755 debian/dicomscope/usr/share/dicomscope/tcl/dcmpsdmp.tcl
+ chmod 755 debian/dicomscope/usr/share/dicomscope/tcl/dcmpschk.tcl
+ dh_install
+
+override_dh_clean:
+ dh_clean
+ find DICOMscope -name *.class -delete
+
+override_dh_installman:
+ dh_installman debian/dicomscope.1
+
+override_dh_compress:
+ dh_compress -X.pdf
+
VER_MAJOR = 3
VER_MINOR = 6
VER_PATCH = 0
@@ -25,115 +48,9 @@
DEBIAN_SRC_DIR = dicomscope-$(VER_FULL)
DEBIAN_SRC_TAR = dicomscope_$(VER_FULL).orig.tar.gz
-# set the number of build jobs
-ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
- JOBS := -j$(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
-endif
-#
-export JAVA_HOME=/usr/lib/jvm/default-java
-CFLAGS = -Wall -g
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
- CFLAGS += -O0
-else
- CFLAGS += -O2
-endif
-export CFLAGS
-
-CXXFLAGS = $(CFLAGS) -Wno-deprecated
-export CXXFLAGS
-
-SRC := $(CURDIR)
-BUILD := $(CURDIR)/debian/build
-TARGET := $(CURDIR)/debian/$(shell dh_listpackages)
-# TARGET := $(CURDIR)/debian/tmp
-
-DICOMscope_TO_REMOVE := J2Ci about browser de dicomPrint dicomscope jToolkit main processCommunication viewer
-
-configure: configure-stamp
-configure-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 $(CURDIR) -DCMAKE_INSTALL_PREFIX="/usr" \
- -DCMAKE_SKIP_RPATH:BOOL=ON \
- -DCMAKE_VERBOSE_MAKEFILE:BOOL=$(DH_VERBOSE) \
- -DCMAKE_BUILD_TYPE:STRING=Release \
- -DDCMTK_config_INCLUDE_DIR:PATH=/usr/include/dcmtk/config \
- -DDCMTK_dcmdata_INCLUDE_DIR:PATH=/usr/include/dcmtk/dcmdata \
- -DDCMTK_dcmimgle_INCLUDE_DIR:PATH=/usr/include/dcmtk/dcmimgle \
- -DDCMTK_dcmpstat_INCLUDE_DIR:PATH=/usr/include/dcmtk/dcmpstat \
- -DDCMTK_dcmsr_INCLUDE_DIR:PATH=/usr/include/dcmtk/dcmsr \
- -DDCMTK_dcmjpeg_INCLUDE_DIR:PATH=/usr/include/dcmtk/dcmjpeg \
- -DDCMTK_ofstd_INCLUDE_DIR:PATH=/usr/include/dcmtk/ofstd
-
- touch configure-stamp
-
-build: build-stamp
-build-stamp: configure-stamp
- dh_testdir
-
- # Add here commands to compile the package.
- $(MAKE) $(JOBS) -C debian/build
-
- touch $@
-
-clean: unpatch
- dh_testdir
- dh_testroot
- rm -f build-stamp configure-stamp
-
- rm -rf debian/build
-
- # The build process obviously leaves several files behind in other
- # directories than the BUILD target. These have to removed manually
- for dir in $(DICOMscope_TO_REMOVE); do \
- rm -rf DICOMscope/"$$dir" ; \
- done
- #rm -rf tkgui/dicomscope
-
- dh_clean
-
-install: build
- dh_testdir
- dh_testroot
- dh_prep
- dh_installdirs
-
- # Add here commands to install the package into debian/tmp
- $(MAKE) $(JOBS) -C debian/build DESTDIR=$(TARGET) install
- chmod 755 $(TARGET)/usr/share/dicomscope/tcl/*
-
-# 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
- dh_testdir
- dh_testroot
- dh_installchangelogs
- dh_installdocs
- dh_installexamples
- dh_install ## --sourcedir=$(TARGET) --fail-missing
- dh_installman debian/dicomscope.1
- dh_lintian
- dh_link
- dh_strip
- dh_compress --exclude=.pdf
- dh_fixperms
- dh_makeshlibs
- dh_shlibdeps # -LlibjInterface -l/usr/lib
- dh_installdeb
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
$(UPSTREAM_SRC).zip:
- #uscan --force-download --verbose --repack
wget -c ftp://dicom.offis.de/pub/dicom/offis/software/dscope/dscope$(VER_FULL_UPSTREAM)/$@
- # ftp://dicom.offis.de/pub/dicom/offis/software/dscope/dscope360/dsgui360.zip
get-orig-source: $(UPSTREAM_SRC).zip
rm -rf $(DEBIAN_SRC_DIR)
@@ -149,6 +66,3 @@
GZIP="--best --no-name" tar czf $(DEBIAN_SRC_TAR) $(DEBIAN_SRC_DIR)
rm -rf $(DEBIAN_SRC_DIR)
rm $(UPSTREAM_SRC).zip
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
More information about the debian-med-commit
mailing list