diff -Nru libiptcdata-1.0.5/debian/bin/pydoc libiptcdata-1.0.5/debian/bin/pydoc --- libiptcdata-1.0.5/debian/bin/pydoc 2020-01-10 18:11:56.000000000 +0000 +++ libiptcdata-1.0.5/debian/bin/pydoc 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -#! /bin/sh -exec pydoc2 "$@" diff -Nru libiptcdata-1.0.5/debian/bin/python libiptcdata-1.0.5/debian/bin/python --- libiptcdata-1.0.5/debian/bin/python 2020-01-10 14:33:15.000000000 +0000 +++ libiptcdata-1.0.5/debian/bin/python 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -#! /bin/sh -exec python2 "$@" diff -Nru libiptcdata-1.0.5/debian/bin/python-config libiptcdata-1.0.5/debian/bin/python-config --- libiptcdata-1.0.5/debian/bin/python-config 2020-01-10 18:05:47.000000000 +0000 +++ libiptcdata-1.0.5/debian/bin/python-config 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -#! /bin/sh -exec python2-config "$@" diff -Nru libiptcdata-1.0.5/debian/changelog libiptcdata-1.0.5/debian/changelog --- libiptcdata-1.0.5/debian/changelog 2020-02-08 11:06:38.000000000 +0000 +++ libiptcdata-1.0.5/debian/changelog 2021-06-03 02:28:30.000000000 +0000 @@ -1,3 +1,33 @@ +libiptcdata (1.0.5-2.3ubuntu1) impish; urgency=medium + + * Merge from Debian unstable. Remaining changes: + - d/{rules,t/build}: Make autopkgtests cross-test-friendly. + * Dropped changes: + - Removed Python-related delta since python-iptcdata is no longer built. + - Added licensecheck back to the build; removing it should no longer be + necessary. + + -- Logan Rosen Wed, 02 Jun 2021 22:28:30 -0400 + +libiptcdata (1.0.5-2.3) unstable; urgency=medium + + * Non-maintainer upload. + + [ Jann Haber ] + * Drop binary package python-iptcdata. (Closes: #936880) + + [ Sebastian Ramacher ] + * Remove python, etc scripts from debian/bin again + + -- Sebastian Ramacher Sun, 31 Jan 2021 21:35:18 +0100 + +libiptcdata (1.0.5-2.2) unstable; urgency=medium + + * Non-maintainer upload. + * Build using python2. Closes: #967163, #966753. + + -- Matthias Klose Sat, 08 Aug 2020 22:18:23 +0200 + libiptcdata (1.0.5-2.1ubuntu4) focal; urgency=medium * No-change rebuild with fixed binutils on arm64. diff -Nru libiptcdata-1.0.5/debian/control libiptcdata-1.0.5/debian/control --- libiptcdata-1.0.5/debian/control 2020-01-14 13:09:22.000000000 +0000 +++ libiptcdata-1.0.5/debian/control 2021-06-03 02:26:47.000000000 +0000 @@ -9,7 +9,7 @@ debhelper (>= 10~), dh-buildinfo, dh-autoreconf, - dpkg-dev (>= 1.13.19), gtk-doc-tools, pkg-config, python-all-dev (>= 2.6.6-3~), dh-python + licensecheck, dpkg-dev (>= 1.13.19), gtk-doc-tools, pkg-config Standards-Version: 4.2.1.1 Vcs-Browser: https://salsa.debian.org/debian/libiptcdata Vcs-Git: https://salsa.debian.org/debian/libiptcdata.git @@ -67,16 +67,3 @@ Telecommunications Council (IPTC) metadata stored within multimedia files such as images. The library provides routines for parsing, viewing, modifying, and saving this metadata. - -Package: python-iptcdata -Architecture: any -Section: python -Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends} -Provides: ${python:Provides} -Description: Python bindings for the iptcdata library - libiptcdata is a library, for manipulating the International Press - Telecommunications Council (IPTC) metadata stored within multimedia - files such as images. The library provides routines for parsing, - viewing, modifying, and saving this metadata. - . - This package contains the python bindings for libiptcdata. diff -Nru libiptcdata-1.0.5/debian/control.in libiptcdata-1.0.5/debian/control.in --- libiptcdata-1.0.5/debian/control.in 2020-01-10 15:55:35.000000000 +0000 +++ libiptcdata-1.0.5/debian/control.in 2021-06-03 02:26:34.000000000 +0000 @@ -1,9 +1,8 @@ Source: libiptcdata Section: libs Priority: optional -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Ian Wienand -Build-Depends: @cdbs@, dpkg-dev (>= 1.13.19), gtk-doc-tools, pkg-config, python-all-dev (>= 2.6.6-3~), dh-python +Maintainer: Ian Wienand +Build-Depends: @cdbs@, dpkg-dev (>= 1.13.19), gtk-doc-tools, pkg-config Standards-Version: 4.2.1.1 Vcs-Browser: https://salsa.debian.org/debian/libiptcdata Vcs-Git: https://salsa.debian.org/debian/libiptcdata.git @@ -62,16 +61,3 @@ Telecommunications Council (IPTC) metadata stored within multimedia files such as images. The library provides routines for parsing, viewing, modifying, and saving this metadata. - -Package: python-iptcdata -Architecture: any -Section: python -Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends} -Provides: ${python:Provides} -Description: Python bindings for the iptcdata library - libiptcdata is a library, for manipulating the International Press - Telecommunications Council (IPTC) metadata stored within multimedia - files such as images. The library provides routines for parsing, - viewing, modifying, and saving this metadata. - . - This package contains the python bindings for libiptcdata. diff -Nru libiptcdata-1.0.5/debian/rules libiptcdata-1.0.5/debian/rules --- libiptcdata-1.0.5/debian/rules 2020-01-11 22:26:10.000000000 +0000 +++ libiptcdata-1.0.5/debian/rules 2021-06-03 02:28:19.000000000 +0000 @@ -22,9 +22,6 @@ # Generate debian/control using # fakeroot debian/rules debian/control DEB_AUTO_UPDATE_DEBIAN_CONTROL:=yes -PATH := $(PATH):$(CURDIR)/debian/bin -export PATH - DEB_DH_INSTALL_SOURCEDIR = $(CURDIR)/debian/tmp include /usr/share/cdbs/1/rules/debhelper.mk @@ -32,15 +29,13 @@ include /usr/share/cdbs/1/rules/autoreconf.mk include /usr/share/cdbs/1/rules/utils.mk -PY_VERSIONS = $(shell pyversions --requested debian/control) - DEB_BUILDDIR := build -DEB_CONFIGURE_EXTRA_FLAGS := --enable-python --enable-gtk-doc --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) +DEB_CONFIGURE_EXTRA_FLAGS := --enable-gtk-doc --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) configure-stamp-%: mkdir build-$* - cd build-$* && PYTHON=`which $*` $(DEB_CONFIGURE_SCRIPT_ENV) \ + cd build-$* && $(DEB_CONFIGURE_SCRIPT_ENV) \ $(DEB_CONFIGURE_SCRIPT) \ $(DEB_CONFIGURE_NORMAL_ARGS) \ --disable-maintainer-mode \ @@ -50,31 +45,18 @@ touch $@ -configure/python-iptcdata:: $(addprefix configure-stamp-, $(PY_VERSIONS)) - build-stamp-%: make -C build-$* touch $@ -build/python-iptcdata:: $(addprefix build-stamp-, $(PY_VERSIONS)) - build/libiptcdata-bin:: install-stamp-%: make -C build-$* install DESTDIR=$(CURDIR)/debian/tmp touch $@ -install/python-iptcdata:: $(addprefix install-stamp-, $(PY_VERSIONS)) - -binary-install/python-iptcdata:: - dh_python2 - DEB_INSTALL_MANPAGES_libiptcdata-bin := debian/iptc.1 clean:: -$(RM) -r $(DEB_BUILDDIR) - -$(RM) -r $(addprefix $(CURDIR)/build-, $(PY_VERSIONS)) - -$(RM) -r $(addprefix $(CURDIR)/configure-stamp-, $(PY_VERSIONS)) - -$(RM) -r $(addprefix $(CURDIR)/build-stamp-, $(PY_VERSIONS)) - -$(RM) -r $(addprefix $(CURDIR)/install-stamp-, $(PY_VERSIONS))