Author: smr Date: 2013-02-09 20:07:22 +0000 (Sat, 09 Feb 2013) New Revision: 12972
Removed: trunk/packages/mriconvert/trunk/debian/README.source trunk/packages/mriconvert/trunk/debian/get-orig-source trunk/packages/mriconvert/trunk/debian/patches/findwxwidgets.patch trunk/packages/mriconvert/trunk/debian/patches/wxwidgets-initializer.patch Modified: trunk/packages/mriconvert/trunk/debian/changelog trunk/packages/mriconvert/trunk/debian/control trunk/packages/mriconvert/trunk/debian/patches/series trunk/packages/mriconvert/trunk/debian/rules Log: Updates for version 2.0.250. Deleted: trunk/packages/mriconvert/trunk/debian/README.source =================================================================== --- trunk/packages/mriconvert/trunk/debian/README.source 2013-02-09 12:03:47 UTC (rev 12971) +++ trunk/packages/mriconvert/trunk/debian/README.source 2013-02-09 20:07:22 UTC (rev 12972) @@ -1,12 +0,0 @@ -The source tree was obtained from http://lcni.uoregon.edu/~jolinda/MRIConvert/ -Two files were removed before creating the .orig.tar.gz: - - CMakeCache.txt - Makefile - -These files are both generated as part of the configure process. - -This package uses quilt. -See /usr/share/doc/quilt/README.source. - - -- Steve M. Robbins <[email protected]>, Sun, 31 Oct 2010 22:16:59 -0500 Modified: trunk/packages/mriconvert/trunk/debian/changelog =================================================================== --- trunk/packages/mriconvert/trunk/debian/changelog 2013-02-09 12:03:47 UTC (rev 12971) +++ trunk/packages/mriconvert/trunk/debian/changelog 2013-02-09 20:07:22 UTC (rev 12972) @@ -1,3 +1,13 @@ +mriconvert (2.0.250-1) unstable; urgency=low + + * New upstream. + * control: Update build-depends (add libboost-program-options-dev). + * patches/findwxwidgets.patch: Remove. + * patches/wxwidgets-initializer.patch: Remove. + * Upstream fixed source package issues; remove get-orig-source script. + + -- Steve M. Robbins <[email protected]> Thu, 07 Feb 2013 21:29:55 -0600 + mriconvert (2.0.235+dfsg-1) UNRELEASED; urgency=low [ Dmitry Smirnov ] Modified: trunk/packages/mriconvert/trunk/debian/control =================================================================== --- trunk/packages/mriconvert/trunk/debian/control 2013-02-09 12:03:47 UTC (rev 12971) +++ trunk/packages/mriconvert/trunk/debian/control 2013-02-09 20:07:22 UTC (rev 12972) @@ -4,8 +4,8 @@ Priority: optional Maintainer: Debian Med Packaging Team <[email protected]> Uploaders: Steve M. Robbins <[email protected]> -Build-Depends: debhelper (>= 9), help2man, cmake, cableswig, - libinsighttoolkit3-dev, libwxgtk2.8-dev +Build-Depends: debhelper (>= 9), help2man, cmake, cableswig, libboost-program-options-dev, + libinsighttoolkit4-dev, libwxgtk2.8-dev Standards-Version: 3.9.2 Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/mriconvert/trunk/ Vcs-Svn: svn://svn.debian.org/debian-med/trunk/packages/mriconvert/trunk/ Deleted: trunk/packages/mriconvert/trunk/debian/get-orig-source =================================================================== --- trunk/packages/mriconvert/trunk/debian/get-orig-source 2013-02-09 12:03:47 UTC (rev 12971) +++ trunk/packages/mriconvert/trunk/debian/get-orig-source 2013-02-09 20:07:22 UTC (rev 12972) @@ -1,18 +0,0 @@ -#!/bin/sh - -SRCFILE=mriconvert_sources.zip - -VERSION=2.0.235 -OUTDIR="mriconvert-${VERSION}" - -rm -f ${SRCFILE} -wget -c http://lcni.uoregon.edu/~jolinda/MRIConvert/${SRCFILE} -mkdir $OUTDIR -unzip ${SRCFILE} -d $OUTDIR - -( cd $OUTDIR -rm -f Makefile CMakeCache.txt -) - -GZIP="--best --no-name" tar cfz mriconvert_"$VERSION".orig.tar.gz $OUTDIR -rm -rf $OUTDIR Deleted: trunk/packages/mriconvert/trunk/debian/patches/findwxwidgets.patch =================================================================== --- trunk/packages/mriconvert/trunk/debian/patches/findwxwidgets.patch 2013-02-09 12:03:47 UTC (rev 12971) +++ trunk/packages/mriconvert/trunk/debian/patches/findwxwidgets.patch 2013-02-09 20:07:22 UTC (rev 12972) @@ -1,34 +0,0 @@ -Description: work around broken FindwxWidgets macro - The CMake FindwxWidgets.cmake module shipped with CMake 2.8 - is broken. One of its functions is to set wxWidgets_CXX_FLAGS - based on the output of "wx-config --cxxflags". However, it now - mutates the output, turning "-Dfoo" into "foo", which causes - a compile error. - . - Upstream is aware for a year, but no response; see - http://www.cmake.org/pipermail/cmake/2010-October/040128.html -Author: [email protected] - - ---- mriconvert-2.0.orig/CMakeLists.txt -+++ mriconvert-2.0/CMakeLists.txt -@@ -36,10 +36,16 @@ - SET(EXECUTABLE_OUTPUT_PATH "release") - - INCLUDE (FindwxWidgets) -- -- SET(CMAKE_CXX_FLAGS " -DWX_PRECOMP ${CMAKE_CXX_FLAGS}${wxWidgets_CXX_FLAGS}") - -- ADD_DEFINITIONS( ${wxWidgets_DEFINITIONS} ${PROJECT_DEFINITIONS} ) -+# run the wx-config program to get cxxflags -+ EXECUTE_PROCESS( -+ COMMAND sh "${wxWidgets_CONFIG_EXECUTABLE}" -+ ${wxWidgets_SELECT_OPTIONS} --cxxflags -+ OUTPUT_VARIABLE wxWidgets_CXX_FLAGS -+ OUTPUT_STRIP_TRAILING_WHITESPACE -+) -+ -+ SET(CMAKE_CXX_FLAGS " -DWX_PRECOMP ${CMAKE_CXX_FLAGS}${wxWidgets_CXX_FLAGS}") - - INCLUDE_DIRECTORIES(${wxWidgets_INCLUDE_DIRS}) - LINK_DIRECTORIES( ${wxWidgets_LIBRARY_DIRS} ) Modified: trunk/packages/mriconvert/trunk/debian/patches/series =================================================================== --- trunk/packages/mriconvert/trunk/debian/patches/series 2013-02-09 12:03:47 UTC (rev 12971) +++ trunk/packages/mriconvert/trunk/debian/patches/series 2013-02-09 20:07:22 UTC (rev 12972) @@ -1,2 +1 @@ -findwxwidgets.patch -wxwidgets-initializer.patch + Deleted: trunk/packages/mriconvert/trunk/debian/patches/wxwidgets-initializer.patch =================================================================== --- trunk/packages/mriconvert/trunk/debian/patches/wxwidgets-initializer.patch 2013-02-09 12:03:47 UTC (rev 12971) +++ trunk/packages/mriconvert/trunk/debian/patches/wxwidgets-initializer.patch 2013-02-09 20:07:22 UTC (rev 12972) @@ -1,18 +0,0 @@ -Description: Fix segfault - Pass argc, argv to wxInitializer constructor (thanks, Olly Betts). -Author: Steve Robbins <[email protected]> -Bug: 646654 -Forwarded: yes - - ---- mriconvert-2.0.217.orig/McVerter.cpp -+++ mriconvert-2.0.217/McVerter.cpp -@@ -26,7 +26,7 @@ - int main(int argc, char** argv) - { - // First make sure we can use wx stuff. -- wxInitializer initializer; -+ wxInitializer initializer(argc, argv); - if ( !initializer ) - { - cerr << "Failed to initialize the wxWidgets library, aborting."; Modified: trunk/packages/mriconvert/trunk/debian/rules =================================================================== --- trunk/packages/mriconvert/trunk/debian/rules 2013-02-09 12:03:47 UTC (rev 12971) +++ trunk/packages/mriconvert/trunk/debian/rules 2013-02-09 20:07:22 UTC (rev 12972) @@ -3,7 +3,6 @@ DPKG_EXPORT_BUILDFLAGS = 1 -include /usr/share/dpkg/buildflags.mk -#VERSION = 2.0.235 VERSION := $(shell dpkg-parsechangelog | grep Version | cut -d\ -f2 | cut -d- -f1) %: @@ -15,6 +14,3 @@ override_dh_installman: help2man -n 'non-interactive MRI conversion software' --version-string $(VERSION) --no-discard-stderr */release/mcverter > mcverter.1 dh_installman mcverter.1 debian/MRIConvert.1 - -get-orig-source: - ./debian/get-orig-source _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
