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

[Mathieu Malaterre]

Author: malat-guest
Date: 2011-12-17 09:04:57 +0000 (Sat, 17 Dec 2011)
New Revision: 9011

Modified:
   trunk/packages/openslide/trunk/debian/changelog
   trunk/packages/openslide/trunk/debian/get-orig-source
   trunk/packages/openslide/trunk/debian/patches/openslide_soname.patch
   trunk/packages/openslide/trunk/debian/patches/remove_calgrind.patch
   trunk/packages/openslide/trunk/debian/patches/series
   trunk/packages/openslide/trunk/debian/rules
Log:
Start new upstream

Modified: trunk/packages/openslide/trunk/debian/changelog
===================================================================
--- trunk/packages/openslide/trunk/debian/changelog	2011-12-16 23:14:54 UTC (rev 9010)
+++ trunk/packages/openslide/trunk/debian/changelog	2011-12-17 09:04:57 UTC (rev 9011)
@@ -1,3 +1,9 @@
+openslide (3.2.5-1) UNRELEASED; urgency=low
+
+  * New upstream
+
+ -- Mathieu Malaterre <mathieu.malaterre at gmail.com>  Sat, 17 Dec 2011 09:56:13 +0100
+
 openslide (3.2.4-2) unstable; urgency=low
 
   * Fix Vcs-Browser URL

Modified: trunk/packages/openslide/trunk/debian/get-orig-source
===================================================================
--- trunk/packages/openslide/trunk/debian/get-orig-source	2011-12-16 23:14:54 UTC (rev 9010)
+++ trunk/packages/openslide/trunk/debian/get-orig-source	2011-12-17 09:04:57 UTC (rev 9011)
@@ -1,24 +1,13 @@
 #!/bin/sh
 set -ex
 
-# TODO prefer xz compression:
-# http://github.com/downloads/openslide/openslide/openslide-3.2.4.tar.xz
-# http://github.com/downloads/openslide/openslide/openslide-3.2.4.tar.gz
-
 PACKAGE=openslide
 
 VERSION=`dpkg-parsechangelog | sed -n -e 's/^Version: \(.*\)-[^-]*$/\1/p'`
 
-TARFILE=${PACKAGE}_${VERSION}.orig.tar.gz
+TARFILE=${PACKAGE}_${VERSION}.orig.tar.xz
 
 FOLDER=${PACKAGE}-${VERSION}
 
-wget -c http://github.com/downloads/openslide/openslide/$PACKAGE-$VERSION.tar.gz
-tar xfz $PACKAGE-$VERSION.tar.gz
-
-# remove BSD file, needed for windows anyway
-rm $FOLDER/src/callgrind.h
-rm $FOLDER/src/valgrind.h
-
-GZIP="--best --no-name" tar cfz $TARFILE $FOLDER
-rm -rf $FOLDER
+wget -c http://github.com/downloads/openslide/openslide/$PACKAGE-$VERSION.tar.xz
+ln -s $PACKAGE-$VERSION.tar.xz $TARFILE

Modified: trunk/packages/openslide/trunk/debian/patches/openslide_soname.patch
===================================================================
--- trunk/packages/openslide/trunk/debian/patches/openslide_soname.patch	2011-12-16 23:14:54 UTC (rev 9010)
+++ trunk/packages/openslide/trunk/debian/patches/openslide_soname.patch	2011-12-17 09:04:57 UTC (rev 9011)
@@ -1,7 +1,7 @@
-Index: openslide-3.2.4/src/CMakeLists.txt
+Index: openslide-3.2.5/src/CMakeLists.txt
 ===================================================================
---- openslide-3.2.4.orig/src/CMakeLists.txt	2010-09-10 12:26:14.000000000 +0200
-+++ openslide-3.2.4/src/CMakeLists.txt	2011-09-02 08:59:58.000000000 +0200
+--- 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
@@ -10,13 +10,13 @@
  
  # configure OpenSlide installation
  install(TARGETS openslide
-Index: openslide-3.2.4/CMakeLists.txt
+Index: openslide-3.2.5/CMakeLists.txt
 ===================================================================
---- openslide-3.2.4.orig/CMakeLists.txt	2011-03-08 05:28:22.000000000 +0100
-+++ openslide-3.2.4/CMakeLists.txt	2011-09-02 08:59:58.000000000 +0200
-@@ -27,6 +27,13 @@
+--- 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 "4")
+ 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}")

Modified: trunk/packages/openslide/trunk/debian/patches/remove_calgrind.patch
===================================================================
--- trunk/packages/openslide/trunk/debian/patches/remove_calgrind.patch	2011-12-16 23:14:54 UTC (rev 9010)
+++ trunk/packages/openslide/trunk/debian/patches/remove_calgrind.patch	2011-12-17 09:04:57 UTC (rev 9011)
@@ -1,7 +1,7 @@
-Index: openslide-3.2.4/test/test.c
+Index: openslide-3.2.5/test/test.c
 ===================================================================
---- openslide-3.2.4.orig/test/test.c	2011-09-02 09:51:49.000000000 +0200
-+++ openslide-3.2.4/test/test.c	2011-09-02 09:52:01.000000000 +0200
+--- openslide-3.2.5.orig/test/test.c	2011-12-17 00:50:10.000000000 +0100
++++ openslide-3.2.5/test/test.c	2011-12-17 09:56:49.000000000 +0100
 @@ -24,7 +24,6 @@
  #include "config.h"
  #include "openslide.h"
@@ -10,7 +10,7 @@
  
  #include <stdio.h>
  #include <stdlib.h>
-@@ -331,7 +330,6 @@
+@@ -425,7 +424,6 @@
      associated_image_names++;
    }
  
@@ -18,7 +18,7 @@
    /*
    // simulate horizonal scrolling?
    gettimeofday(&start_tv, NULL);
-@@ -375,7 +373,6 @@
+@@ -469,7 +467,6 @@
  
    //  test_pdf(osr, "test0.pdf");
  

Modified: trunk/packages/openslide/trunk/debian/patches/series
===================================================================
--- trunk/packages/openslide/trunk/debian/patches/series	2011-12-16 23:14:54 UTC (rev 9010)
+++ trunk/packages/openslide/trunk/debian/patches/series	2011-12-17 09:04:57 UTC (rev 9011)
@@ -1,4 +1,2 @@
 openslide_soname.patch
-removetest.patch
-remove_valgrind.patch
 remove_calgrind.patch

Modified: trunk/packages/openslide/trunk/debian/rules
===================================================================
--- trunk/packages/openslide/trunk/debian/rules	2011-12-16 23:14:54 UTC (rev 9010)
+++ trunk/packages/openslide/trunk/debian/rules	2011-12-17 09:04:57 UTC (rev 9011)
@@ -1,6 +1,4 @@
 #!/usr/bin/make -f
-
-# Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
 %: