Bug#878804: RFS: shotwell/0.26.3-1
Jörg, I can sponsor this for you since I have been maintaining
shotwell in Ubuntu this year.
1. Please add a Breaks to shotwell instead of just a Replaces. It
wouldn't hurt to bump the version too like this:
Breaks: shotwell-common (<< 0.26.3-1)
Replaces: shotwell-common (<< 0.26.3-1)
I think you can remove this line though
Breaks: shotwell (<< 0.26.2-1)
2. Please remove all the obsolete patches from your debian/patches/
instead of just disabling them.
3. I'm attaching a patch to fix the install of appstream metadata.
You'll also need to modify debian/shotwell.install to install the
metadata.
--- debian/shotwell.install 2017-09-22 17:26:18.000000000 -0400
+++ ../debian/shotwell.install 2017-10-22 15:59:36.667571371 -0400
@@ -1,3 +1,4 @@
usr/bin
usr/lib
usr/share/applications
+usr/share/appdata
Thanks,
Jeremy Bicha
From 15cc83b25c44939571d42210cbb02a7825756b8c Mon Sep 17 00:00:00 2001
From: Thomas Moschny <thomas.moschny@gmx.de>
Date: Sun, 13 Aug 2017 09:47:00 +0000
Subject: Fix rules for appstream files
The appdata file is neither created nor installed, as the rules in
@APPSTREAM_XML_RULES@ expect files to be listed in $(appstream_XML)
rather than in $(appdata_XML).
https://bugzilla.gnome.org/show_bug.cgi?id=784883
---
misc/Makefile.am | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/misc/Makefile.am b/misc/Makefile.am
index 711b06f..aa9a2bd 100644
--- a/misc/Makefile.am
+++ b/misc/Makefile.am
@@ -2,14 +2,14 @@ gsettings_SCHEMAS = \
org.yorba.shotwell.gschema.xml \
org.yorba.shotwell-extras.gschema.xml
-appdata_in_files = $(srcdir)/shotwell.appdata.xml.in
-appdata_XML = \
+appstream_in_files = $(srcdir)/shotwell.appdata.xml.in
+appstream_XML = \
shotwell.appdata.xml
desktopdir = $(datadir)/applications
desktop_DATA = shotwell.desktop shotwell-viewer.desktop
-$(appdata_XML) : $(appdata_in_files)
+$(appstream_XML) : $(appstream_in_files)
$(AM_V_GEN) $(MSGFMT) --xml --template $< -d $(top_srcdir)/po -o $@
%.desktop.in : %.desktop.in.in
@@ -21,12 +21,12 @@ $(appdata_XML) : $(appdata_in_files)
@GSETTINGS_RULES@
@APPSTREAM_XML_RULES@
-CLEANFILES = $(appdata_XML) $(desktop_DATA) $(desktop_in_files)
+CLEANFILES = $(appstream_XML) $(desktop_DATA) $(desktop_in_files)
dist_noinst_DATA = \
$(srcdir)/shotwell.desktop.in.in \
$(srcdir)/shotwell-viewer.desktop.in.in \
$(gsettings_SCHEMAS) \
- $(appdata_in_files)
+ $(appstream_in_files)
-include $(top_srcdir)/git.mk
Reply to: