diff -Nru libffi-3.2.1/debian/changelog libffi6-3.2.1/debian/changelog --- libffi-3.2.1/debian/changelog 2018-11-27 10:52:58.000000000 +0000 +++ libffi6-3.2.1/debian/changelog 2020-02-06 17:25:26.000000000 +0000 @@ -1,3 +1,9 @@ +libffi6 (3.2.1-9+rpi1) bullseye-staging; urgency=medium + + * Rename source package and dev package to allow coexistence with libffi7 + + -- Peter Michael Green Thu, 06 Feb 2020 17:25:26 +0000 + libffi (3.2.1-9) unstable; urgency=medium * Add home page attribute to the control file. Closes: #816317. diff -Nru libffi-3.2.1/debian/control libffi6-3.2.1/debian/control --- libffi-3.2.1/debian/control 2018-11-27 10:52:58.000000000 +0000 +++ libffi6-3.2.1/debian/control 2020-02-06 17:25:22.000000000 +0000 @@ -1,4 +1,4 @@ -Source: libffi +Source: libffi6 Priority: optional Maintainer: Debian GCC Maintainers Uploaders: Matthias Klose @@ -11,12 +11,12 @@ Section: libs Homepage: https://sourceware.org/libffi/ -Package: libffi-dev +Package: libffi6-dev Section: libdevel Architecture: any Multi-Arch: same Depends: libffi6 (= ${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. diff -Nru libffi-3.2.1/debian/libffi6-dev.doc-base libffi6-3.2.1/debian/libffi6-dev.doc-base --- libffi-3.2.1/debian/libffi6-dev.doc-base 1970-01-01 00:00:00.000000000 +0000 +++ libffi6-3.2.1/debian/libffi6-dev.doc-base 2011-06-10 10:40:29.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/libffi6/html/index.html +Files: /usr/share/doc/libffi6/html/*.html diff -Nru libffi-3.2.1/debian/libffi6-dev.install libffi6-3.2.1/debian/libffi6-dev.install --- libffi-3.2.1/debian/libffi6-dev.install 1970-01-01 00:00:00.000000000 +0000 +++ libffi6-3.2.1/debian/libffi6-dev.install 2011-06-10 11:11:32.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.2.1/debian/libffi-dev.doc-base libffi6-3.2.1/debian/libffi-dev.doc-base --- libffi-3.2.1/debian/libffi-dev.doc-base 2011-06-10 10:40:29.000000000 +0000 +++ libffi6-3.2.1/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/libffi6/html/index.html -Files: /usr/share/doc/libffi6/html/*.html diff -Nru libffi-3.2.1/debian/libffi-dev.install libffi6-3.2.1/debian/libffi-dev.install --- libffi-3.2.1/debian/libffi-dev.install 2011-06-10 11:11:32.000000000 +0000 +++ libffi6-3.2.1/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.2.1/debian/rules libffi6-3.2.1/debian/rules --- libffi-3.2.1/debian/rules 2015-12-14 18:42:44.000000000 +0000 +++ libffi6-3.2.1/debian/rules 2020-02-06 17:25:26.000000000 +0000 @@ -90,15 +90,15 @@ -mv debian/tmp/usr/lib/* debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/. 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) + mkdir -p debian/libffi6-dev/usr/share/doc/$(p) ifneq ($(DEB_BUILD_PROFILE),stage1) - cp -a build/doc/libffi.html debian/libffi-dev/usr/share/doc/$(p)/html + cp -a build/doc/libffi.html debian/libffi6-dev/usr/share/doc/$(p)/html 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/libffi6-dev/usr/include/$(DEB_HOST_MULTIARCH) + mv debian/libffi6-dev/usr/include/*.h \ + debian/libffi6-dev/usr/include/$(DEB_HOST_MULTIARCH)/ # Build architecture-independent files here. @@ -112,12 +112,12 @@ dh_installchangelogs -s rm -f debian/libffi6/usr/share/doc/libffi$(major)/changelog 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)/ - rm -rf debian/libffi-dev/usr/share/doc/libffi-dev - ln -s libffi$(major) debian/libffi-dev/usr/share/doc/libffi-dev + dh_installinfo -plibffi6-dev doc/libffi.info + rm -f debian/libffi6-dev/usr/share/info/dir* + cp -p ChangeLog debian/libffi6-dev/usr/share/doc/libffi$(major)/changelog + cp -p ChangeLog.* debian/libffi6-dev/usr/share/doc/libffi$(major)/ + rm -rf debian/libffi6-dev/usr/share/doc/libffi6-dev + ln -s libffi$(major) debian/libffi6-dev/usr/share/doc/libffi6-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 dh_strip -s --dbg-package=libffi$(major)-dbg