[med-svn] r9012 - trunk/packages/openslide/trunk/debian/patches

[Mathieu Malaterre]

Author: malat-guest
Date: 2011-12-17 09:09:10 +0000 (Sat, 17 Dec 2011)
New Revision: 9012

Removed:
   trunk/packages/openslide/trunk/debian/patches/openslide_soname.patch
   trunk/packages/openslide/trunk/debian/patches/remove_valgrind.patch
   trunk/packages/openslide/trunk/debian/patches/removetest.patch
Modified:
   trunk/packages/openslide/trunk/debian/patches/series
Log:
cleanup patches

Deleted: trunk/packages/openslide/trunk/debian/patches/openslide_soname.patch
===================================================================
--- trunk/packages/openslide/trunk/debian/patches/openslide_soname.patch	2011-12-17 09:04:57 UTC (rev 9011)
+++ trunk/packages/openslide/trunk/debian/patches/openslide_soname.patch	2011-12-17 09:09:10 UTC (rev 9012)
@@ -1,30 +0,0 @@
-Index: openslide-3.2.5/src/CMakeLists.txt
-===================================================================
---- openslide-3.2.5.orig/src/CMakeLists.txt	2011-12-11 01:47:48.000000000 +0100
-+++ openslide-3.2.5/src/CMakeLists.txt	2011-12-17 09:56:31.000000000 +0100
-@@ -77,6 +77,7 @@
- 
- # finally create the project
- add_library(openslide SHARED ${library_files})
-+set_target_properties(openslide PROPERTIES ${OPENSLIDE_LIBRARY_PROPERTIES})
- 
- # configure OpenSlide installation
- install(TARGETS openslide
-Index: openslide-3.2.5/CMakeLists.txt
-===================================================================
---- openslide-3.2.5.orig/CMakeLists.txt	2011-12-17 02:10:44.000000000 +0100
-+++ openslide-3.2.5/CMakeLists.txt	2011-12-17 09:56:31.000000000 +0100
-@@ -39,6 +39,13 @@
- set(OPENSLIDE_MAJOR_VERSION "2")
- set(OPENSLIDE_MINOR_VERSION "5")
- set(OPENSLIDE_VERSION_NUMBER ${OPENSLIDE_WORLD_VERSION}.${OPENSLIDE_MAJOR_VERSION}.${OPENSLIDE_MINOR_VERSION})
-+set(OPENSLIDE_API_VERSION
-+  "${OPENSLIDE_WORLD_VERSION}.${OPENSLIDE_MAJOR_VERSION}")
-+set(OPENSLIDE_LIBRARY_PROPERTIES ${OPENSLIDE_LIBRARY_PROPERTIES}
-+  VERSION "${OPENSLIDE_VERSION_NUMBER}"
-+  SOVERSION "${OPENSLIDE_API_VERSION}"
-+)
-+
- 
- # create a config.h header-file
- configure_file(${PROJECT_SOURCE_DIR}/config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h)

Deleted: trunk/packages/openslide/trunk/debian/patches/remove_valgrind.patch
===================================================================
--- trunk/packages/openslide/trunk/debian/patches/remove_valgrind.patch	2011-12-17 09:04:57 UTC (rev 9011)
+++ trunk/packages/openslide/trunk/debian/patches/remove_valgrind.patch	2011-12-17 09:09:10 UTC (rev 9012)
@@ -1,26 +0,0 @@
-Index: openslide-3.2.4/Makefile.am
-===================================================================
---- openslide-3.2.4.orig/Makefile.am	2011-09-02 09:46:35.000000000 +0200
-+++ openslide-3.2.4/Makefile.am	2011-09-02 09:46:40.000000000 +0200
-@@ -48,7 +48,7 @@
- 
- pkginclude_HEADERS = src/openslide.h src/openslide-features.h
- 
--noinst_HEADERS = src/openslide-private.h src/openslide-cache.h src/openslide-tilehelper.h src/openslide-hash.h src/valgrind.h src/callgrind.h src/openslide-cairo.h
-+noinst_HEADERS = src/openslide-private.h src/openslide-cache.h src/openslide-tilehelper.h src/openslide-hash.h src/openslide-cairo.h
- 
- 
- 
-Index: openslide-3.2.4/Makefile.in
-===================================================================
---- openslide-3.2.4.orig/Makefile.in	2011-09-02 09:46:43.000000000 +0200
-+++ openslide-3.2.4/Makefile.in	2011-09-02 09:46:50.000000000 +0200
-@@ -341,7 +341,7 @@
- src_libopenslide_la_CPPFLAGS = -pedantic -D_OPENSLIDE_BUILDING_DLL $(GLIB2_CFLAGS) $(CAIRO_CFLAGS) -DG_LOG_DOMAIN=\"Openslide\" -I$(top_srcdir)/src
- src_libopenslide_la_LDFLAGS = -version-info 2:4:2 -no-undefined -Wl,$(WIN32_DLL_TRICKERY)
- pkginclude_HEADERS = src/openslide.h src/openslide-features.h
--noinst_HEADERS = src/openslide-private.h src/openslide-cache.h src/openslide-tilehelper.h src/openslide-hash.h src/valgrind.h src/callgrind.h src/openslide-cairo.h
-+noinst_HEADERS = src/openslide-private.h src/openslide-cache.h src/openslide-tilehelper.h src/openslide-hash.h src/openslide-cairo.h
- test_test_CPPFLAGS = $(GLIB2_CFLAGS) $(CAIRO_CFLAGS) -I$(top_srcdir)/src
- test_test_LDADD = src/libopenslide.la $(GLIB2_LIBS) $(CAIRO_LIBS)
- tools_openslide_show_properties_CPPFLAGS = -I$(top_srcdir)/src

Deleted: trunk/packages/openslide/trunk/debian/patches/removetest.patch
===================================================================
--- trunk/packages/openslide/trunk/debian/patches/removetest.patch	2011-12-17 09:04:57 UTC (rev 9011)
+++ trunk/packages/openslide/trunk/debian/patches/removetest.patch	2011-12-17 09:09:10 UTC (rev 9012)
@@ -1,17 +0,0 @@
-There is a source code for test, but it requires a valid input file which in
-the case of virtual slides are very difficult to share !
-
-Furthermore the test use callgrind.h for benchmarking. What this means is that
-if I wanted to compile this test, I would need to B-D on valgrind which is not
-available on all arch supported by debian. Instead remove the test and make
-this library available on all paltforms supported by debian
-Index: openslide-3.2.4/CMakeLists.txt
-===================================================================
---- openslide-3.2.4.orig/CMakeLists.txt	2011-09-02 08:59:58.000000000 +0200
-+++ openslide-3.2.4/CMakeLists.txt	2011-09-02 09:00:02.000000000 +0200
-@@ -42,4 +42,4 @@
- include_directories(${CMAKE_CURRENT_BINARY_DIR} src)
- 
- add_subdirectory(src)
--add_subdirectory(test)
-+#add_subdirectory(test)

Modified: trunk/packages/openslide/trunk/debian/patches/series
===================================================================
--- trunk/packages/openslide/trunk/debian/patches/series	2011-12-17 09:04:57 UTC (rev 9011)
+++ trunk/packages/openslide/trunk/debian/patches/series	2011-12-17 09:09:10 UTC (rev 9012)
@@ -1,2 +1 @@
-openslide_soname.patch
 remove_calgrind.patch