Package: release.debian.org
Severity: normal
User: release.debian....@packages.debian.org
Usertags: unblock

Hello!

The gnome-logs package unfortunately ships broken files
which makes it not possible to start from a GUI.
(See http://bugs.debian.org/770148 )

I'd like to ask for pre-approval of the following filtered
debdiff which was prepared using:

debdiff /var/cache/pbuilder/result/gnome-logs_3.14.[12]-1*.dsc | filterdiff -x 
'*/po/*' -x '*/ChangeLog' -x '*/configure' -x '*/Makefile.in'

ie. excluding translations and autogenerated files.

=========================================================


diff -Nru gnome-logs-3.14.1/ChangeLog gnome-logs-3.14.2/ChangeLog
diff -Nru gnome-logs-3.14.1/configure gnome-logs-3.14.2/configure
diff -Nru gnome-logs-3.14.1/configure.ac gnome-logs-3.14.2/configure.ac
--- gnome-logs-3.14.1/configure.ac      2014-10-13 21:20:25.000000000 +0200
+++ gnome-logs-3.14.2/configure.ac      2014-11-10 23:00:40.000000000 +0100
@@ -1,5 +1,5 @@
 AC_INIT([Logs],
-        [3.14.1],
+        [3.14.2],
         [dav...@gnome.org],
         [gnome-logs],
         [https://wiki.gnome.org/Apps/Logs])
@@ -15,6 +15,7 @@
 dnl Check for programs
 AC_PROG_CC
 AM_PROG_CC_C_O
+AC_PROG_SED
 
 GNOME_COMPILE_WARNINGS([maximum])
 
@@ -93,7 +94,6 @@
 PKG_CHECK_MODULES([LOGS], [$GIO_REQUIRED $GTK_REQUIRED 
$SYSTEMD_JOURNAL_REQUIRED])
 
 AC_CONFIG_FILES([
-data/org.gnome.Logs.service
 data/version.xml
 help/Makefile
 Makefile
diff -Nru gnome-logs-3.14.1/data/org.gnome.Logs.appdata.xml.in 
gnome-logs-3.14.2/data/org.gnome.Logs.appdata.xml.in
--- gnome-logs-3.14.1/data/org.gnome.Logs.appdata.xml.in        2014-08-18 
13:36:08.000000000 +0200
+++ gnome-logs-3.14.2/data/org.gnome.Logs.appdata.xml.in        2014-10-28 
08:43:43.000000000 +0100
@@ -4,10 +4,9 @@
     <id type="desktop">org.gnome.Logs.desktop</id>
     <metadata_license>CC0-1.0</metadata_license>
     <project_license>GPL-3.0+</project_license>
-<!-- Both taken from desktop file.
-    <name>Logs</name>
-    <summary>View detailed event logs for the system</summary>
--->
+<!-- Name and summary taken from the desktop file. -->
+    <_name>Logs</_name>
+    <_summary>View detailed event logs for the system</_summary>
     <description>
         <_p>Logs shows events from the systemd journal, and sorts them into
         categories, such as hardware and applications.</_p>
diff -Nru gnome-logs-3.14.1/debian/changelog gnome-logs-3.14.2/debian/changelog
--- gnome-logs-3.14.1/debian/changelog  2014-10-19 23:09:59.000000000 +0200
+++ gnome-logs-3.14.2/debian/changelog  2014-11-19 15:45:37.000000000 +0100
@@ -1,3 +1,10 @@
+gnome-logs (3.14.2-1) unstable; urgency=medium
+
+  * New upstream release
+    - fixes desktop file generation (Closes: #770148)
+
+ -- Andreas Henriksson <andr...@fatal.se>  Wed, 19 Nov 2014 15:45:34 +0100
+
 gnome-logs (3.14.1-1) unstable; urgency=medium
 
   * New upstream release.
diff -Nru gnome-logs-3.14.1/help/Makefile.in gnome-logs-3.14.2/help/Makefile.in
diff -Nru gnome-logs-3.14.1/Makefile.am gnome-logs-3.14.2/Makefile.am
--- gnome-logs-3.14.1/Makefile.am       2014-09-12 17:32:12.000000000 +0200
+++ gnome-logs-3.14.2/Makefile.am       2014-11-10 23:00:20.000000000 +0100
@@ -80,8 +80,12 @@
 $(desktop_in_files:.desktop.in=.desktop): data/.dstamp
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 
+data/org.gnome.Logs.service: data/org.gnome.Logs.service.in
+       $(AM_V_GEN)$(SED) -e "s|[@]bindir[@]|$(bindir)|" $< > $@
+
 servicedir = $(datadir)/dbus-1/services
-service_DATA = data/org.gnome.Logs.service
+service_in_files = data/org.gnome.Logs.service.in
+service_DATA = $(service_in_files:.service.in=.service)
 
 if ENABLE_MAN
 data/gnome-logs.1: data/gnome-logs.xml
@@ -172,6 +176,7 @@
        $(noinst_resource_files) \
        $(appstream_in_files) \
        $(desktop_in_files) \
+       $(service_in_files) \
        data/org.gnome.Logs.gresource.xml \
        data/gnome-logs.xml \
        data/icons/gnome-logs.svg
@@ -198,6 +203,7 @@
        $(desktop_DATA) \
        $(enum_data) \
        $(nodist_man_MANS) \
+       $(service_DATA) \
        src/gl-resource.c \
        src/gl-resource.h \
        test-desktop-file-validate.sh
diff -Nru gnome-logs-3.14.1/Makefile.in gnome-logs-3.14.2/Makefile.in
diff -Nru gnome-logs-3.14.1/NEWS gnome-logs-3.14.2/NEWS
--- gnome-logs-3.14.1/NEWS      2014-10-13 21:21:28.000000000 +0200
+++ gnome-logs-3.14.2/NEWS      2014-11-10 23:02:05.000000000 +0100
@@ -1,3 +1,10 @@
+GNOME Logs 3.14.2
+=================
+
+* substitute binary path in service file correctly
+* add elements to AppData to fix validation
+* Thai translation
+
 GNOME Logs 3.14.1
 =================
 
diff -Nru gnome-logs-3.14.1/po/kk.po gnome-logs-3.14.2/po/kk.po
diff -Nru gnome-logs-3.14.1/po/LINGUAS gnome-logs-3.14.2/po/LINGUAS
diff -Nru gnome-logs-3.14.1/po/th.po gnome-logs-3.14.2/po/th.po
diff -Nru gnome-logs-3.14.1/src/gl-eventviewlist.c 
gnome-logs-3.14.2/src/gl-eventviewlist.c
--- gnome-logs-3.14.1/src/gl-eventviewlist.c    2014-07-21 21:21:36.000000000 
+0200
+++ gnome-logs-3.14.2/src/gl-eventviewlist.c    2014-11-10 23:00:20.000000000 
+0100
@@ -924,6 +924,7 @@
             break;
         case PROP_MODE:
             g_value_set_enum (value, priv->mode);
+            break;
         default:
             G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
             break;

=========================================================


If you approve of this upload then
please unblock package gnome-logs

unblock gnome-logs/3.14.2-1

-- System Information:
Debian Release: jessie/sid
  APT prefers testing-updates
  APT policy: (500, 'testing-updates'), (500, 'testing'), (1, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 3.16.0-4-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_DK.UTF-8, LC_CTYPE=en_DK.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash


-- 
To UNSUBSCRIBE, email to debian-release-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/20141119171723.ga9...@fatal.se

Reply via email to