diff -Nru libffi-3.0.10/debian/changelog libffi5-3.0.10/debian/changelog --- libffi-3.0.10/debian/changelog 2014-01-28 02:56:58.000000000 +0000 +++ libffi5-3.0.10/debian/changelog 2014-01-28 02:56:58.000000000 +0000 @@ -1,3 +1,9 @@ +libffi5 (3.0.10-3+rpi1) jessie-staging; urgency=low + + * Rename source and dev packages to allow coexistance with new libffi. + + -- Peter Michael Green Thu, 13 Jun 2013 20:29:35 +0000 + libffi (3.0.10-3) unstable; urgency=low * Fix powerpc and ppc64 builds (Kyle Moffett). diff -Nru libffi-3.0.10/debian/control libffi5-3.0.10/debian/control --- libffi-3.0.10/debian/control 2014-01-28 02:56:58.000000000 +0000 +++ libffi5-3.0.10/debian/control 2014-01-28 02:56:58.000000000 +0000 @@ -1,4 +1,4 @@ -Source: libffi +Source: libffi5 Priority: optional Maintainer: Debian GCC Maintainers Uploaders: Matthias Klose @@ -7,12 +7,12 @@ Standards-Version: 3.9.2 Section: libs -Package: libffi-dev +Package: libffi5-dev Section: libdevel Architecture: any Multi-Arch: same Depends: libffi5 (= ${binary:Version}), dpkg (>= 1.15.4) | install-info, ${misc:Depends} -Conflicts: libffi4-dev +Conflicts: libffi4-dev, libffi-dev Description: Foreign Function Interface library (development files) This package contains the headers and static library files necessary for building programs which use libffi. @@ -21,12 +21,12 @@ allows code written in one language to call code written in another language. -Package: lib32ffi-dev +Package: lib32ffi5-dev Priority: extra Section: libdevel Architecture: amd64 ppc64 kfreebsd-amd64 Depends: libffi-dev (= ${binary:Version}), lib32ffi5 (= ${binary:Version}), ${misc:Depends} -Conflicts: libc6-i386 (<= 2.9-18) +Conflicts: libc6-i386 (<= 2.9-18), lib32ffi-dev Description: Foreign Function Interface library (development files, 32bit) This package contains the headers and static library files necessary for building programs which use libffi. @@ -35,11 +35,12 @@ allows code written in one language to call code written in another language. -Package: lib64ffi-dev +Package: lib64ffi5-dev Priority: extra Section: libdevel Architecture: i386 mips mipsel powerpc sparc s390 Depends: libffi-dev (= ${binary:Version}), lib64ffi5 (= ${binary:Version}), ${misc:Depends} +Conflicts: lib64ffi-dev Description: Foreign Function Interface library (development files, 64bit) This package contains the headers and static library files necessary for building programs which use libffi. @@ -48,11 +49,12 @@ allows code written in one language to call code written in another language. -Package: libn32ffi-dev +Package: libn32ffi5-dev Priority: extra Section: libdevel Architecture: mips mipsel Depends: libffi-dev (= ${binary:Version}), libn32ffi5 (= ${binary:Version}), ${misc:Depends} +Conflicts: libn32ffi5-dev Description: Foreign Function Interface library (development files, n32) This package contains the headers and static library files necessary for building programs which use libffi. diff -Nru libffi-3.0.10/debian/lib32ffi5-dev.install libffi5-3.0.10/debian/lib32ffi5-dev.install --- libffi-3.0.10/debian/lib32ffi5-dev.install 1970-01-01 00:00:00.000000000 +0000 +++ libffi5-3.0.10/debian/lib32ffi5-dev.install 2014-01-28 02:56:58.000000000 +0000 @@ -0,0 +1,3 @@ +usr/lib32/lib*.a +usr/lib32/lib*.so +usr/lib32/pkgconfig/* diff -Nru libffi-3.0.10/debian/lib32ffi-dev.install libffi5-3.0.10/debian/lib32ffi-dev.install --- libffi-3.0.10/debian/lib32ffi-dev.install 2014-01-28 02:56:58.000000000 +0000 +++ libffi5-3.0.10/debian/lib32ffi-dev.install 1970-01-01 00:00:00.000000000 +0000 @@ -1,3 +0,0 @@ -usr/lib32/lib*.a -usr/lib32/lib*.so -usr/lib32/pkgconfig/* diff -Nru libffi-3.0.10/debian/lib64ffi5-dev.install libffi5-3.0.10/debian/lib64ffi5-dev.install --- libffi-3.0.10/debian/lib64ffi5-dev.install 1970-01-01 00:00:00.000000000 +0000 +++ libffi5-3.0.10/debian/lib64ffi5-dev.install 2014-01-28 02:56:58.000000000 +0000 @@ -0,0 +1,3 @@ +usr/lib64/lib*.a +usr/lib64/lib*.so +usr/lib64/pkgconfig/* diff -Nru libffi-3.0.10/debian/lib64ffi-dev.install libffi5-3.0.10/debian/lib64ffi-dev.install --- libffi-3.0.10/debian/lib64ffi-dev.install 2014-01-28 02:56:58.000000000 +0000 +++ libffi5-3.0.10/debian/lib64ffi-dev.install 1970-01-01 00:00:00.000000000 +0000 @@ -1,3 +0,0 @@ -usr/lib64/lib*.a -usr/lib64/lib*.so -usr/lib64/pkgconfig/* diff -Nru libffi-3.0.10/debian/libffi5-dev.doc-base libffi5-3.0.10/debian/libffi5-dev.doc-base --- libffi-3.0.10/debian/libffi5-dev.doc-base 1970-01-01 00:00:00.000000000 +0000 +++ libffi5-3.0.10/debian/libffi5-dev.doc-base 2014-01-28 02:56:58.000000000 +0000 @@ -0,0 +1,18 @@ +Document: libffi +Title: libffi -- Portable foreign-function interface library +Abstract: The libffi library provides a portable, high level programming + interface to various calling conventions. This allows a programmer to + call any function specified by a call interface description at run + time. + . + FFI stands for Foreign Function Interface. A foreign function interface + is the popular name for the interface that allows code written in one + language to call code written in another language. The libffi library + really only provides the lowest, machine dependent layer of a fully featured + foreign function interface. A layer must exist above libffi that handles + type conversions for values passed between the two languages. +Section: Programming + +Format: HTML +Index: /usr/share/doc/libffi5/html/index.html +Files: /usr/share/doc/libffi5/html/*.html diff -Nru libffi-3.0.10/debian/libffi5-dev.install libffi5-3.0.10/debian/libffi5-dev.install --- libffi-3.0.10/debian/libffi5-dev.install 1970-01-01 00:00:00.000000000 +0000 +++ libffi5-3.0.10/debian/libffi5-dev.install 2014-01-28 02:56:58.000000000 +0000 @@ -0,0 +1,5 @@ +usr/include/* +usr/lib/*/lib*.a +usr/lib/*/lib*.so +usr/lib/*/pkgconfig/* +usr/share/* diff -Nru libffi-3.0.10/debian/libffi-dev.doc-base libffi5-3.0.10/debian/libffi-dev.doc-base --- libffi-3.0.10/debian/libffi-dev.doc-base 2014-01-28 02:56:58.000000000 +0000 +++ libffi5-3.0.10/debian/libffi-dev.doc-base 1970-01-01 00:00:00.000000000 +0000 @@ -1,18 +0,0 @@ -Document: libffi -Title: libffi -- Portable foreign-function interface library -Abstract: The libffi library provides a portable, high level programming - interface to various calling conventions. This allows a programmer to - call any function specified by a call interface description at run - time. - . - FFI stands for Foreign Function Interface. A foreign function interface - is the popular name for the interface that allows code written in one - language to call code written in another language. The libffi library - really only provides the lowest, machine dependent layer of a fully featured - foreign function interface. A layer must exist above libffi that handles - type conversions for values passed between the two languages. -Section: Programming - -Format: HTML -Index: /usr/share/doc/libffi5/html/index.html -Files: /usr/share/doc/libffi5/html/*.html diff -Nru libffi-3.0.10/debian/libffi-dev.install libffi5-3.0.10/debian/libffi-dev.install --- libffi-3.0.10/debian/libffi-dev.install 2014-01-28 02:56:58.000000000 +0000 +++ libffi5-3.0.10/debian/libffi-dev.install 1970-01-01 00:00:00.000000000 +0000 @@ -1,5 +0,0 @@ -usr/include/* -usr/lib/*/lib*.a -usr/lib/*/lib*.so -usr/lib/*/pkgconfig/* -usr/share/* diff -Nru libffi-3.0.10/debian/libn32ffi5-dev.install libffi5-3.0.10/debian/libn32ffi5-dev.install --- libffi-3.0.10/debian/libn32ffi5-dev.install 1970-01-01 00:00:00.000000000 +0000 +++ libffi5-3.0.10/debian/libn32ffi5-dev.install 2014-01-28 02:56:58.000000000 +0000 @@ -0,0 +1,3 @@ +usr/lib32/lib*.a +usr/lib32/lib*.so +usr/lib32/pkgconfig/* diff -Nru libffi-3.0.10/debian/libn32ffi-dev.install libffi5-3.0.10/debian/libn32ffi-dev.install --- libffi-3.0.10/debian/libn32ffi-dev.install 2014-01-28 02:56:58.000000000 +0000 +++ libffi5-3.0.10/debian/libn32ffi-dev.install 1970-01-01 00:00:00.000000000 +0000 @@ -1,3 +0,0 @@ -usr/lib32/lib*.a -usr/lib32/lib*.so -usr/lib32/pkgconfig/* diff -Nru libffi-3.0.10/debian/rules libffi5-3.0.10/debian/rules --- libffi-3.0.10/debian/rules 2014-01-28 02:56:58.000000000 +0000 +++ libffi5-3.0.10/debian/rules 2014-01-28 02:56:58.000000000 +0000 @@ -194,8 +194,8 @@ $(MAKE) -C build DESTDIR=$(CURDIR)/debian/tmp install cp -p build/.libs/libffi_convenience.a \ debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libffi_pic.a - mkdir -p debian/libffi-dev/usr/share/doc/$(p) - cp -a build/doc/libffi.html debian/libffi-dev/usr/share/doc/$(p)/html + mkdir -p debian/libffi5-dev/usr/share/doc/$(p) + cp -a build/doc/libffi.html debian/libffi5-dev/usr/share/doc/$(p)/html ifneq (,$(filter biarch32, $(multiarch))) $(MAKE) -C build32 DESTDIR=$(CURDIR)/debian/tmp install cp -p build32/.libs/libffi_convenience.a \ @@ -213,23 +213,23 @@ endif dh_install -s --sourcedir=debian/tmp - mkdir -p debian/libffi-dev/usr/include/$(DEB_HOST_MULTIARCH) - mv debian/libffi-dev/usr/include/*.h \ - debian/libffi-dev/usr/include/$(DEB_HOST_MULTIARCH)/ + mkdir -p debian/libffi5-dev/usr/include/$(DEB_HOST_MULTIARCH) + mv debian/libffi5-dev/usr/include/*.h \ + debian/libffi5-dev/usr/include/$(DEB_HOST_MULTIARCH)/ ifneq (,$(filter biarch32, $(multiarch))) - mkdir -p debian/lib32ffi-dev/usr/include/$(biarch_gnu_type) - mv debian/libffi-dev/usr/include/$(biarch_gnu_type) \ - debian/lib32ffi-dev/usr/include/ + mkdir -p debian/lib32ffi5-dev/usr/include/$(biarch_gnu_type) + mv debian/libffi5-dev/usr/include/$(biarch_gnu_type) \ + debian/lib32ffi5-dev/usr/include/ endif ifneq (,$(filter biarch64, $(multiarch))) mkdir -p debian/lib64ffi-dev/usr/include/$(biarch_gnu_type)$(abi64) - mv debian/libffi-dev/usr/include/$(biarch_gnu_type)$(abi64) \ + mv debian/libffi5-dev/usr/include/$(biarch_gnu_type)$(abi64) \ debian/lib64ffi-dev/usr/include/ endif ifneq (,$(filter biarchn32, $(multiarch))) mkdir -p debian/libn32ffi-dev/usr/include/$(biarch_gnu_type)$(abin32) - mv debian/libffi-dev/usr/include/$(biarch_gnu_type)$(abin32) \ + mv debian/libffi5-dev/usr/include/$(biarch_gnu_type)$(abin32) \ debian/libn32ffi-dev/usr/include/ endif @@ -243,36 +243,36 @@ dh_testroot dh_installchangelogs -s dh_installdocs -s - dh_installinfo -plibffi-dev doc/libffi.info - rm -f debian/libffi-dev/usr/share/info/dir* - cp -p ChangeLog debian/libffi-dev/usr/share/doc/libffi$(major)/changelog - cp -p ChangeLog.* debian/libffi-dev/usr/share/doc/libffi$(major)/ + dh_installinfo -plibffi5-dev doc/libffi.info + rm -f debian/libffi5-dev/usr/share/info/dir* + cp -p ChangeLog debian/libffi5-dev/usr/share/doc/libffi$(major)/changelog + cp -p ChangeLog.* debian/libffi5-dev/usr/share/doc/libffi$(major)/ ifeq ($(with_check),yes) - cp -p build/check.log debian/libffi-dev/usr/share/doc/libffi$(major)/test_results_$(DEB_HOST_MULTIARCH).txt + cp -p build/check.log debian/libffi5-dev/usr/share/doc/libffi$(major)/test_results_$(DEB_HOST_MULTIARCH).txt endif - rm -rf debian/libffi-dev/usr/share/doc/libffi-dev - ln -s libffi$(major) debian/libffi-dev/usr/share/doc/libffi-dev + rm -rf debian/libffi5-dev/usr/share/doc/libffi5-dev + ln -s libffi$(major) debian/libffi5-dev/usr/share/doc/libffi5-dev rm -rf debian/libffi$(major)-dbg/usr/share/doc/libffi$(major)-dbg ln -s libffi$(major) debian/libffi$(major)-dbg/usr/share/doc/libffi$(major)-dbg ifneq (,$(filter biarch32, $(multiarch))) - rm -rf debian/lib32ffi-dev/usr/share/doc/lib32ffi-dev - ln -s libffi-dev debian/lib32ffi-dev/usr/share/doc/lib32ffi-dev + rm -rf debian/lib32ffi5-dev/usr/share/doc/lib32ffi5-dev + ln -s libffi5-dev debian/lib32ffi5-dev/usr/share/doc/lib32ffi5-dev ifeq ($(with_check),yes) - cat build32/check.log >> debian/libffi-dev/usr/share/doc/libffi$(major)/test_results_bi32_$(DEB_HOST_MULTIARCH).txt + cat build32/check.log >> debian/libffi5-dev/usr/share/doc/libffi$(major)/test_results_bi32_$(DEB_HOST_MULTIARCH).txt endif endif ifneq (,$(filter biarch64, $(multiarch))) - rm -rf debian/lib64ffi-dev/usr/share/doc/lib64ffi-dev - ln -s libffi-dev debian/lib64ffi-dev/usr/share/doc/lib64ffi-dev + rm -rf debian/lib64ffi5-dev/usr/share/doc/lib64ffi5-dev + ln -s libffi5-dev debian/lib64ffi5-dev/usr/share/doc/lib64ffi5-dev ifeq ($(with_check),yes) - cat build64/check.log >> debian/libffi-dev/usr/share/doc/libffi$(major)/test_results_bi64_$(DEB_HOST_MULTIARCH).txt + cat build64/check.log >> debian/libffi5-dev/usr/share/doc/libffi$(major)/test_results_bi64_$(DEB_HOST_MULTIARCH).txt endif endif ifneq (,$(filter biarchn32, $(multiarch))) - rm -rf debian/libn32ffi-dev/usr/share/doc/libn32ffi-dev - ln -s libffi-dev debian/libn32ffi-dev/usr/share/doc/libn32ffi-dev + rm -rf debian/libn32ffi5-dev/usr/share/doc/libn32ffi5-dev + ln -s libffi5-dev debian/libn32ffi5-dev/usr/share/doc/libn32ffi5-dev ifeq ($(with_check),yes) - cat buildn32/check.log >> debian/libffi-dev/usr/share/doc/libffi$(major)/test_results_bi32n_$(DEB_HOST_MULTIARCH).txt + cat buildn32/check.log >> debian/libffi5-dev/usr/share/doc/libffi$(major)/test_results_bi32n_$(DEB_HOST_MULTIARCH).txt endif endif dh_strip -s --dbg-package=libffi$(major)-dbg