[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a

Maximiliano Curia maxy at moszumanska.debian.org
Thu Jul 13 17:47:38 UTC 2017


Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=aa343cd

The following commit has been merged in the master branch:
commit aa343cda8653d2b8b8872032215daa7e066f095f
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Thu Jul 13 10:16:06 2017 +0200

    Drop patch: libtool_update.diff
    
    Obsoleted by autoreconf
---
 debian/patches/libtool_update.diff | 74 --------------------------------------
 debian/patches/series              |  1 -
 2 files changed, 75 deletions(-)

diff --git a/debian/patches/libtool_update.diff b/debian/patches/libtool_update.diff
deleted file mode 100644
index 55273b8..0000000
--- a/debian/patches/libtool_update.diff
+++ /dev/null
@@ -1,74 +0,0 @@
-Index: exiv2/config/aclocal.m4
-===================================================================
---- exiv2.orig/config/aclocal.m4	2015-08-05 11:15:38.030639532 +0200
-+++ exiv2/config/aclocal.m4	2015-08-05 11:15:37.998640781 +0200
-@@ -1267,7 +1267,7 @@
-   rm -rf conftest*
-   ;;
- 
--x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
-+x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \
- s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
-   # Find out which ABI we are using.
-   echo 'int i;' > conftest.$ac_ext
-@@ -1281,7 +1281,10 @@
- 	  x86_64-*linux*)
- 	    LD="${LD-ld} -m elf_i386"
- 	    ;;
--	  ppc64-*linux*|powerpc64-*linux*)
-+	  powerpc64le-*)
-+	    LD="${LD-ld} -m elf32lppclinux"
-+	    ;;
-+	  powerpc64-*)
- 	    LD="${LD-ld} -m elf32ppclinux"
- 	    ;;
- 	  s390x-*linux*)
-@@ -1300,7 +1303,10 @@
- 	  x86_64-*linux*)
- 	    LD="${LD-ld} -m elf_x86_64"
- 	    ;;
--	  ppc*-*linux*|powerpc*-*linux*)
-+	  powerpcle-*)
-+	    LD="${LD-ld} -m elf64lppc"
-+	    ;;
-+	  powerpc-*)
- 	    LD="${LD-ld} -m elf64ppc"
- 	    ;;
- 	  s390*-*linux*|s390*-*tpf*)
-Index: exiv2/configure
-===================================================================
---- exiv2.orig/configure	2015-08-05 11:15:38.030639532 +0200
-+++ exiv2/configure	2015-08-05 11:15:38.002640625 +0200
-@@ -7696,7 +7696,7 @@
-   rm -rf conftest*
-   ;;
- 
--x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
-+x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \
- s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
-   # Find out which ABI we are using.
-   echo 'int i;' > conftest.$ac_ext
-@@ -7714,7 +7714,10 @@
- 	  x86_64-*linux*)
- 	    LD="${LD-ld} -m elf_i386"
- 	    ;;
--	  ppc64-*linux*|powerpc64-*linux*)
-+	  powerpc64le-*)
-+	    LD="${LD-ld} -m elf32lppclinux"
-+	    ;;
-+	  powerpc64-*)
- 	    LD="${LD-ld} -m elf32ppclinux"
- 	    ;;
- 	  s390x-*linux*)
-@@ -7733,7 +7736,10 @@
- 	  x86_64-*linux*)
- 	    LD="${LD-ld} -m elf_x86_64"
- 	    ;;
--	  ppc*-*linux*|powerpc*-*linux*)
-+	  powerpcle-*)
-+	    LD="${LD-ld} -m elf64lppc"
-+	    ;;
-+	  powerpc-*)
- 	    LD="${LD-ld} -m elf64ppc"
- 	    ;;
- 	  s390*-*linux*|s390*-*tpf*)
diff --git a/debian/patches/series b/debian/patches/series
index b7f3a5c..4746860 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
-libtool_update.diff
 upstream-fix-casio-crash
 CVE-2017-9239.patch

-- 
exiv2 packaging



More information about the pkg-kde-commits mailing list