Author: malat Date: 2012-10-15 13:19:24 +0000 (Mon, 15 Oct 2012) New Revision: 12426
Removed: trunk/packages/openslide/trunk/debian/get-orig-source trunk/packages/openslide/trunk/debian/patches/remove_calgrind.patch trunk/packages/openslide/trunk/debian/patches/remove_valgrind.patch Modified: trunk/packages/openslide/trunk/debian/changelog trunk/packages/openslide/trunk/debian/patches/series trunk/packages/openslide/trunk/debian/rules trunk/packages/openslide/trunk/debian/watch Log: Prepare for next upload Modified: trunk/packages/openslide/trunk/debian/changelog =================================================================== --- trunk/packages/openslide/trunk/debian/changelog 2012-10-15 13:02:16 UTC (rev 12425) +++ trunk/packages/openslide/trunk/debian/changelog 2012-10-15 13:19:24 UTC (rev 12426) @@ -1,3 +1,13 @@ +openslide (3.3.1-1) UNRELEASED; urgency=low + + * New upstream + * Update man page + * remove patches applied upstream: + - debian/patches/remove_valgrind.patch + - debian/patches/remove_calgrind.patch + + -- Mathieu Malaterre <ma...@debian.org> Mon, 15 Oct 2012 15:10:29 +0200 + openslide (3.2.6-2) unstable; urgency=low * Rebuild against libtiff5 Deleted: trunk/packages/openslide/trunk/debian/get-orig-source =================================================================== --- trunk/packages/openslide/trunk/debian/get-orig-source 2012-10-15 13:02:16 UTC (rev 12425) +++ trunk/packages/openslide/trunk/debian/get-orig-source 2012-10-15 13:19:24 UTC (rev 12426) @@ -1,13 +0,0 @@ -#!/bin/sh -set -ex - -PACKAGE=openslide - -VERSION=`dpkg-parsechangelog | sed -n -e 's/^Version: \(.*\)-[^-]*$/\1/p'` - -TARFILE=${PACKAGE}_${VERSION}.orig.tar.xz - -FOLDER=${PACKAGE}-${VERSION} - -wget -c http://github.com/downloads/openslide/openslide/$PACKAGE-$VERSION.tar.xz -ln -s $PACKAGE-$VERSION.tar.xz $TARFILE Deleted: trunk/packages/openslide/trunk/debian/patches/remove_calgrind.patch =================================================================== --- trunk/packages/openslide/trunk/debian/patches/remove_calgrind.patch 2012-10-15 13:02:16 UTC (rev 12425) +++ trunk/packages/openslide/trunk/debian/patches/remove_calgrind.patch 2012-10-15 13:19:24 UTC (rev 12426) @@ -1,28 +0,0 @@ -Index: openslide-3.2.5/test/test.c -=================================================================== ---- 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" - --#include "callgrind.h" - - #include <stdio.h> - #include <stdlib.h> -@@ -425,7 +424,6 @@ - associated_image_names++; - } - -- CALLGRIND_START_INSTRUMENTATION - /* - // simulate horizonal scrolling? - gettimeofday(&start_tv, NULL); -@@ -469,7 +467,6 @@ - - // test_pdf(osr, "test0.pdf"); - -- CALLGRIND_STOP_INSTRUMENTATION - - openslide_close(osr); - Deleted: trunk/packages/openslide/trunk/debian/patches/remove_valgrind.patch =================================================================== --- trunk/packages/openslide/trunk/debian/patches/remove_valgrind.patch 2012-10-15 13:02:16 UTC (rev 12425) +++ trunk/packages/openslide/trunk/debian/patches/remove_valgrind.patch 2012-10-15 13:19:24 UTC (rev 12426) @@ -1,26 +0,0 @@ -Index: openslide-3.2.6/Makefile.am -=================================================================== ---- openslide-3.2.6.orig/Makefile.am 2012-02-23 20:11:20.000000000 +0100 -+++ openslide-3.2.6/Makefile.am 2012-02-26 21:55:33.000000000 +0100 -@@ -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 src/openslide-tiffdump.h -+noinst_HEADERS = src/openslide-private.h src/openslide-cache.h src/openslide-tilehelper.h src/openslide-hash.h src/openslide-cairo.h src/openslide-tiffdump.h - - - -Index: openslide-3.2.6/Makefile.in -=================================================================== ---- openslide-3.2.6.orig/Makefile.in 2012-02-23 20:28:47.000000000 +0100 -+++ openslide-3.2.6/Makefile.in 2012-02-26 21:55:33.000000000 +0100 -@@ -348,7 +348,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:6: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 src/openslide-tiffdump.h -+noinst_HEADERS = src/openslide-private.h src/openslide-cache.h src/openslide-tilehelper.h src/openslide-hash.h src/openslide-cairo.h src/openslide-tiffdump.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 2012-10-15 13:02:16 UTC (rev 12425) +++ trunk/packages/openslide/trunk/debian/patches/series 2012-10-15 13:19:24 UTC (rev 12426) @@ -1,2 +0,0 @@ -remove_calgrind.patch -remove_valgrind.patch Modified: trunk/packages/openslide/trunk/debian/rules =================================================================== --- trunk/packages/openslide/trunk/debian/rules 2012-10-15 13:02:16 UTC (rev 12425) +++ trunk/packages/openslide/trunk/debian/rules 2012-10-15 13:19:24 UTC (rev 12426) @@ -4,13 +4,8 @@ %: dh $@ --parallel -override_dh_clean: - rm -f src/callgrind.h - rm -f src/valgrind.h - dh_clean - get-orig-source: - ./debian/get-orig-source + uscan --verbose --force-download --rename VER_FULL = $(shell dpkg-parsechangelog | grep '^Version' | cut -d' ' -f2 | cut -f1 -d-) Modified: trunk/packages/openslide/trunk/debian/watch =================================================================== --- trunk/packages/openslide/trunk/debian/watch 2012-10-15 13:02:16 UTC (rev 12425) +++ trunk/packages/openslide/trunk/debian/watch 2012-10-15 13:19:24 UTC (rev 12426) @@ -1,2 +1,3 @@ version=3 -http://githubredir.debian.net/github/openslide/openslide/ v(.*).tar.gz +http://openslide.org/download \ +.*/openslide-([\d\.]+)\.tar\.xz _______________________________________________ debian-med-commit mailing list debian-med-commit@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit