diff options
Diffstat (limited to 'debian')
-rw-r--r-- | debian/README.source | 18 | ||||
-rw-r--r-- | debian/changelog | 1004 | ||||
-rw-r--r-- | debian/control | 80 | ||||
-rw-r--r-- | debian/copyright | 62 | ||||
-rw-r--r-- | debian/patches/0100-webp.patch | 21 | ||||
-rw-r--r-- | debian/patches/0105-vala_56.6.patch | 53 | ||||
-rw-r--r-- | debian/patches/0110-webp_part2.patch | 425 | ||||
-rw-r--r-- | debian/patches/0115-webp_part3.patch | 22 | ||||
-rw-r--r-- | debian/patches/series | 4 | ||||
-rwxr-xr-x | debian/replace_thumbnailer.sh | 21 | ||||
-rwxr-xr-x | debian/rules | 28 | ||||
l--------- | debian/shotwell-common.README.Debian | 1 | ||||
-rw-r--r-- | debian/shotwell-common.install | 4 | ||||
-rw-r--r-- | debian/shotwell-common.postrm | 18 | ||||
-rw-r--r-- | debian/shotwell.README.Debian | 25 | ||||
-rw-r--r-- | debian/shotwell.bug-script | 28 | ||||
-rw-r--r-- | debian/shotwell.docs | 3 | ||||
-rw-r--r-- | debian/shotwell.examples | 1 | ||||
-rw-r--r-- | debian/shotwell.install | 7 | ||||
-rw-r--r-- | debian/shotwell.lintian-overrides | 2 | ||||
-rw-r--r-- | debian/shotwell.manpages | 2 | ||||
-rw-r--r-- | debian/shotwell.postrm | 15 | ||||
-rw-r--r-- | debian/source/format | 1 | ||||
-rw-r--r-- | debian/watch | 3 |
24 files changed, 1848 insertions, 0 deletions
diff --git a/debian/README.source b/debian/README.source new file mode 100644 index 0000000..e4f2b3d --- /dev/null +++ b/debian/README.source @@ -0,0 +1,18 @@ +Hello, + +now I use the branching model from Vincent Driessen[1]. + +I use the gitflow-avh[2]. with the Documentation[3]. +The Debian package can be found here[4]. + +Please upload unattended uploads use a branch feature/<your title>. + + +Many thanks. + + -- Jörg Frings-Fürst <debian@jff-webhosting.net> Fri, 02 Jun 2017 19:00:40 +0200 + +[1] http://nvie.com/posts/a-successful-git-branching-model/ +[2] https://github.com/petervanderdoes/gitflow-avh +[3] https://github.com/petervanderdoes/gitflow-avh/wiki +[4] https://tracker.debian.org/pkg/git-flow diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 0000000..524d2a7 --- /dev/null +++ b/debian/changelog @@ -0,0 +1,1004 @@ +shotwell (0.30.18-1) UNRELEASED; urgency=medium + + * New upstream release (Closes: #1034018): + - debian/control: Add libportal-gtk3-dev to Build-Depends. + * debian/control: + - Change to new repository. + - Move Build Depend webp-pixbuf-loader to Depends (Closes: #1034010) + + Thanks to Jeremy Bícha <jeremy.bicha@canonical.com>. + * debian/copyright: + - Add year 2023 to myself. + * Declare compliance with Debian Policy 4.6.2.0 (No changes needed). + * New debian/patches/0105-vala_56.6.patch to fix FTBFS with newer vala + releases (Closes: #1034011). + - Thanks to Jeremy Bícha <jeremy.bicha@canonical.com>. + * Add webp support (Closes: #1034017): + - New debian/patches/0110-webp_part2.patch + - New debian/patches/0115-webp_part3.patch + - debian/control + + Add Build Depend libwebp-dev. + + Add bump minimum release of libgexiv2-dev to >= 0.12.0-2~. + - Thanks to Jeremy Bícha <jeremy.bicha@canonical.com>. + + -- Jörg Frings-Fürst <debian@jff.email> Tue, 13 Jun 2023 18:52:46 +0200 + +shotwell (0.30.17-1) unstable; urgency=medium + + * New upstream release. + * Declare compliance with Debian Policy 4.6.1.0 (No changes needed). + * Delete not used patches. + * Cherry-pick patch for Shotwell Viewer to open webp files (Closes: #1018025). + - New debian/patches/0100-webp.patch. + - debian/control: Add webp-pixbuf-loader to Build-Depends. + + -- Jörg Frings-Fürst <debian@jff.email> Sun, 02 Oct 2022 08:09:21 +0200 + +shotwell (0.30.16-1) unstable; urgency=medium + + * New upstream release: + - Remove not longer needed patches: + + debian/patches/0110-use_relative_lib_path.patch. + + -- Jörg Frings-Fürst <debian@jff.email> Sat, 21 May 2022 20:07:27 +0200 + +shotwell (0.30.15-2) unstable; urgency=medium + + * New debian/patches/0110-use_relative_lib_path.patch: + - Use relative path for libs (Closes: #1010571). + Thanks to Neil McGovern <neilm@debian.org>. + * Remove trailing whitespace from debian/rules. + * Rename lintian tag non-dev-pkg-with-shlib-symlink to + link-to-shared-library-in-wrong-package. + + -- Jörg Frings-Fürst <debian@jff.email> Thu, 05 May 2022 18:06:01 +0200 + +shotwell (0.30.15-1) unstable; urgency=medium + + * New upstream release. + - Fix FTBFS with vala 0.56.0 (Closes: #1008337). + - Remove not longer needed patches: + + debian/patches/0105-gitversion.patch. + * debian/copyright: + - Add year 2022 for debian/* to myself. + - Refresh *. + + -- Jörg Frings-Fürst <debian@jff.email> Thu, 07 Apr 2022 20:22:18 +0200 + +shotwell (0.30.14-2) unstable; urgency=medium + + * Enable untiy support (Closes: #1000528) + - debian/control: Add Build-Depends libunity-dev. + - debian/rules: Add override_dh_auto_configure. + * debian/rules: + - enable the apport option on Ubuntu (Closes: #1000529). + * Declare compliance with Debian Policy 4.6.0.1 (No changes needed). + + -- Jörg Frings-Fürst <debian@jff.email> Sat, 27 Nov 2021 12:06:45 +0100 + +shotwell (0.30.14-1) unstable; urgency=medium + + * New upstream release. + * Declare compliance with Debian Policy 4.6.0 (No changes needed). + * debian/copyright: + - Add year 2021 for debian/* to myself. + + -- Jörg Frings-Fürst <debian@jff.email> Wed, 18 Aug 2021 20:59:02 +0200 + +shotwell (0.30.11-1) unstable; urgency=medium + + * New upstream release. + + -- Jörg Frings-Fürst <debian@jff.email> Fri, 04 Dec 2020 19:22:52 +0100 + +shotwell (0.30.10-1) unstable; urgency=medium + + * New upstream release. + - Remove debian/patches/0115-fix_meson_build.patch. + * debian/shotwell.manpages: + - Install from debin/tmp to make dh_missing happy. + * debian/shotwell.install: + - Install from debin/tmp to make dh_missing happy. + * debian/control: + - Switch to debhelper-compat level 13. + + -- Jörg Frings-Fürst <debian@jff.email> Tue, 26 May 2020 11:50:55 +0200 + +shotwell (0.30.8-1) unstable; urgency=medium + + * New upstream release. + * Declare compliance with Debian Policy 4.5.0 (No changes needed). + * debian/copyright: + - Add year 2020 for debian/*. + + -- Jörg Frings-Fürst <debian@jff.email> Sat, 11 Apr 2020 12:28:05 +0200 + +shotwell (0.30.7-2) unstable; urgency=medium + + * debian/control: Remove outdated gnome-doc-utils from Build-Depends + (Closes: #945141, #945294). + * Switch to debhelper-compat: + - debian/control: Replace debhelper with debhelper-compat. + - Remove debian/compat. + + -- Jörg Frings-Fürst <debian@jff.email> Sat, 28 Dec 2019 14:09:00 +0100 + +shotwell (0.30.7-1) unstable; urgency=medium + + * New upstream release: + - New debian/patches/0115-fix_meson_build.patch to fix FTBFS. + - debian/control: Add cmake to Build-Depends. + * Declare compliance with Debian Policy 4.4.1 (No changes needed). + * debian/control: + - Add Rules-Requires-Root: binary-targets. + * Remove unused patches. + + -- Jörg Frings-Fürst <debian@jff.email> Mon, 07 Oct 2019 16:38:02 +0200 + +shotwell (0.30.5-1) unstable; urgency=medium + + * New upstream release. + - Remove debian/patches/0110-fix_GoogleAuthenticator.patch. + + -- Jörg Frings-Fürst <debian@jff.email> Thu, 15 Aug 2019 11:29:40 +0200 + +shotwell (0.30.4-2) unstable; urgency=medium + + * Fix GoogleAuthenticator error handling (Closes: #934723): + - New debian/patches/0110-fix_GoogleAuthenticator.patch cherry-picked + from upstream. + + -- Jörg Frings-Fürst <debian@jff.email> Wed, 14 Aug 2019 12:00:37 +0200 + +shotwell (0.30.4-1) unstable; urgency=medium + + * New upstream release. + * Declare compliance with Debian Policy 4.4.0 (No changes needed). + * Add package-name-doesnt-match-sonames to lintian-overrides. + * Refresh debian/copyright. + * Migrate to debhelper 12: + - Change debian/compat to 12. + - Change debhelper version in debian/control to >= 12. + * debian/copyright: Fix typo. + + -- Jörg Frings-Fürst <debian@jff.email> Fri, 12 Jul 2019 11:05:56 +0200 + +shotwell (0.30.1-1) unstable; urgency=medium + + * New upstream release. + - Switch to buildsystem meson: + + debian/control: Add gnome-pkg-tools, meson and ninja-build to + Build-Depends. + + debian/rules: Add --buildsystem=meson --with gnome, + remove override_dh_auto_configure and add override_dh_gnome_clean. + - debian/shotwell.docs: change README to README.md. + - Refresh debian/copyright. + * Declare compliance with Debian Policy 4.2.1 (No changes needed). + * debian/rules: remove unused calculation of B_DATE. + * debian/shotwell.install: Add usr/share/metainfo (Closes: #906143). + + -- Jörg Frings-Fürst <debian@jff.email> Sun, 30 Sep 2018 19:02:22 +0200 + +shotwell (0.28.4-1) unstable; urgency=medium + + * New upstream release. + + -- Jörg Frings-Fürst <debian@jff.email> Sat, 04 Aug 2018 14:40:03 +0200 + +shotwell (0.28.3-1) unstable; urgency=medium + + * New upstream release. + * Remove upstream applied patches: + - 0100-ios8.patch + * New debian/patches/0105-gitversion.patch to fix FTBFS. + * Migrate to debhelper 11: + - Change debian/compat to 11. + - Change debhelper version in debian/control to >= 11. + * debian/control: + - Switch Vcs-* to new location. + * debian/copyright: + - Use secure copyright format URI. + - Bump years to 2018. + * Declare compliance with Debian Policy 4.1.5 (No changes needed). + * Remove unneeded comments from shotwell.lintian-overrides. + + -- Jörg Frings-Fürst <debian@jff.email> Sun, 08 Jul 2018 14:34:46 +0200 + +shotwell (0.26.4-1) unstable; urgency=medium + + * New upstream release (Closes: #855681, #841859, #870027): + - debian/control: Add new appstream-util, libappstream-glib-dev and + libgdata-dev to Build-Depends. + - debian/shotwell.install: Drop now empty directory usr/share/appdata. + * New README.source to explain the branching model used. + * Use the automatic debug symbol packages: + - Remove shotwell-dbg section from debian/control. + - Remove override_dh_strip, override_dh_compress and some lines + on dh_install from debian/rules. + - Remove debian/shotwell-dbg.README.Debian. + * Use the upstream ChangeLog as changelog and add NEWS to docs. + * Remove debian/shotwell.1 to use the upstream man page. + * Don't install man page at shotwell-common. + * Remove unnecessary debian/menu. + * Some packaging improvements (Closes:# 856708): + - Move .desktop and appstream metadata from shotwell-common to shotwell. + - debian/rules: + + Use dh_auto_configure instead of ./configure. + + Update rm paths for multiarch. + + Don't install the .a file either. + - Remove build-depend m4 since debhelper version 10 use autoconf. + - Thanks to Jeremy Bicha <jbicha@ubuntu.com> + * debian/changelog: + - Remove trailing white spaces. + * debian/watch: + Rewrite to find only stable releases. + * Declare compliance with Debian Policy 4.1.2.0 (No changes needed). + * Change to my new email-address: + - debian/control, + - debian/copyright. + + -- Jörg Frings-Fürst <debian@jff.email> Fri, 15 Dec 2017 11:52:17 +0100 + +shotwell (0.25.4+really0.24.5-0.1) unstable; urgency=medium + + * Revert to last stable release 0.24.5 (Closes: #850149). + (Necessary, since unblock request #854912 for 0.25.4-0.1 was turned down.) + + -- Richard B. Kreckel <kreckel@debian.org> Tue, 14 Feb 2017 18:47:24 +0100 + +shotwell (0.25.4-0.1) unstable; urgency=medium + + * New upstream release. + - Many UI fixes (Closes: #849688). + + -- Richard B. Kreckel <kreckel@debian.org> Sun, 05 Jan 2017 18:43:12 +0100 + +shotwell (0.25.4-1) unstable; urgency=medium + + * New upstream release (Closes: #849688, #851711). + * debian/copyright: + - Update copyright years for 2017. + + -- Jörg Frings-Fürst <debian@jff-webhosting.net> Fri, 03 Feb 2017 14:23:16 +0100 + +shotwell (0.25.1-1) unstable; urgency=medium + + * New upstream release. + - Fix issue with indexes on PhotoTable (Closes: #777499). + * debian/patches: + - Refresh 0100-ios8.patch. + * debian/control: + - Add libgcr-3-dev to Build-Depends. + - Bump libgexiv2-dev B-D minimum version to 0.10.4. + - Bump libglib2.0-dev B-D minimum version to 2.40. + - Bump libgtk-3-dev B-D minimum version to 3.14. + + -- Jörg Frings-Fürst <debian@jff-webhosting.net> Fri, 25 Nov 2016 04:24:55 +0100 + +shotwell (0.24.0-1) unstable; urgency=medium + + * New upstream release (Closes: #824164, #825788). + - Fix inconsistent licensing metadata in icons/rejected.svg + (Closes: #800902). + - Fix crashes when opening files with external editor + (Closes: #806248). + - Fix scrollbars disappearing when resizing main window + (Closes: #823835). + - Install private executables shotwell-settings-migrator and + shotwell-video-thumbnailer into /usr/lib/shotwell + (Closes: #833236). + * debian/control: + - Add itstool to Build-Depends. + - Bump debhelper B-D minimum version to 10. + - Bump libgee-0.8 B-D minimum version to 0.10. + - Switch Depends for shotwell binary package from dbus-x11 to + default-dbus-session-bus | dbus-session-bus (Closes: #836046). + * debian/copyright: + - Add Software Freedom Conservancy Inc. + * debian/manpages: + - Rename to debian/shotwell.manpages and use the + manpage supplied upstream. + * debian/patches: + - New 0600-remove_wrong_marco.patch to remove the wrong macro 'R'. + - Refresh patches. + - Drop patches applied upstream: + + 0001-buildflags.patch + + 0005-hardening.patch + + 0500-Port-to-webkit2gtk-40.patch + + 0501-Dont-pack-webview-into-a-scrolled-window.patch + + 0502-Have-all-soup-sessions-validate-TLS-certificates.patch + + 0503-facebook-Dont-disable-XSS-auditor.patch + * debian/rules: + - Make build reproducible (Closes: #822948): + + Fix date handling for non-English locales. + + Fix files mode in temp-source tarball. + Thanks to Alexis Bienvenüe <pado@passoire.fr>. + - Remove unwanted .la files. + * debian/shotwell-common.postrm: + - New script to rebuild icon cache after purge and remove with + a test that gtk-update-icon-cache exists and is executable. + * debian/shotwell.install: + - Remove missing apport/shotwell.py. + * debian/shotwell-common.install: + - Remove now redundant installation of manpage. + * debian/watch: + - Rewrite regular expression. + + -- Jörg Frings-Fürst <debian@jff-webhosting.net> Wed, 21 Sep 2016 22:31:48 +0200 + +shotwell (0.22.1-1) unstable; urgency=medium + + * New upstream release. + - Update translations. + * debian/control: + - Bump Standards-Version to 3.9.8 (no changes required). + - Correct Vcs-Git URI. + - Improve package description (Closes: #818671). + - Drop the following fields because even oldstable has 0.12.3-2~: + + Breaks: shotwell (<< 0.12.3-1) + + Replaces: shotwell (<< 0.12.3-1) + * Set compat level to 10 (no changes required). + * Correct typo at shotwell-dbg.README.Debian. + * debian/rules: + - Touch generated C files with mtime of debian/changelog to ensure + the mtime of these C files never changes before installing them + into the shotwell-dbg package. Makes build reproducible. + + -- Jörg Frings-Fürst <debian@jff-webhosting.net> Sun, 17 Apr 2016 22:15:57 +0200 + +shotwell (0.22.0-4) unstable; urgency=medium + + * New debian/patches/0100-ios8.patch (Closes: #792016): + - Quick and dirty patch to get iOS 8 devices ready to download files. + Download from https://bugzilla.gnome.org/show_bug.cgi?id=742295#c22. + Thanks to Obsidian. + * debian/control: + - Bump Standards-Version to 3.9.7 (no changes required). + - Change Vcs-* to secure uri. + * debian/watch: Bump Version to 4 (no changes required). + + -- Jörg Frings-Fürst <debian@jff-webhosting.net> Mon, 22 Feb 2016 06:43:14 +0100 + +shotwell (0.22.0-3) unstable; urgency=medium + + * debian/rules: + - Touch temporary C files with the timestamp of + debian/changelog to make the build reproducible. + * Verify TLS certificates (Closes: #807110): + - Cherry-pick patches from upstream in debian/patches: + + 0500-Port-to-webkit2gtk-40.patch + + 0501-Dont-pack-webview-into-a-scrolled-window.patch + + 0502-Have-all-soup-sessions-validate-TLS-certificates.patch + + 0503-facebook-Dont-disable-XSS-auditor.patch + - Replace libwebkitgtk-3.0-dev with libwebkit2gtk-4.0-dev + in Build-Depends in debian/control. + * Rename patches. + * debian/copyright: + - Update for 2016. + + -- Jörg Frings-Fürst <debian@jff-webhosting.net> Sun, 10 Jan 2016 16:53:26 +0100 + +shotwell (0.22.0-2) unstable; urgency=medium + + * debian/control: + - Add dconf-cli to Depends for binary package shotwell (Closes: #783578). + + -- Jörg Frings-Fürst <debian@jff-webhosting.net> Thu, 30 Apr 2015 08:07:46 +0200 + +shotwell (0.22.0-1) unstable; urgency=low + + * New upstream release: + - Correct edited file handling (Closes: #747443). + - Better handling of imported files (Closes: #775950). + * Refresh patches: + - debian/patches/hardening.patch + - debían/patches/500-buildflags.patch + * Remove patch applied upstream: + - debian/patches/505-fix-viewer-desktop-file.patch + * For better debugging: + - shotwell-dbg: + + Add the temporary *.c files produced by valac + to temp-source.tar.xz placed in doc directory. + - debian/rules: + + Add --debug as configure parameter. + + Add override_dh_compress to exclude the *.tar.xz from compress. + - debian/docs: + + Move to shotwell.docs. + - New debian/shotwell-dbg.README.Debian. + - New link from debian/shotwell.README.Debian to + debian/shotwell-common.README.Debian. + * debian/control: + - For the libgphoto2 transition, set the minimum version for + libgphoto2-dev in Build-Depends to 2.5.4. + * New bug reporting: + - New debian/shotwell.bug-script. + - New debian/shotwell.install to install the apport file. + + -- Jörg Frings-Fürst <debian@jff-webhosting.net> Mon, 06 Apr 2015 07:59:33 +0200 + +shotwell (0.20.2-2) unstable; urgency=low + + * Add user scripts to replace shotwell-video-thumbnailer + if the thumbnailer is broken (Closes: #768637): + - New files: + + debian/shotwell.README.Debian + + debian/replace_thumbnailer.sh + + debian/shotwell.postrm + + debian/shotwell.examples + - Thanks to Teo Romera <teoromera@gmail.com>. + * debian/patches: + - Add 505-fix-viewer-desktop-file.patch to correct build of + shotwell-viewer.desktop (Closes: #776745). + + Thanks to Raphaël Halimi <raphael.halimi@gmail.com>. + - Rewrite 500-buildflags.patch to prevent FTBFS on + architectures i386 and powerpc. + * debian/control: + - Add Build-Depends libicu-dev for missing unicode/ucnv.h. + + -- Jörg Frings-Fürst <debian@jff-webhosting.net> Mon, 02 Feb 2015 05:16:56 +0100 + +shotwell (0.20.2-1) unstable; urgency=medium + + * New upstream release (Closes: #769025). + * debian/control: + - Remove useless ${shlibs:Depends} from shotwell-dbg. + * debian/rules: + - Remove useless hardening parts. + * New debian/patches/500-buildflags.patch: + - Poke requested Debian buildflags for hardening into Makefile. + * Add year 2015 for debian/* to debian/copyright. + * Remove debian/source/options because compression xz is standard now. + + -- Jörg Frings-Fürst <debian@jff-webhosting.net> Wed, 07 Jan 2015 14:23:48 +0100 + +shotwell (0.20.1-1) unstable; urgency=medium + + * New upstream release. + * Add sharedobject-in-library-directory-missing-soname to + lintian-overrides. + * debian/patch/hardening.patch: + - Add removal of --fatal-warnings at plugins/Makefile.plugins.mk + to prevent build errors on armel and mips. + + -- Jörg Frings-Fürst <debian@jff-webhosting.net> Thu, 09 Oct 2014 11:57:41 +0200 + +shotwell (0.20.0-1) unstable; urgency=medium + + * New upstream release (Closes: #762357). + * debian/control: + - Bump Standards-Version to 3.9.6 (no changes required). + - Change Vcs-Browser to cgit. + * debian/copyright: + - Remove deleted file icons/hidden.svg. + - Add missed file icons/import-all.png. + - Remove whitspaces at EOL. + * debian/rules: + - Enable hardening=+all because files can open over network. + - Remove useless variable assignments. + - Add --debug to configure. + + -- Jörg Frings-Fürst <debian@jff-webhosting.net> Tue, 23 Sep 2014 18:56:52 +0200 + +shotwell (0.18.1-2) unstable; urgency=medium + + * New Maintainer (Closes: #755416). + * debian/copyright: + - Rewrite into machine-readable format. + - Add myself to the list of authors for debian/*. + * debian/control: + - Set myself as maintainer. + - For previously not existing Vcs + + Create a new git repository on alioth. + + Add the Fields Vcs-Browser and Vcs-Git. + + -- Jörg Frings-Fürst <debian@jff-webhosting.net> Wed, 30 Jul 2014 07:27:30 +0200 + +shotwell (0.18.1-1) unstable; urgency=medium + + * New upstream release. + * debian/control: + - Set Homepage field to the new home page. + * debian/control: + - Set download reference to the new site. + + -- Luca Falavigna <dktrkranz@debian.org> Sun, 20 Jul 2014 17:15:28 +0200 + +shotwell (0.18.0-1) unstable; urgency=medium + + * New upstream release. + * Upload to unstable. + * debian/patches/hardening.patch: + - Refresh for new upstream release. + * debian/patches/thumbnailer_path.patch: + - Removed, not needed. + * debian/control: + - Re-add myself as Uploader. + - Add gnome-doc-utils to Build-Depends. + - Replace libgphoto2-2-dev with libgphoto2-dev (Closes: #739355). + * debian/manpages: + - Do not install shotwell-video-thumbnailer anymore. + * debian/shotwell-video-thumbnailer.1: + - Removed, no longer needed. + * debian/rules: + - Explicitly set libexecdir to /usr/lib (Closes: #742083). + * debian/watch: + - Point to the GNOME FTP server. + + -- Luca Falavigna <dktrkranz@debian.org> Thu, 27 Mar 2014 14:02:25 +0100 + +shotwell (0.17.0-1) experimental; urgency=low + + * Team upload. + * New upstream release. + * debian/patches/format_string.patch: + - Removed, applied upstream. + * debian/patches/hardening.patch: + - Refresh for new upstream release. + * debian/patches/libexec.patch + - Refresh for new upstream release. + * debian/patches/thumbnailer_path.patch: + - Refresh for new upstream release. + * debian/shotwell.lintian-overrides: + - Remove useless library-not-linked-against-libc tag. + + -- Luca Falavigna <dktrkranz@debian.org> Sun, 16 Feb 2014 14:10:50 +0100 + +shotwell (0.15.0-2) unstable; urgency=medium + + * Team upload to unstable. + * debian/control: + - Bump Standards-Version to 3.9.5. + + -- Luca Falavigna <dktrkranz@debian.org> Sun, 16 Feb 2014 14:02:15 +0100 + +shotwell (0.15.0-1) experimental; urgency=low + + * Team upload. + * New upstream release (Closes: #726594). + - Fix FTBFS with vala 0.22 (Closes: #726510). + * debian/patches/document-mode.patch: + - Removed, applied upstream. + * debian/patches/hardening.patch: + - Refresh for new upstream release. + * debian/patches/libexec.patch + - Refresh for new upstream release. + * debian/patches/thumbnailer_path.patch: + - Install shotwell-video-thumbnailer under /usr/bin. + * debian/control: + - Build-depend against desktop-file-utils. + - Refresh build-dependency miminum versions. + + -- Luca Falavigna <dktrkranz@debian.org> Thu, 17 Oct 2013 22:04:11 +0200 + +shotwell (0.14.1-3) unstable; urgency=low + + * Team upload. + * debian/patches/document-mode.patch: + - Remove reference to document-mode processing APIs (Closes: #710141). + + -- Luca Falavigna <dktrkranz@debian.org> Thu, 11 Jul 2013 10:59:32 +0200 + +shotwell (0.14.1-2) unstable; urgency=low + + * Team upload. + * Upload to unstable. + * debian/patches/libexec.patch: + - Do not install files in libexec directory (Closes: #706430). + * debian/control: + - Build-depend on valac (>= 0.18.0). + * debian/shotwell-common.lintian-overrides: + - Removed, no longer needed. + + -- Luca Falavigna <dktrkranz@debian.org> Sun, 12 May 2013 23:22:52 +0200 + +shotwell (0.14.1-1) experimental; urgency=low + + * New upstream release. + * Update debian/copyright file. + * Install shotwell-settings-migrator script in shotwell-common package + (Closes: #705423). + * Fix hardening-no-fortify-functions lintian warnings. + * Fix hardening-no-relro lintian warning. + + -- Devid Antonio Filoni <d.filoni@ubuntu.com> Sun, 28 Apr 2013 15:10:11 +0200 + +shotwell (0.14.0-1) experimental; urgency=low + + * Team upload. + * New upstream release. + - Fixes strftime strings that generated bogus dates in the + Catalan translation (Closes: #675102). + - Fix assertion error on startup (Closes: #683883). + * debian/control: + - Bump build-dependencies minimum requirements. + - valac-0.18 (>= 0.18.0) + - libgexiv2-dev (>= 0.4.90) + - libgstreamer1.0-dev (>= 1.0.0) + - libgstreamer-plugins-base1.0-dev (>= 1.0.0) + - Drop libunique-3.0-dev and libusb-dev, no longer needed. + * debian/rules: + - Explicitly call configure instead of dh_auto_configure. + * debian/watch: + - Do not list preview versions. + + -- Luca Falavigna <dktrkranz@debian.org> Thu, 21 Mar 2013 20:14:36 +0100 + +shotwell (0.13.1-1) experimental; urgency=low + + * Team upload. + * New upstream release. + - Fix crash on invalid piwigo response (Closes: #687930). + * debian/control: + - Remove DM-Upload-Allowed field. + + -- Luca Falavigna <dktrkranz@debian.org> Wed, 28 Nov 2012 11:26:02 +0100 + +shotwell (0.13.0-1) experimental; urgency=low + + * Team upload. + * New upstream release (Closes: #688365). + - Fix French localization (Closes: #684578, #684579). + * debian/patches/gettext.patch: + - Removed, applied upstream. + * debian/patches/metadata.patch: + - Removed, applied upstream. + * debian/patches/openmp.patch: + - Removed, no longer needed. + * debian/control: + - Build-depend on valac-0.18 (>= 0.17.2) and libjson-glib-dev. + - Mention CR2 format in package description (Closes: #685300). + - Bump Standards-Version to 3.9.4. + * debian/watch: + - Track xz tarballs. + + -- Luca Falavigna <dktrkranz@debian.org> Sat, 29 Sep 2012 14:58:49 +0200 + +shotwell (0.12.3-2) unstable; urgency=low + + * Team upload. + * debian/patches/metadata.patch: + - Cherry-pick patches from upstream repository to fix crashes while + managing metadata (Closes: #665498). + + -- Luca Falavigna <dktrkranz@debian.org> Sun, 22 Jul 2012 11:56:51 +0200 + +shotwell (0.12.3-1) unstable; urgency=low + + * Team upload. + * New upstream release (Closes: #674720). + * debian/patches/sidebar-bg-color.patch: + - Removed, applied upstream. + * debian/patches/openmp.patch: + - Refresh for new upstream release. + * debian/control: + - Move architecture-independent data into shotwell-common package. + - Let shotwell binary depend on the new shotwell-common package. + - Provide shotwell-dbg packaage. + * debian/rules: + - Pass --dbg-package=shotwell-dbg to dh sequencer. + + -- Luca Falavigna <dktrkranz@debian.org> Sun, 03 Jun 2012 12:19:04 +0200 + +shotwell (0.12.2-1) unstable; urgency=low + + * Team upload to unstable + * New upstream release. + * debian/patches/gcc_format_string.patch: + - Removed, applied upstream. + * debian/patches/format_string.patch: + - Fix FTBFS with missing format string parameter. + * debian/patches/openmp.patch: + - Pass -fopenmp to gcc flags. + + -- Luca Falavigna <dktrkranz@debian.org> Sun, 06 May 2012 19:50:17 +0200 + +shotwell (0.12.1-1) experimental; urgency=low + + * Team upload. + * New upstream release (Closes: #666053). + - Login into flickr with OpenID (Closes: #641472). + - In view mode, when deleting a photo, do not switch back to + thumbnail mode (Closes: #655100). + - Event names are displayed correctly (Closes: #664980). + * debian/patches/gcc_format_string.patch: + - fix FTBFS with recent gcc. + * debian/patches/vala-0.14.1.patch: + - Removed, no longer needed. + * debian/patches/* + - Refresh for new upstream release. + * debian/compat: + - Bump compatibility level to 9. + * debian/control: + - Build-depend on valac-0.16. + - Build-depend on librest-dev. + - Refresh build-dependencies. + + -- Luca Falavigna <dktrkranz@debian.org> Thu, 29 Mar 2012 23:28:23 +0200 + +shotwell (0.11.6-2) unstable; urgency=low + + * Team upload. + * debian/patches/vala-0.14.1.patch: + - Allow compilation with vala-0.14.1. + * debian/control: + - Build-depend on unversioned valac (Closes: #663318). + - Bump Standards-Version to 3.9.3. + + -- Luca Falavigna <dktrkranz@debian.org> Sun, 18 Mar 2012 01:36:18 +0100 + +shotwell (0.11.6-1) unstable; urgency=low + + * Team upload. + * New upstream release. + + -- Luca Falavigna <dktrkranz@debian.org> Thu, 08 Dec 2011 22:38:11 +0100 + +shotwell (0.11.5-1) unstable; urgency=low + + * New upstream release (Closes: 645942). + * Show translations in GNOME menu, thanks to Hideki Yamane + <henrich@debian.or.jp> for this (Closes: 644905). + + [ Luca Falavigna ] + * Enable DM upload. + + -- Devid Antonio Filoni <d.filoni@ubuntu.com> Sun, 23 Oct 2011 01:39:38 +0200 + +shotwell (0.11.2-1) unstable; urgency=low + + * Team upload. + * New upstream bugfix release. + * debian/rules: + - Do not compile GConf schema (Closes: #641677). + + -- Luca Falavigna <dktrkranz@debian.org> Sat, 24 Sep 2011 14:27:33 +0200 + +shotwell (0.11.1-1) unstable; urgency=low + + * Team upload. + * New upstream bugfix release. + * debian/patches/sidebar-bg-color.patch: + - Refresh for new upstream release. + + -- Luca Falavigna <dktrkranz@debian.org> Tue, 13 Sep 2011 20:53:25 +0200 + +shotwell (0.11.0-1) unstable; urgency=low + + * Team upload. + * New upstream release (Closes: #639863). + * debian/patches/sidebar-bg-color.patch: + - Refresh for new upstream release. + * debian/control: + - Build-depend on libgstreamer-plugins-base0.10-dev. + + -- Luca Falavigna <dktrkranz@debian.org> Thu, 01 Sep 2011 19:59:07 +0200 + +shotwell (0.10.1-1) unstable; urgency=low + + * Team upload + * New upstream release (Closes: #629311). + * debian/patches/non-linux-fixes.patch: + - Removed, waiting for proper upstream porting efforts. + * debian/patches/sidebar-bg-color.patch: + - Refresh for new upstream release. + * debian/control: + - Add Debian Shotwell Maintainers to Maintainers. + - Move Devid to Uploaders. + - libwebkitgtk-dev transition (Closes: #635426). + - Set Architecture to linux-any, shotwell is currently unsupported + outside of Linux platform, and require some porting. + * debian/shotwell-video-thumbnailer.1: + - Provide a minimal man page for shotwell-video-thumbnailer + + -- Luca Falavigna <dktrkranz@debian.org> Sun, 21 Aug 2011 15:38:31 +0200 + +shotwell (0.9.3-1) unstable; urgency=low + + * New upstream release (Closes: #622705). + * Update debian/patches/non-linux-fixes.patch patch. + * Bump Standards-Version to 3.9.2. + + -- Devid Antonio Filoni <d.filoni@ubuntu.com> Sun, 01 May 2011 13:09:48 +0200 + +shotwell (0.9.1-1) unstable; urgency=low + + * Upload to unstable. + * New upstream release (Closes: #620765). + * debian/control: modify libgexiv2-dev (>= 0.3.1) to libgexiv2-dev + (>= 0.2.2-4) in Build-Depends field. + * Update debian/patches/non-linux-fixes.patch patch. + + -- Devid Antonio Filoni <d.filoni@ubuntu.com> Fri, 08 Apr 2011 23:28:01 +0200 + +shotwell (0.9.0-1) experimental; urgency=low + + * New upstream release (Closes: #614730, #593660, #619478). + * debian/control: modify valac-0.10 (>= 0.10.4) to valac-0.12 (>= 0.11.7) + in Build-Depends field. + * debian/control: add m4 and libgnomevfs2-dev (>= 2.24.2) to Build-Depends + field. + * debian/control: modify libgexiv2-dev (>= 0.2.0) to libgexiv2-dev + (>= 0.3.1) in Build-Depends field. + * Remove debian/patches/vala-0_10_4.patch patch, fixed upstream. + * Update debian/patches/non-linux-fixes.patch patch. + * Update debian/copyright file. + * Override library-not-linked-against-libc lintian warnings. + * Override image-file-in-usr-lib lintian warnings. + + -- Devid Antonio Filoni <d.filoni@ubuntu.com> Sun, 27 Mar 2011 15:07:13 +0200 + +shotwell (0.8.1-4) unstable; urgency=low + + * A patch was reverting some changes introduced in 0.8.1-3, apply them. + + -- Devid Antonio Filoni <d.filoni@ubuntu.com> Sun, 27 Mar 2011 12:42:49 +0200 + +shotwell (0.8.1-3) unstable; urgency=low + + * Update debian/patches/non-linux-fixes.patch patch (Closes: #619682). + * Add debian/patches/vala-0_10_4.patch patch, fix FTBFS caused by + valac 0.10.4. + * debian/control: modify valac-0.10 (>= 0.9.8) to valac-0.10 (>= 0.10.4) + in Build-Depends field. + + -- Devid Antonio Filoni <d.filoni@ubuntu.com> Sat, 26 Mar 2011 23:45:32 +0100 + +shotwell (0.8.1-2) unstable; urgency=low + + * Upload to unstable (Closes: #614445). + * debian/control: modify libjson-glib-dev (>= 0.10.28) to libjson-glib-dev + (>= 0.7.6) + * debian/control: modify libgstreamer0.10-dev (>= 0.7.6) to + libgstreamer0.10-dev (>= 0.10.28) + * debian/control: modify libraw-dev to libraw-dev (>= 0.13.1-2). + + -- Devid Antonio Filoni <d.filoni@ubuntu.com> Mon, 28 Feb 2011 22:16:51 +0100 + +shotwell (0.8.1-1) experimental; urgency=low + + * New upstream release. + * debian/control: modify valac-0.10 (>= 0.9.7) to valac-0.10 (>= 0.9.8) in + Build-Depends field. + * Update debian/copyright. + + -- Devid Antonio Filoni <d.filoni@ubuntu.com> Thu, 27 Jan 2011 23:05:40 +0100 + +shotwell (0.8.0-1) experimental; urgency=low + + * New upstream release. + * debian/control: modify valac (>= 0.9.5) to valac-0.10 (>= 0.9.7) in + Build-Depends field. + * debian/control: add libjson-glib-dev and libgstreamer0.10-dev to + Build-Depends field. + * Update debian/patches/sidebar-bg-color.patch patch. + * Update debian/patches/non-linux-fixes.patch patch. + + -- Devid Antonio Filoni <d.filoni@ubuntu.com> Fri, 07 Jan 2011 15:14:41 +0100 + +shotwell (0.7.2-1) experimental; urgency=low + + * New upstream release. + * Update debian/patches/sidebar-bg-color.patch patch. + + -- Devid Antonio Filoni <d.filoni@ubuntu.com> Wed, 15 Sep 2010 14:56:23 +0200 + +shotwell (0.7.0-1) experimental; urgency=low + + * New upstream release. + * debian/control: remove Luca Falavigna from Uploaders field. + * debian/control: update valac version to >= 0.9.5. + * debian/control: update libgexiv2-dev version to >= 0.2.0. + * Update debian/patches/non-linux-fixes.patch patch. + * debian/patches/sidebar-bg-color.patch: don't set sidebar background color + (Closes: #594170). + * Bump Standards-Version to 3.9.1. + + -- Devid Antonio Filoni <d.filoni@ubuntu.com> Tue, 24 Aug 2010 17:34:23 +0200 + +shotwell (0.6.1-1) unstable; urgency=low + + * New upstream release. + * debian/control: + - Build-depend on libusb-dev. + - Bump libgexiv2-dev version to be at least 0.1.0. + + -- Luca Falavigna <dktrkranz@debian.org> Mon, 05 Jul 2010 20:05:18 +0200 + +shotwell (0.6.0-1) unstable; urgency=low + + * New upstream release. + * debian/patches/non-linux-fixes.patch: + - Refresh for new upstream release. + * debian/control: + - Bump Standards-Version to 3.9.0, no changes required. + + -- Luca Falavigna <dktrkranz@debian.org> Wed, 30 Jun 2010 20:48:44 +0200 + +shotwell (0.5.91-2) experimental; urgency=low + + * debian/patches/non-linux-fixes.patch: + - Let libraw to be available under non-Linux architectures, fix FTBFS + on kFreeBSD (Closes: #586634). + + -- Luca Falavigna <dktrkranz@debian.org> Mon, 21 Jun 2010 23:24:16 +0200 + +shotwell (0.5.91-1) experimental; urgency=low + + * New upstream development release. + * debian/patches/non-linux-fixes.patch: + - Refresh for new upstream release. + * debian/control: + - Build-depend on libgexiv2-dev and libraw-dev. + - No longer build-depend on libhal-dev. + - Adjust build-dependencies versioning. + * debian/README.source: + - Upstream clarified licensing of some icons with their authors, now + they are released under CC-BY-SA-3.0, so there is no need to repack + upstream tarball anymore, thus removing this file. + + -- Luca Falavigna <dktrkranz@debian.org> Sun, 20 Jun 2010 16:09:43 +0200 + +shotwell (0.5.2+dfsg-2) unstable; urgency=low + + * debian/patches/non-linux-fixes.patch: + - Add Hurd bits to allow build on that architecture. + + -- Luca Falavigna <dktrkranz@debian.org> Mon, 07 Jun 2010 23:41:52 +0200 + +shotwell (0.5.2+dfsg-1) unstable; urgency=low + + * New upstream release (Closes: #578903). + * Drop vala_0.8.0.patch patch, already applied by upstream. + * debian/control: add Luca Falavigna to Uploaders field. + * Add debian/patches/non-linux-fixes.patch patch from Peter Green to add + support for kfreebsd and hurd (Closes: #581662). + * debian/control: replace "libgudev-1.0-dev (>= 145)" with "libgudev-1.0-dev + (>= 145) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386]" as suggested by + Peter Green. + + -- Devid Antonio Filoni <d.filoni@ubuntu.com> Sun, 23 May 2010 18:40:49 +0200 + +shotwell (0.5.0+dfsg-1.1) unstable; urgency=low + + * Non-maintainer upload. + * debian/patches/vala_0.8.0.patch: + - Build with vala 0.8.0 (Closes: #577913). + * debian/control: + - Depend on librsvg2-common and dbus-x11 (Closes: #574112). + - Bump minimum valac version to 0.8.0. + + -- Luca Falavigna <dktrkranz@debian.org> Sun, 18 Apr 2010 23:16:32 +0200 + +shotwell (0.5.0+dfsg-1) unstable; urgency=low + + * New upstream release. + * Update debian/copyright. + * Remove debian/patches directory, patches already applied upstream. + * debian/control: add libgudev-1.0-dev (>= 145) to Build-Depends field. + * Bump Standards-Version to 3.8.4. + + -- Devid Antonio Filoni <d.filoni@ubuntu.com> Mon, 15 Mar 2010 15:59:23 +0100 + +shotwell (0.4.3+dfsg-1.1) unstable; urgency=low + + * Non-maintainer upload. + * debian/patches/02_vala_0.7.10.patch: + - Fix build with vala 0.7.10 (Closes: #569370). + * debian/control: + - Bump minimum valac version to 0.7.10. + + -- Luca Falavigna <dktrkranz@debian.org> Sat, 20 Feb 2010 18:03:45 +0100 + +shotwell (0.4.3+dfsg-1) unstable; urgency=low + + * New upstream release. + * Switch to format 3.0 (quilt). + * Add debian/patches/01_GNU-kFreeBSD.diff patch from Cyril Brulebois to fix + FTBFS on GNU/kFreeBSD (Closes: #564306). + + -- Devid Antonio Filoni <d.filoni@ubuntu.com> Sat, 23 Jan 2010 18:56:33 +0100 + +shotwell (0.4.2+dfsg-1) unstable; urgency=low + + * Initial release (Closes: #561788). + + -- Devid Antonio Filoni <d.filoni@ubuntu.com> Wed, 06 Jan 2010 14:08:43 +0100 diff --git a/debian/control b/debian/control new file mode 100644 index 0000000..2501762 --- /dev/null +++ b/debian/control @@ -0,0 +1,80 @@ +Source: shotwell +Section: gnome +Priority: optional +Maintainer: Jörg Frings-Fürst <debian@jff.email> +Build-Depends: + appstream-util, + cmake, + debhelper-compat (= 13), + desktop-file-utils, + gnome-pkg-tools, + itstool, + libappstream-glib-dev, + libexif-dev (>= 0.6.16), + libgcr-3-dev, + libgdata-dev, + libgee-0.8-dev (>= 0.10), + libgexiv2-dev (>= 0.12.0-2~), + libglib2.0-dev (>= 2.40), + libgphoto2-dev (>= 2.5.4), + libgstreamer-plugins-base1.0-dev (>= 1.0.0), + libgstreamer1.0-dev (>= 1.0.0), + libgtk-3-dev (>= 3.14), + libgudev-1.0-dev (>= 145), + libicu-dev, + libjson-glib-dev, + libportal-gtk3-dev, + libraw-dev (>= 0.14), + librest-dev (>= 0.7), + libsoup2.4-dev (>= 2.26.0), + libsqlite3-dev (>= 3.5.9), + libunity-dev, + libwebkit2gtk-4.0-dev, + libwebp-dev, + libxml2 (>= 2.6.32), + meson, + ninja-build, + valac (>= 0.46.0) +Standards-Version: 4.6.2.0 +Rules-Requires-Root: binary-targets +Homepage: https://wiki.gnome.org/Apps/Shotwell +Vcs-Git: git://git.jff.email/shotwell.git +Vcs-Browser: https://git.jff.email/cgit/shotwell.git + +Package: shotwell +Architecture: linux-any +Depends: + ${shlibs:Depends}, + ${misc:Depends}, + shotwell-common (= ${source:Version}), + dconf-cli, + default-dbus-session-bus | dbus-session-bus, + librsvg2-common, + webp-pixbuf-loader +Replaces: shotwell-common (<< 0.26.2-1) +Description: digital photo organizer + Shotwell is a digital photo organizer designed for the GNOME desktop + environment. It allows you to import photos, pictures, images and videos + from disk or camera. Shotwell can organize them in collections and in other + various ways. The viewer shows them in full-window or fullscreen mode and + presents them as galleries or slideshows. The integrated editor can rotate, + flip, crop and tag the photos, adjust the colors und remove red eyes. Export + is possible to facebook, Flickr or Youtube to share with others. It is able + to manage a lot of image formats such as JPEG, PNG, BMP, TIFF and Raw CR2. + +Package: shotwell-common +Architecture: all +Depends: ${misc:Depends} +Recommends: shotwell +Breaks: shotwell (<< 0.26.2-1) +Description: digital photo organizer - common files + Shotwell is a digital photo organizer designed for the GNOME desktop + environment. It allows you to import photos, pictures, images and videos + from disk or camera. Shotwell can organize them in collections and in other + various ways. The viewer shows them in full-window or fullscreen mode and + presents them as galleries or slideshows. The integrated editor can rotate, + flip, crop and tag the photos, adjust the colors und remove red eyes. Export + is possible to facebook, Flickr or Youtube to share with others. It is able + to manage a lot of image formats such as JPEG, PNG, BMP, TIFF and Raw CR2. + . + This package provides image files and documentation for Shotwell. diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 0000000..e8f8094 --- /dev/null +++ b/debian/copyright @@ -0,0 +1,62 @@ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: shotwell +Upstream-Contact: Jim Nelson <jim@yorba.org> +Source: https://wiki.gnome.org/Apps/Shotwell + +Files: * +Copyright: 2009-2013 Yorba Foundation + 2010 Evgeniy Polyakov + 2010 Maxim Kartashev + 2013 Jens Bav + 2016-2019 Software Freedom Conservancy Inc. + 2011-2022 the shotwell authors +License: LGPL-2.1 + +Files: plugins/shotwell-publishing/PhotosPublisher.vala + plugins/shotwell-publishing/PhotosService.vala + plugins/shotwell-publishing/PhotosPublishingPane.vala + plugins/shotwell-publishing/PhotosUploader.vala +Copyright: 2016 Software Freedom Conservancy Inc. + 2019 Jens Georg <mail@jensge.org> +License: LGPL-2.1 + +Files: debian/* +Copyright: 2009-2011 Devid Antonio Filoni <d.filoni@ubuntu.com> + 2014-2023 Jörg Frings-Fürst <debian@jff.email> +License: GPL-2+ + +License: LGPL-2.1 + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + . + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + . + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + . + On Debian systems, the complete text of the GNU Lesser General Public License + version 2.1 can be found in "/usr/share/common-licenses/LGPL-2.1". + +License: GPL-2+ + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + . + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + . + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. + . + On Debian systems, the complete text of the GNU General Public + License can be found in the file `/usr/share/common-licenses/GPL-2'. diff --git a/debian/patches/0100-webp.patch b/debian/patches/0100-webp.patch new file mode 100644 index 0000000..2686139 --- /dev/null +++ b/debian/patches/0100-webp.patch @@ -0,0 +1,21 @@ +Description: data: Declare support for WebP and GIF in viewer +Author: Jens Georg <mail@jensge.org> +Origin: upstream, https://gitlab.gnome.org/GNOME/shotwell/-/commit/82c6707284bd590c5813691d602d87d8d237ac00 +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1018025 +Forwarded: no +Last-Update: 2022-10-02 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +diff --git a/misc/shotwell-viewer.desktop.in b/misc/shotwell-viewer.desktop.in +index b5e41f3..20b2f6e 100644 +--- a/misc/shotwell-viewer.desktop.in ++++ b/misc/shotwell-viewer.desktop.in +@@ -8,7 +8,7 @@ Icon=shotwell + Terminal=false + NoDisplay=true + Type=Application +-MimeType=image/jpeg;image/jpg;image/pjpeg;image/png;image/tiff;image/x-3fr;image/x-adobe-dng;image/x-arw;image/x-bay;image/x-bmp;image/x-canon-cr2;image/x-canon-crw;image/x-cap;image/x-cr2;image/x-crw;image/x-dcr;image/x-dcraw;image/x-dcs;image/x-dng;image/x-drf;image/x-eip;image/x-erf;image/x-fff;image/x-fuji-raf;image/x-iiq;image/x-k25;image/x-kdc;image/x-mef;image/x-minolta-mrw;image/x-mos;image/x-mrw;image/x-nef;image/x-nikon-nef;image/x-nrw;image/x-olympus-orf;image/x-orf;image/x-panasonic-raw;image/x-pef;image/x-pentax-pef;image/x-png;image/x-ptx;image/x-pxn;image/x-r3d;image/x-raf;image/x-raw;image/x-rw2;image/x-rwl;image/x-rwz;image/x-sigma-x3f;image/x-sony-arw;image/x-sony-sr2;image/x-sony-srf;image/x-sr2;image/x-srf;image/x-x3f; ++MimeType=image/jpeg;image/jpg;image/pjpeg;image/png;image/tiff;image/x-3fr;image/x-adobe-dng;image/x-arw;image/x-bay;image/x-bmp;image/x-canon-cr2;image/x-canon-crw;image/x-cap;image/x-cr2;image/x-crw;image/x-dcr;image/x-dcraw;image/x-dcs;image/x-dng;image/x-drf;image/x-eip;image/x-erf;image/x-fff;image/x-fuji-raf;image/x-iiq;image/x-k25;image/x-kdc;image/x-mef;image/x-minolta-mrw;image/x-mos;image/x-mrw;image/x-nef;image/x-nikon-nef;image/x-nrw;image/x-olympus-orf;image/x-orf;image/x-panasonic-raw;image/x-pef;image/x-pentax-pef;image/x-png;image/x-ptx;image/x-pxn;image/x-r3d;image/x-raf;image/x-raw;image/x-rw2;image/x-rwl;image/x-rwz;image/x-sigma-x3f;image/x-sony-arw;image/x-sony-sr2;image/x-sony-srf;image/x-sr2;image/x-srf;image/x-x3f;image/gif;image/webp + Categories=Graphics;Viewer;Photography;GNOME;GTK; + X-GIO-NoFuse=true + X-GNOME-Gettext-Domain=shotwell diff --git a/debian/patches/0105-vala_56.6.patch b/debian/patches/0105-vala_56.6.patch new file mode 100644 index 0000000..aab7959 --- /dev/null +++ b/debian/patches/0105-vala_56.6.patch @@ -0,0 +1,53 @@ +Description: Fix FTBFS with vala 0.56-6 +Author: <name and email of author, optional> +Origin: https://gitlab.gnome.org/GNOME/shotwell/-/commit/1c8760ed7 +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1034011 +Forwarded: not-needed +Last-Update: 2023-06-14 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +Index: trunk/vapi/libgphoto2.vapi +=================================================================== +--- trunk.orig/vapi/libgphoto2.vapi ++++ trunk/vapi/libgphoto2.vapi +@@ -340,19 +340,40 @@ namespace GPhoto { + public void set_message_func([CCode (delegate_target_pos=3.1)] ContextMessageFunc messageFunc); + } + ++ [CCode ( ++ cheader_filename="gphoto2/gphoto2-context.h" ++ )] + public delegate void ContextIdleFunc(Context context); + ++ [CCode ( ++ cheader_filename="gphoto2/gphoto2-context.h" ++ )] + public delegate void ContextErrorFunc(Context context, string text); + ++ [CCode ( ++ cheader_filename="gphoto2/gphoto2-context.h" ++ )] + public delegate void ContextStatusFunc(Context context, string text); + ++ [CCode ( ++ cheader_filename="gphoto2/gphoto2-context.h" ++ )] + public delegate void ContextMessageFunc(Context context, string text); + + // TODO: Support for va_args in Vala, esp. for delegates? ++ [CCode ( ++ cheader_filename="gphoto2/gphoto2-context.h" ++ )] + public delegate uint ContextProgressStartFunc(Context context, float target, string text); + ++ [CCode ( ++ cheader_filename="gphoto2/gphoto2-context.h" ++ )] + public delegate void ContextProgressUpdateFunc(Context context, uint id, float current); + ++ [CCode ( ++ cheader_filename="gphoto2/gphoto2-context.h" ++ )] + public delegate void ContextProgressStopFunc(Context context, uint id); + + [CCode ( diff --git a/debian/patches/0110-webp_part2.patch b/debian/patches/0110-webp_part2.patch new file mode 100644 index 0000000..175c08d --- /dev/null +++ b/debian/patches/0110-webp_part2.patch @@ -0,0 +1,425 @@ +From: Jens Georg <mail@jensge.org> +Date: Wed, 30 Aug 2017 21:46:55 +0200 +Subject: Support reading WEBP + +https://bugzilla.gnome.org/show_bug.cgi?id=717880 + +Requires a gexiv2 linked against exiv2 0.26 which currently works in the +flatpak and on F28, but NOT on Debian/Ubuntu 18.04 + +(cherry picked from commit f032a58dca391b1833c6ea70785bb3b63abc68c7) +--- + meson.build | 3 + + src/meson.build | 3 +- + src/photos/PhotoFileFormat.vala | 18 ++- + src/photos/WebPSupport.vala | 240 ++++++++++++++++++++++++++++++++++++++++ + vapi/libwebp.vapi | 5 + + vapi/libwebpdemux.vapi | 43 +++++++ + 6 files changed, 309 insertions(+), 3 deletions(-) + create mode 100644 src/photos/WebPSupport.vala + create mode 100644 vapi/libwebp.vapi + create mode 100644 vapi/libwebpdemux.vapi + +diff --git a/meson.build b/meson.build +index 5d08d30..2316377 100644 +--- a/meson.build ++++ b/meson.build +@@ -66,6 +66,9 @@ libexif = dependency('libexif', version : '>= 0.6.16') + unity = dependency('unity', required : false) + portal = [ dependency('libportal', version: '>= 0.5'), dependency('libportal-gtk3', version: '>= 0.5')] + ++webpdemux = dependency('libwebpdemux') ++webp = dependency('libwebp') ++ + unity_available = false + if unity.found() and get_option('unity-support') + unity_available = true +diff --git a/src/meson.build b/src/meson.build +index a532eec..8cab77d 100644 +--- a/src/meson.build ++++ b/src/meson.build +@@ -29,7 +29,7 @@ face_sources = (['faces/FacesBranch.vala', + + shotwell_deps = [gio, gee, sqlite, gtk, sqlite, posix, gphoto2, + gstreamer_pbu, gio_unix, gudev, gexiv2, gmodule, +- libraw, libexif, sw_plugin, portal, version] ++ libraw, libexif, sw_plugin, portal, version, webpdemux, webp] + if unity_available + shotwell_deps += [unity] + endif +@@ -73,6 +73,7 @@ executable('shotwell', + 'photos/RawSupport.vala', + 'photos/PngSupport.vala', + 'photos/TiffSupport.vala', ++ 'photos/WebPSupport.vala', + 'plugins/Plugins.vala', + 'plugins/StandardHostInterface.vala', + 'plugins/ManifestWidget.vala', +diff --git a/src/photos/PhotoFileFormat.vala b/src/photos/PhotoFileFormat.vala +index e642008..94ca752 100644 +--- a/src/photos/PhotoFileFormat.vala ++++ b/src/photos/PhotoFileFormat.vala +@@ -58,12 +58,13 @@ public enum PhotoFileFormat { + TIFF, + BMP, + GIF, ++ WEBP, + UNKNOWN; + + // This is currently listed in the order of detection, that is, the file is examined from + // left to right. (See PhotoFileInterrogator.) + public static PhotoFileFormat[] get_supported() { +- return { JFIF, RAW, PNG, TIFF, BMP, GIF }; ++ return { JFIF, RAW, PNG, TIFF, BMP, GIF, WEBP }; + } + + public static PhotoFileFormat[] get_writeable() { +@@ -141,7 +142,10 @@ public enum PhotoFileFormat { + + case GIF: + return 5; +- ++ ++ case WEBP: ++ return 6; ++ + case UNKNOWN: + default: + return -1; +@@ -169,6 +173,9 @@ public enum PhotoFileFormat { + case 5: + return GIF; + ++ case 6: ++ return WEBP; ++ + default: + return UNKNOWN; + } +@@ -249,6 +256,10 @@ public enum PhotoFileFormat { + Photos.GifFileFormatDriver.init(); + break; + ++ case WEBP: ++ Photos.WebpFileFormatDriver.init(); ++ break; ++ + default: + error("Unsupported file format %s", this.to_string()); + } +@@ -274,6 +285,9 @@ public enum PhotoFileFormat { + case GIF: + return Photos.GifFileFormatDriver.get_instance(); + ++ case WEBP: ++ return Photos.WebpFileFormatDriver.get_instance(); ++ + default: + error("Unsupported file format %s", this.to_string()); + } +diff --git a/src/photos/WebPSupport.vala b/src/photos/WebPSupport.vala +new file mode 100644 +index 0000000..093f196 +--- /dev/null ++++ b/src/photos/WebPSupport.vala +@@ -0,0 +1,240 @@ ++/* Copyright 2016 Software Freedom Conservancy Inc. ++ * ++ * This software is licensed under the GNU LGPL (version 2.1 or later). ++ * See the COPYING file in this distribution. ++ */ ++ ++namespace Photos { ++ ++public class WebpFileFormatDriver : PhotoFileFormatDriver { ++ private static WebpFileFormatDriver instance = null; ++ ++ public static void init() { ++ instance = new WebpFileFormatDriver(); ++ WebpFileFormatProperties.init(); ++ } ++ ++ public static WebpFileFormatDriver get_instance() { ++ return instance; ++ } ++ ++ public override PhotoFileFormatProperties get_properties() { ++ return WebpFileFormatProperties.get_instance(); ++ } ++ ++ public override PhotoFileReader create_reader(string filepath) { ++ return new WebpReader(filepath); ++ } ++ ++ public override PhotoMetadata create_metadata() { ++ return new PhotoMetadata(); ++ } ++ ++ public override bool can_write_image() { ++ return false; ++ } ++ ++ public override bool can_write_metadata() { ++ return true; ++ } ++ ++ public override PhotoFileWriter? create_writer(string filepath) { ++ return null; ++ } ++ ++ public override PhotoFileMetadataWriter? create_metadata_writer(string filepath) { ++ return new WebpMetadataWriter(filepath); ++ } ++ ++ public override PhotoFileSniffer create_sniffer(File file, PhotoFileSniffer.Options options) { ++ return new WebpSniffer(file, options); ++ } ++} ++ ++private class WebpFileFormatProperties : PhotoFileFormatProperties { ++ private static string[] KNOWN_EXTENSIONS = { ++ "webp" ++ }; ++ ++ private static string[] KNOWN_MIME_TYPES = { ++ "image/webp" ++ }; ++ ++ private static WebpFileFormatProperties instance = null; ++ ++ public static void init() { ++ instance = new WebpFileFormatProperties(); ++ } ++ ++ public static WebpFileFormatProperties get_instance() { ++ return instance; ++ } ++ ++ public override PhotoFileFormat get_file_format() { ++ return PhotoFileFormat.WEBP; ++ } ++ ++ public override PhotoFileFormatFlags get_flags() { ++ return PhotoFileFormatFlags.NONE; ++ } ++ ++ public override string get_default_extension() { ++ return "webp"; ++ } ++ ++ public override string get_user_visible_name() { ++ return _("WebP"); ++ } ++ ++ public override string[] get_known_extensions() { ++ return KNOWN_EXTENSIONS; ++ } ++ ++ public override string get_default_mime_type() { ++ return KNOWN_MIME_TYPES[0]; ++ } ++ ++ public override string[] get_mime_types() { ++ return KNOWN_MIME_TYPES; ++ } ++} ++ ++private class WebpSniffer : PhotoFileSniffer { ++ private DetectedPhotoInformation detected = null; ++ ++ public WebpSniffer(File file, PhotoFileSniffer.Options options) { ++ base (file, options); ++ detected = new DetectedPhotoInformation(); ++ } ++ ++ public override DetectedPhotoInformation? sniff(out bool is_corrupted) throws Error { ++ is_corrupted = false; ++ ++ if (!is_webp(file)) ++ return null; ++ ++ // valac chokes on the ternary operator here ++ Checksum? md5_checksum = null; ++ if (calc_md5) ++ md5_checksum = new Checksum(ChecksumType.MD5); ++ ++ detected.metadata = new PhotoMetadata(); ++ try { ++ detected.metadata.read_from_file(file); ++ } catch (Error err) { ++ debug("Failed to load meta-data from file: %s", err.message); ++ // no metadata detected ++ detected.metadata = null; ++ } ++ ++ if (calc_md5 && detected.metadata != null) { ++ detected.exif_md5 = detected.metadata.exif_hash(); ++ detected.thumbnail_md5 = detected.metadata.thumbnail_hash(); ++ } ++ ++ // if no MD5, don't read as much, as the needed info will probably be gleaned ++ // in the first 8K to 16K ++ uint8[] buffer = calc_md5 ? new uint8[64 * 1024] : new uint8[8 * 1024]; ++ size_t count = 0; ++ ++ // loop through until all conditions we're searching for are met ++ FileInputStream fins = file.read(null); ++ var ba = new ByteArray(); ++ for (;;) { ++ size_t bytes_read = fins.read(buffer, null); ++ if (bytes_read <= 0) ++ break; ++ ++ ba.append(buffer[0:bytes_read]); ++ ++ count += bytes_read; ++ ++ if (calc_md5) ++ md5_checksum.update(buffer, bytes_read); ++ ++ WebP.Data d = WebP.Data(); ++ d.bytes = ba.data; ++ ++ WebP.ParsingState state; ++ var demux = new WebP.Demuxer.partial(d, out state); ++ ++ if (state == WebP.ParsingState.PARSE_ERROR) { ++ is_corrupted = true; ++ break; ++ } ++ ++ if (state > WebP.ParsingState.PARSED_HEADER) { ++ detected.file_format = PhotoFileFormat.WEBP; ++ detected.format_name = "WebP"; ++ detected.channels = 4; ++ detected.bits_per_channel = 8; ++ detected.image_dim.width = (int) demux.get(WebP.FormatFeature.CANVAS_WIDTH); ++ detected.image_dim.height = (int) demux.get(WebP.FormatFeature.CANVAS_HEIGHT); ++ ++ // if not searching for anything else, exit ++ if (!calc_md5) ++ break; ++ } ++ } ++ ++ if (fins != null) ++ fins.close(null); ++ ++ if (calc_md5) ++ detected.md5 = md5_checksum.get_string(); ++ ++ return detected; ++ } ++} ++ ++private class WebpReader : PhotoFileReader { ++ public WebpReader(string filepath) { ++ base (filepath, PhotoFileFormat.WEBP); ++ } ++ ++ public override PhotoMetadata read_metadata() throws Error { ++ PhotoMetadata metadata = new PhotoMetadata(); ++ metadata.read_from_file(get_file()); ++ ++ return metadata; ++ } ++ ++ public override Gdk.Pixbuf unscaled_read() throws Error { ++ uint8[] buffer; ++ ++ FileUtils.get_data(this.get_filepath(), out buffer); ++ int width, height; ++ var pixdata = WebP.DecodeRGBA(buffer, out width, out height); ++ pixdata.length = width * height * 4; ++ ++ return new Gdk.Pixbuf.from_data(pixdata, Gdk.Colorspace.RGB, true, 8, width, height, width * 4); ++ } ++} ++ ++private class WebpMetadataWriter : PhotoFileMetadataWriter { ++ public WebpMetadataWriter(string filepath) { ++ base (filepath, PhotoFileFormat.TIFF); ++ } ++ ++ public override void write_metadata(PhotoMetadata metadata) throws Error { ++ metadata.write_to_file(get_file()); ++ } ++} ++ ++public bool is_webp(File file, Cancellable? cancellable = null) throws Error { ++ var ins = file.read(); ++ ++ uint8 buffer[12]; ++ try { ++ ins.read(buffer, null); ++ if (buffer[0] == 'R' && buffer[1] == 'I' && buffer[2] == 'F' && buffer[3] == 'F' && ++ buffer[8] == 'W' && buffer[9] == 'E' && buffer[10] == 'B' && buffer[11] == 'P') ++ return true; ++ } catch (Error error) { ++ debug ("Failed to read from file %s: %s", file.get_path (), error.message); ++ } ++ ++ return false; ++} ++ ++} +diff --git a/vapi/libwebp.vapi b/vapi/libwebp.vapi +new file mode 100644 +index 0000000..a19fbcf +--- /dev/null ++++ b/vapi/libwebp.vapi +@@ -0,0 +1,5 @@ ++[CCode (cheader_filename = "webp/decode.h")] ++namespace WebP { ++ [CCode (array_length = false, cname="WebPDecodeRGBA")] ++ public static uint8[] DecodeRGBA([CCode (array_length_pos=1)]uint8[] data, out int width, out int height); ++} +diff --git a/vapi/libwebpdemux.vapi b/vapi/libwebpdemux.vapi +new file mode 100644 +index 0000000..7612b42 +--- /dev/null ++++ b/vapi/libwebpdemux.vapi +@@ -0,0 +1,43 @@ ++namespace WebP { ++ [CCode (has_type_id = false)] ++ public struct Data { ++ [CCode (array_length_cname = "size")] ++ public unowned uint8[] bytes; ++ ++ public size_t size; ++ ++ [CCode (cname = "WebPDataClear")] ++ public void clear(); ++ } ++ ++ [CCode (cprefix = "WEBP_DEMUX_", cname = "WebPDemuxState")] ++ public enum ParsingState { ++ PARSE_ERROR, ++ PARSING_HEADER, ++ PARSED_HEADER, ++ DONE ++ } ++ ++ [CCode (cprefix = "WEBP_FF_")] ++ public enum FormatFeature { ++ FORMAT_FLAGS, ++ CANVAS_WIDTH, ++ CANVAS_HEIGHT, ++ LOOP_COUNT, ++ BACKGROUND_COLOR, ++ FRAME_COUNT ++ } ++ ++ [Compact] ++ [CCode (free_function = "WebPDemuxDelete", cname = "WebPDemuxer", cheader_filename = "webp/demux.h", has_type_id = false)] ++ public class Demuxer { ++ [CCode (cname="WebPDemux")] ++ public Demuxer(Data data); ++ ++ [CCode (cname="WebPDemuxPartial")] ++ public Demuxer.partial(Data data, out ParsingState state); ++ ++ [CCode (cname="WebPDemuxGetI")] ++ public uint32 get(FormatFeature feature); ++ } ++} diff --git a/debian/patches/0115-webp_part3.patch b/debian/patches/0115-webp_part3.patch new file mode 100644 index 0000000..4d992c4 --- /dev/null +++ b/debian/patches/0115-webp_part3.patch @@ -0,0 +1,22 @@ +From: Jens Georg <mail@jensge.org> +Date: Sat, 9 Feb 2019 16:43:15 +0100 +Subject: Fix an issue with the WEBP meta-data writer + +(cherry picked from commit 57ab1628883e3fde5bb3eafc0197b4e17354d2a6) +--- + src/photos/WebPSupport.vala | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/photos/WebPSupport.vala b/src/photos/WebPSupport.vala +index 093f196..2f4723c 100644 +--- a/src/photos/WebPSupport.vala ++++ b/src/photos/WebPSupport.vala +@@ -213,7 +213,7 @@ private class WebpReader : PhotoFileReader { + + private class WebpMetadataWriter : PhotoFileMetadataWriter { + public WebpMetadataWriter(string filepath) { +- base (filepath, PhotoFileFormat.TIFF); ++ base (filepath, PhotoFileFormat.WEBP); + } + + public override void write_metadata(PhotoMetadata metadata) throws Error { diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..2974978 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,4 @@ +0100-webp.patch +0105-vala_56.6.patch +0110-webp_part2.patch +0115-webp_part3.patch diff --git a/debian/replace_thumbnailer.sh b/debian/replace_thumbnailer.sh new file mode 100755 index 0000000..d70dec0 --- /dev/null +++ b/debian/replace_thumbnailer.sh @@ -0,0 +1,21 @@ +#! /bin/bash + +if [ -e /usr/lib/shotwell-video-thumbnailer.org ] ; then + echo ' /usr/lib/shotwell-video-thumbnailer.org exists!' + echo ' break' + exit 1 +fi + +echo '**** backup ****' +mv /usr/lib/shotwell-video-thumbnailer /usr/lib/shotwell-video-thumbnailer.org + +echo '**** install ffmpegthumbnailer ****' +apt-get install ffmpegthumbnailer -y + +echo '**** install new file ****' +touch /usr/lib/shotwell-video-thumbnailer +chmod --reference=/usr/lib/shotwell-video-thumbnailer.org /usr/lib/shotwell-video-thumbnailer + +echo '#! /bin/bash' >/usr/lib/shotwell-video-thumbnailer +echo '' >>/usr/lib/shotwell-video-thumbnailer +echo 'ffmpegthumbnailer -i "$1" -o - -c png' >>/usr/lib/shotwell-video-thumbnailer diff --git a/debian/rules b/debian/rules new file mode 100755 index 0000000..e8ca0d5 --- /dev/null +++ b/debian/rules @@ -0,0 +1,28 @@ +#!/usr/bin/make -f + +export DEB_BUILD_MAINT_OPTIONS = hardening=+all + +export VALAFLAGS:=$(foreach w,$(CPPFLAGS) $(CFLAGS) $(LDFLAGS),-X $(w)) + +#Enable the apport option when building of Ubuntu +ifeq ($(shell dpkg-vendor --derives-from Ubuntu && echo yes),yes) + APPORT = -Dinstall-apport-hook=true +endif + +%: + dh $@ --buildsystem=meson --with gnome + +override_dh_auto_configure: + dh_auto_configure -- \ + --libexec=/usr/libexec \ + -Dunity-support=true $(APPORT) + +override_dh_gnome_clean: + dh_gnome_clean --no-control + +override_dh_install: + dh_install + # Remove unwanted la files + rm -f debian/shotwell/usr/lib/*/shotwell/plugins/builtin/*.la + rm -f debian/shotwell/usr/lib/*/*shotwell*.a + rm -f debian/shotwell/usr/lib/*/*shotwell*.la diff --git a/debian/shotwell-common.README.Debian b/debian/shotwell-common.README.Debian new file mode 120000 index 0000000..e5d7439 --- /dev/null +++ b/debian/shotwell-common.README.Debian @@ -0,0 +1 @@ +shotwell.README.Debian
\ No newline at end of file diff --git a/debian/shotwell-common.install b/debian/shotwell-common.install new file mode 100644 index 0000000..191266c --- /dev/null +++ b/debian/shotwell-common.install @@ -0,0 +1,4 @@ +usr/share/glib-2.0 +usr/share/help +usr/share/icons +usr/share/locale diff --git a/debian/shotwell-common.postrm b/debian/shotwell-common.postrm new file mode 100644 index 0000000..63c29ce --- /dev/null +++ b/debian/shotwell-common.postrm @@ -0,0 +1,18 @@ +#!/bin/sh + +set -e + + +case "$1" in + purge|remove) + + # + # rebuild icon cache + # + if [ -x gtk-update-icon-cache ] ; then + gtk-update-icon-cache /usr/share/icons/hicolor + fi + +esac + +#DEBHELPER# diff --git a/debian/shotwell.README.Debian b/debian/shotwell.README.Debian new file mode 100644 index 0000000..d9ded6c --- /dev/null +++ b/debian/shotwell.README.Debian @@ -0,0 +1,25 @@ +TROUBLESHOOTING +--------------- + +- video-thumbnailer + + On problems with the shotwell-video-thumbnailer you can + switch to the ffmpegthumnailer. Please run as root: + + 1. Backup /usr/lib/shotwell-video-thumbnailer: + * mv /usr/lib/shotwell-video-thumbnailer /usr/lib/shotwell-video-thumbnailer.org + + 2. Install ffmpegthumbnailer: + * apt-get install ffmpegthumbnailer + + 3. Create a new executable file: + * touch /usr/lib/shotwell-video-thumbnailer + * chmod --reference=/usr/lib/shotwell-video-thumbnailer.org /usr/lib/shotwell-video-thumbnailer + + 4. Write into the new file: + * echo "#! /bin/bash" >/usr/lib/shotwell-video-thumbnailer + * echo "ffmpegthumnailer -i \"$1\" -o -b -c png >>/usr/lib/shotwell-video-thumbnailer + + Or you can use the file replace_thumbnail.sh from the examples directory. + + Thanks to Teo Romera <teoromera@gmail.com> diff --git a/debian/shotwell.bug-script b/debian/shotwell.bug-script new file mode 100644 index 0000000..bcb8409 --- /dev/null +++ b/debian/shotwell.bug-script @@ -0,0 +1,28 @@ +#!/bin/bash + +REPORTBUG_VERSION=$(dpkg-query -f '${source:Version}' -W reportbug) +LOG_FILE='~/.cache/shotwell/shotwell.log' + +# Depending on whether reportbug is new enough, we either write the output of +# our various commands to a file and attach them to the report (this needs +# reportbug ≥ 6.5.0) or just write them to the body of the bug report. +if dpkg --compare-versions "$REPORTBUG_VERSION" ge "6.5.0"; then + + # We don’t clean up this directory because there is no way to know when + # reportbug finished running, and reportbug needs the files around. + # Given that those are just a couple of kilobytes in size and people + # generally don’t file a lot of bugs, I don’t think it’s a big deal. + DIR=$(mktemp -d) + + echo "-- BEGIN ATTACHMENTS --" >&3 + + # + # logfile + # + if [ -f ${LOG_FILE} ]; then + cat ${LOG_FILE} >$DIR/logfile.user + echo $DIR/logfile.user >&3 + fi + + echo "-- END ATTACHMENTS --" >&3 +fi diff --git a/debian/shotwell.docs b/debian/shotwell.docs new file mode 100644 index 0000000..b718ec9 --- /dev/null +++ b/debian/shotwell.docs @@ -0,0 +1,3 @@ +README.md +THANKS +NEWS diff --git a/debian/shotwell.examples b/debian/shotwell.examples new file mode 100644 index 0000000..128a3c5 --- /dev/null +++ b/debian/shotwell.examples @@ -0,0 +1 @@ +debian/replace_thumbnailer.sh diff --git a/debian/shotwell.install b/debian/shotwell.install new file mode 100644 index 0000000..82e5fe8 --- /dev/null +++ b/debian/shotwell.install @@ -0,0 +1,7 @@ +usr/bin +usr/lib +usr/share/applications +usr/share/metainfo +usr/libexec/shotwell/shotwell-settings-migrator +usr/libexec/shotwell/shotwell-video-thumbnailer +usr/share/apport/package-hooks/shotwell.py diff --git a/debian/shotwell.lintian-overrides b/debian/shotwell.lintian-overrides new file mode 100644 index 0000000..0dd035f --- /dev/null +++ b/debian/shotwell.lintian-overrides @@ -0,0 +1,2 @@ +link-to-shared-library-in-wrong-package +package-name-doesnt-match-sonames libshotwell-authenticator0 libshotwell-plugin-common0 libshotwell-plugin-dev-1.0-0 diff --git a/debian/shotwell.manpages b/debian/shotwell.manpages new file mode 100644 index 0000000..b364be3 --- /dev/null +++ b/debian/shotwell.manpages @@ -0,0 +1,2 @@ +usr/share/man/man1/shotwell.1 + diff --git a/debian/shotwell.postrm b/debian/shotwell.postrm new file mode 100644 index 0000000..2dbce77 --- /dev/null +++ b/debian/shotwell.postrm @@ -0,0 +1,15 @@ +#!/bin/sh + +set -e + +if [ "$1" = purge ]; then + + # + # remove backup files + # + if [ -e /usr/lib/shotwell-video-thumbnailer.org ] ; then + rm -f /usr/lib/shotwell-video-thumbnailer.org + fi +fi + +#DEBHELPER# diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/debian/watch b/debian/watch new file mode 100644 index 0000000..81fb209 --- /dev/null +++ b/debian/watch @@ -0,0 +1,3 @@ +version=4 +https://download.gnome.org/sources/@PACKAGE@/([\d\.]+[02468])/ \ + @PACKAGE@@ANY_VERSION@\.tar\.xz |