Source: shotwell Version: 0.25.4+really0.24.5-0.1 Tags: patch Here are some various packaging tweaks.
By the way, you could package shotwell 0.25.90 for experimental if you wanted to. Or just wait for 0.26.0, expected approximately March 22. The libgdata patch is only needed for 0.25.90+ Thanks, Jeremy Bicha
From 4f15e38571b9e66179e29d5276275941c466df4f Mon Sep 17 00:00:00 2001 From: Jeremy Bicha <jbi...@ubuntu.com> Date: Fri, 3 Mar 2017 23:11:35 -0500 Subject: [PATCH 1/5] Build-Depend on libgdata-dev Don't Build-Depend on m4 since dh-autoreconf already pulls it in --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index a1b0420..44bf34d 100644 --- a/debian/control +++ b/debian/control @@ -9,6 +9,7 @@ Build-Depends: itstool, libexif-dev (>= 0.6.16), libgcr-3-dev, + libgdata-dev, libgee-0.8-dev (>= 0.10), libgexiv2-dev (>= 0.10.4), libglib2.0-dev (>= 2.40), @@ -25,7 +26,6 @@ Build-Depends: libsqlite3-dev (>= 3.5.9), libwebkit2gtk-4.0-dev, libxml2 (>= 2.6.32), - m4, valac (>= 0.22.0) Standards-Version: 3.9.8 Homepage: https://wiki.gnome.org/Apps/Shotwell -- 2.10.2
From e03e39a8b41dabc814f04127ae7a7baa7fb29ad0 Mon Sep 17 00:00:00 2001 From: Jeremy Bicha <jbi...@ubuntu.com> Date: Fri, 3 Mar 2017 23:13:28 -0500 Subject: [PATCH 2/5] Update debian/watch to only look for stable releases watch file copied from pkg-gnome --- debian/watch | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/watch b/debian/watch index 99c74ae..ac38817 100644 --- a/debian/watch +++ b/debian/watch @@ -1,2 +1,3 @@ version=4 -http://ftp.gnome.org/pub/gnome/sources/shotwell/([\d\.]+)/shotwell-([\d\.]+)\.tar\.xz +https://download.gnome.org/sources/@PACKAGE@/([\d\.]+[02468])/ \ + @PACKAGE@@ANY_VERSION@\.tar\.xz -- 2.10.2
From a4c9ad01a09b07535ea8f1c910f850271d29cb71 Mon Sep 17 00:00:00 2001 From: Jeremy Bicha <jbi...@ubuntu.com> Date: Fri, 3 Mar 2017 23:22:41 -0500 Subject: [PATCH 3/5] Set libexecdir to /usr/lib/shotwell/ --- debian/rules | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/debian/rules b/debian/rules index f8d940b..628ebb2 100755 --- a/debian/rules +++ b/debian/rules @@ -10,7 +10,9 @@ B_DATE:=$(shell LC_ALL=C date --utc -d "$(CHDATE)") dh $@ override_dh_auto_configure: - ./configure --prefix=/usr --libexec=/usr/lib --disable-schemas-compile + dh_auto_configure --prefix=/usr \ + --libexec=/usr/lib/shotwell \ + --disable-schemas-compile override_dh_install: dh_install @@ -24,7 +26,7 @@ override_dh_install: rm -fr debian/shotwell-dbg/usr/share/doc/shotwell-dbg/temp-source # Remove unwanted la files rm -f debian/shotwell/usr/lib/shotwell/plugins/builtin/*.la - rm -f debian/shotwell/usr/lib/*.la + rm -f debian/shotwell/usr/lib/shotwell/*.la override_dh_installchangelogs: dh_installchangelogs NEWS -- 2.10.2
From a9dce27382182df420cbd153724c6b1c4cc69680 Mon Sep 17 00:00:00 2001 From: Jeremy Bicha <jbi...@ubuntu.com> Date: Fri, 3 Mar 2017 23:38:42 -0500 Subject: [PATCH 4/5] Drop obsolete debian/menu --- debian/menu | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 debian/menu diff --git a/debian/menu b/debian/menu deleted file mode 100644 index a9e689e..0000000 --- a/debian/menu +++ /dev/null @@ -1,2 +0,0 @@ -?package(shotwell):needs="X11" section="Applications/Viewers"\ - title="Shotwell" command="/usr/bin/shotwell" -- 2.10.2
From bf9262569de5044637687a13c61c7cfb26c771bd Mon Sep 17 00:00:00 2001 From: Jeremy Bicha <jbi...@ubuntu.com> Date: Fri, 3 Mar 2017 23:50:45 -0500 Subject: [PATCH 5/5] Move .desktop and appstream metadata from shotwell-common to shotwell https://wiki.debian.org/AppStream/Guidelines#General --- debian/control | 2 ++ debian/rules | 4 ---- debian/shotwell-common.install | 6 +++++- debian/shotwell.1 | 14 -------------- debian/shotwell.install | 2 ++ 5 files changed, 9 insertions(+), 19 deletions(-) delete mode 100644 debian/shotwell.1 diff --git a/debian/control b/debian/control index 44bf34d..7204494 100644 --- a/debian/control +++ b/debian/control @@ -41,6 +41,8 @@ Depends: dconf-cli, default-dbus-session-bus | dbus-session-bus, librsvg2-common +Breaks: shotwell (<< 0.25.90-1) +Replaces: shotwell (<< 0.25.90-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 diff --git a/debian/rules b/debian/rules index 628ebb2..877b2f1 100755 --- a/debian/rules +++ b/debian/rules @@ -36,7 +36,3 @@ override_dh_strip: override_dh_compress: dh_compress -X.tar.xz - -override_dh_installman: - dh_installman - rm -fr debian/shotwell-common/usr/share/man diff --git a/debian/shotwell-common.install b/debian/shotwell-common.install index dd222db..2d160cf 100644 --- a/debian/shotwell-common.install +++ b/debian/shotwell-common.install @@ -1 +1,5 @@ -usr/share +usr/share/glib-2.0 +usr/share/help +usr/share/icons +usr/share/locale +usr/share/shotwell diff --git a/debian/shotwell.1 b/debian/shotwell.1 deleted file mode 100644 index e68bcc2..0000000 --- a/debian/shotwell.1 +++ /dev/null @@ -1,14 +0,0 @@ -.TH shotwell 1 "December 30, 2009" -.SH NAME -shotwell \- a digital photo organizer -.SH DESCRIPTION -.B shotwell -is a digital photo organizer designed for the GNOME desktop environment. It -allows you to import photos from disk or camera, organize them in various ways, -view them in full-window or fullscreen mode, and export them to share with -others. -.SH AUTHOR -shotwell was written by Jim Nelson, Lucas Beeler and Allison Barlow. -.PP -This manual page was written by Devid Antonio Filoni <d.fil...@ubuntu.com>, -for the Debian project (and may be used by others). diff --git a/debian/shotwell.install b/debian/shotwell.install index 527b78f..4afb4cf 100644 --- a/debian/shotwell.install +++ b/debian/shotwell.install @@ -1,2 +1,4 @@ usr/bin usr/lib +usr/share/appdata +usr/share/applications -- 2.10.2
