Merge branch 'jakedane-master-patch-02769' into 'master'

desktop: Remove obsolete Bugzilla entries

See merge request GNOME/gnome-keyring!55

7 files changed, 9 insertions, 29 deletions

diff --git a/daemon/.gitignore b/daemon/.gitignore
index 47cec83d..da51999f 100644
--- a/daemon/.gitignore
+++ b/daemon/.gitignore
@@ -4,8 +4,5 @@
 /org.freedesktop.secrets.service
 /org.freedesktop.impl.portal.Secret.service
 /gnome-keyring-pkcs11.desktop
-/gnome-keyring-pkcs11.desktop.in
 /gnome-keyring-secrets.desktop
-/gnome-keyring-secrets.desktop.in
 /gnome-keyring-ssh.desktop
-/gnome-keyring-ssh.desktop.in
diff --git a/daemon/Makefile.am b/daemon/Makefile.am
index aa0d3a8d..a6424f9d 100644
--- a/daemon/Makefile.am
+++ b/daemon/Makefile.am
@@ -57,14 +57,13 @@ EXTRA_DIST += \
 endif
 
 desktopdir = $(sysconfdir)/xdg/autostart
-desktop_in_in_files = \
-	daemon/gnome-keyring-pkcs11.desktop.in.in \
-	daemon/gnome-keyring-secrets.desktop.in.in \
-	daemon/gnome-keyring-ssh.desktop.in.in \
+desktop_in_files = \
+	daemon/gnome-keyring-pkcs11.desktop.in \
+	daemon/gnome-keyring-secrets.desktop.in \
+	daemon/gnome-keyring-ssh.desktop.in \
 	$(NULL)
-desktop_in_files = $(desktop_in_in_files:.desktop.in.in=.desktop.in)
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
-.desktop.in.in.desktop.in:
+$(desktop_DATA): $(desktop_in_files)
 	$(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
 
 portaldir = $(datadir)/xdg-desktop-portal/portals
@@ -72,8 +71,7 @@ dist_portal_DATA = daemon/gnome-keyring.portal
 
 EXTRA_DIST += \
 	$(service_in_files) \
-	$(desktop_in_files) \
-	$(desktop_in_in_files)
+	$(desktop_in_files)
 
 CLEANFILES += \
 	$(service_DATA) \
diff --git a/daemon/gnome-keyring-pkcs11.desktop.in.in b/daemon/gnome-keyring-pkcs11.desktop.in
index b43e1e9d..3e36603f 100644
--- a/daemon/gnome-keyring-pkcs11.desktop.in.in
+++ b/daemon/gnome-keyring-pkcs11.desktop.in
@@ -8,7 +8,3 @@ NoDisplay=true
 X-GNOME-Autostart-Phase=PreDisplayServer
 X-GNOME-AutoRestart=false
 X-GNOME-Autostart-Notify=true
-X-GNOME-Bugzilla-Bugzilla=GNOME
-X-GNOME-Bugzilla-Product=gnome-keyring
-X-GNOME-Bugzilla-Component=general
-X-GNOME-Bugzilla-Version=@VERSION@
diff --git a/daemon/gnome-keyring-secrets.desktop.in.in b/daemon/gnome-keyring-secrets.desktop.in
index dd9deec7..799caeea 100644
--- a/daemon/gnome-keyring-secrets.desktop.in.in
+++ b/daemon/gnome-keyring-secrets.desktop.in
@@ -8,7 +8,3 @@ NoDisplay=true
 X-GNOME-Autostart-Phase=PreDisplayServer
 X-GNOME-AutoRestart=false
 X-GNOME-Autostart-Notify=true
-X-GNOME-Bugzilla-Bugzilla=GNOME
-X-GNOME-Bugzilla-Product=gnome-keyring
-X-GNOME-Bugzilla-Component=general
-X-GNOME-Bugzilla-Version=@VERSION@
diff --git a/daemon/gnome-keyring-ssh.desktop.in.in b/daemon/gnome-keyring-ssh.desktop.in
index 38aa24cb..fd7657a4 100644
--- a/daemon/gnome-keyring-ssh.desktop.in.in
+++ b/daemon/gnome-keyring-ssh.desktop.in
@@ -7,7 +7,3 @@ OnlyShowIn=GNOME;Unity;MATE;
 X-GNOME-Autostart-Phase=PreDisplayServer
 X-GNOME-AutoRestart=false
 X-GNOME-Autostart-Notify=true
-X-GNOME-Bugzilla-Bugzilla=GNOME
-X-GNOME-Bugzilla-Product=gnome-keyring
-X-GNOME-Bugzilla-Component=general
-X-GNOME-Bugzilla-Version=@VERSION@
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 0c9cd4b1..b3a4ef24 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -3,9 +3,9 @@
 daemon/dbus/gkd-secret-change.c
 daemon/dbus/gkd-secret-create.c
 daemon/dbus/gkd-secret-unlock.c
-daemon/gnome-keyring-pkcs11.desktop.in.in
-daemon/gnome-keyring-secrets.desktop.in.in
-daemon/gnome-keyring-ssh.desktop.in.in
+daemon/gnome-keyring-pkcs11.desktop.in
+daemon/gnome-keyring-secrets.desktop.in
+daemon/gnome-keyring-ssh.desktop.in
 daemon/login/gkd-login.c
 daemon/login/gkd-login-interaction.c
 daemon/ssh-agent/gkd-ssh-agent-interaction.c
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index e652b97a..4ed1ef69 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -1,6 +1,3 @@
-daemon/gnome-keyring-secrets.desktop.in
-daemon/gnome-keyring-ssh.desktop.in
-daemon/gnome-keyring-pkcs11.desktop.in
 daemon/org.freedesktop.secrets.service.in
 daemon/org.gnome.keyring.service.in