From 89458660792bde178865362ddf6becf2f12aa8b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 9 Jul 2017 13:38:53 +0200 Subject: Upgrade work --- .gitignore | 1 + debian/changelog | 18 ++++++++++ debian/compat | 2 +- debian/control | 58 ++++++++++++++++++++------------- debian/patches/0001-intltool_utf8.patch | 9 +++++ debian/patches/series | 5 +-- debian/rules | 16 +++++---- 7 files changed, 77 insertions(+), 32 deletions(-) create mode 100644 .gitignore create mode 100644 debian/patches/0001-intltool_utf8.patch diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..845ca06 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.pc diff --git a/debian/changelog b/debian/changelog index dd2b8fd..f231490 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,21 @@ +rapid-photo-downloader (0.9.0-1) UNRELEASED; urgency=medium + + * New upstream release (Closes: #867527, #790600): + - Remove obsolate patches: + + 05_removed-empty-directory.diff + + 10-keywords_desktop.patch + - Add new patch 0001-intltool_utf8.patch to fix Debian build errors. + * debian/control: + - Add requested python 3 and remove unneeded python 2 to/from Build-Depends. + - Change Vcs-Browser and Homepage to secure URI. + - Add X-Python3-Version and remove X-Python-Version. + * Declare compliance with Debian Policy 4.0.0. (No changes needed). + * Bump compat to 10: + - Change debian/compat to 10. + - Change debhelper version at debian/control to >= 10. + + -- Jörg Frings-Fürst Thu, 06 Jul 2017 23:01:19 +0200 + rapid-photo-downloader (0.4.11-1) unstable; urgency=medium * New upstream release (Closes: #806975, #806976). diff --git a/debian/compat b/debian/compat index ec63514..f599e28 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/debian/control b/debian/control index a53ad7f..c57bd36 100644 --- a/debian/control +++ b/debian/control @@ -3,37 +3,51 @@ Section: graphics Priority: optional Maintainer: Jörg Frings-Fürst Build-Depends: - debhelper (>= 9), + debhelper (>= 10), dh-python, - python, - gettext -Standards-Version: 3.9.6 -X-Python-Version: 2.7 -Homepage: http://damonlynch.net/rapid + intltool, + python3-all, + python3-setuptools, + python3-xdg +Standards-Version: 4.0.0 +X-Python3-Version: >= 3.6 +Homepage: https://damonlynch.net/rapid Vcs-Git: git://anonscm.debian.org/collab-maint/rapid-photo-downloader.git -Vcs-Browser: http://anonscm.debian.org/cgit/collab-maint/rapid-photo-downloader.git +Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/rapid-photo-downloader.git Package: rapid-photo-downloader Architecture: all Depends: - ${python:Depends}, + ${python3:Depends}, ${misc:Depends}, - python-dbus, - python-gtk2 (>= 2.12), - python-glade2 (>= 2.17), - python-gconf (>= 2.28), - python-gnome2 (>= 2.28), - python-pyexiv2 (>= 0.3), - python-notify (>= 0.1.1), - python-imaging (>= 1.1.7), - librsvg2-common (>= 2.26), - gnome-icon-theme, + python3-arrow, + python3-colorlog, + python3-dateutil, + python3-dbus, + python3-easygui, + python3-exif, + python3-gi, + python3-gphoto2cffi, + python3-pyqt5 (>= 5.4), + python3-psutil, + python3-requests, + python3-sortedcontainers, + python3-zmq, +# python3-gtk2 (>= 2.12), +# python3-glade2 (>= 2.17), +# python3-gconf (>= 2.28), +# python3-gnome2 (>= 2.28), + python3-pyexiv2 (>= 0.3), +# python3-notify (>= 0.1.1), +# python3-imaging (>= 1.1.7), +# librsvg2-common (>= 2.26), +# gnome-icon-theme, libimage-exiftool-perl, - exiv2, - exiftran +# exiv2, +# exiftran Recommends: - python-kaa-metadata, - python-hachoir-metadata, + python3-kaa-metadata, + python3-hachoir-metadata, ffmpegthumbnailer Description: Photo downloader (importer) from cameras, memory cards, other devices Rapid Photo Downloader can be used by both professional and amateur diff --git a/debian/patches/0001-intltool_utf8.patch b/debian/patches/0001-intltool_utf8.patch new file mode 100644 index 0000000..58f2671 --- /dev/null +++ b/debian/patches/0001-intltool_utf8.patch @@ -0,0 +1,9 @@ +Index: trunk/po/POTFILES.in +=================================================================== +--- trunk.orig/po/POTFILES.in ++++ trunk/po/POTFILES.in +@@ -1,3 +1,4 @@ ++[encoding: UTF-8] + raphodo/aboutdialog.py + raphodo/backupfile.py + raphodo/backuppanel.py diff --git a/debian/patches/series b/debian/patches/series index 924b9ac..f0c7b0a 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,3 @@ -05_removed-empty-directory.diff -10-keywords_desktop.patch +#05_removed-empty-directory.diff +#10-keywords_desktop.patch +0001-intltool_utf8.patch diff --git a/debian/rules b/debian/rules index f1c848e..485f51b 100755 --- a/debian/rules +++ b/debian/rules @@ -3,19 +3,21 @@ DEBVERS := $(shell dpkg-parsechangelog | sed -n -e 's/^Version: //p') VERSION := $(shell echo '$(DEBVERS)' | sed -e 's/^[[:digit:]]*://' -e 's/[~-].*//') +export DH_VERBOSE=1 + %: - dh $@ --with python2 + dh $@ --with python3 --buildsystem=pybuild override_dh_auto_configure: - pod2man --section=1 --release=$(VERSION) --center "" doc/rapid-photo-downloader.pod > rapid-photo-downloader.1 + pod2man --section=1 --release=$(VERSION) --center "" doc/rapid-photo-downloader.1.pod > rapid-photo-downloader.1 -override_dh_auto_install: - dh_auto_install -- --install-lib=/usr/share/rapid-photo-downloader --install-scripts=/usr/share/rapid-photo-downloader +#override_dh_auto_install: +# dh_auto_install -- --install-lib=/usr/share/rapid-photo-downloader --install-scripts=/usr/share/rapid-photo-downloader override_dh_auto_clean: - -rm rapid-photo-downloader.1 +# -rm rapid-photo-downloader.1 -rm -rf build/ - dh_auto_clean +# dh_auto_clean override_dh_installchangelogs: - dh_installchangelogs rapid/ChangeLog + dh_installchangelogs CHANGES.rst -- cgit v1.2.3