[med-svn] r7616 - in trunk/packages/openslide/trunk/debian: . patches

[Mathieu Malaterre]

Author: malat-guest
Date: 2011-09-02 07:47:36 +0000 (Fri, 02 Sep 2011)
New Revision: 7616

Added:
   trunk/packages/openslide/trunk/debian/patches/remove_valgrind.patch
Modified:
   trunk/packages/openslide/trunk/debian/get-orig-source
   trunk/packages/openslide/trunk/debian/patches/series
   trunk/packages/openslide/trunk/debian/rules
Log:
move from cmake back to autotools

Modified: trunk/packages/openslide/trunk/debian/get-orig-source
===================================================================
--- trunk/packages/openslide/trunk/debian/get-orig-source	2011-09-02 07:32:28 UTC (rev 7615)
+++ trunk/packages/openslide/trunk/debian/get-orig-source	2011-09-02 07:47:36 UTC (rev 7616)
@@ -16,8 +16,6 @@
 wget -c http://github.com/downloads/openslide/openslide/$PACKAGE-$VERSION.tar.gz
 tar xfz $PACKAGE-$VERSION.tar.gz
 
-# remove a GPL file:
-rm $FOLDER/ltmain.sh
 # remove BSD file, needed for windows anyway
 rm $FOLDER/src/callgrind.h
 rm $FOLDER/src/valgrind.h

Added: trunk/packages/openslide/trunk/debian/patches/remove_valgrind.patch
===================================================================
--- trunk/packages/openslide/trunk/debian/patches/remove_valgrind.patch	                        (rev 0)
+++ trunk/packages/openslide/trunk/debian/patches/remove_valgrind.patch	2011-09-02 07:47:36 UTC (rev 7616)
@@ -0,0 +1,26 @@
+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

Modified: trunk/packages/openslide/trunk/debian/patches/series
===================================================================
--- trunk/packages/openslide/trunk/debian/patches/series	2011-09-02 07:32:28 UTC (rev 7615)
+++ trunk/packages/openslide/trunk/debian/patches/series	2011-09-02 07:47:36 UTC (rev 7616)
@@ -1,2 +1,3 @@
 openslide_soname.patch
 removetest.patch
+remove_valgrind.patch

Modified: trunk/packages/openslide/trunk/debian/rules
===================================================================
--- trunk/packages/openslide/trunk/debian/rules	2011-09-02 07:32:28 UTC (rev 7615)
+++ trunk/packages/openslide/trunk/debian/rules	2011-09-02 07:47:36 UTC (rev 7616)
@@ -4,7 +4,7 @@
 #export DH_VERBOSE=1
 
 %:
-	dh --parallel --with quilt --buildsystem=cmake $@ 
+	dh --parallel --with quilt $@ 
 
 get-orig-source:
 	./debian/get-orig-source