Your message dated Wed, 26 Nov 2014 19:05:40 +0100
with message-id <[email protected]>
and subject line Re: Bug#771086: unblock: gnome-shell/3.14.1-2
has caused the Debian Bug report #771086,
regarding unblock: gnome-shell/3.14.1-2
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [email protected]
immediately.)
--
771086: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=771086
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Package: release.debian.org
Severity: normal
User: [email protected]
Usertags: unblock
Please unblock package gnome-shell
This updates the default GNOME browser to iceweasel, fixes Nautilus'
desktop name and incorporates a patch to fix calculation of week numbers.
unblock gnome-shell/3.14.1-2
Diff attached.
-- System Information:
Debian Release: jessie/sid
APT prefers unstable
APT policy: (500, 'unstable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 3.16.0-4-amd64 (SMP w/4 CPU cores)
Locale: LANG=ca_ES.UTF-8, LC_CTYPE=ca_ES.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru gnome-shell-3.14.1/debian/changelog gnome-shell-3.14.1/debian/changelog
--- gnome-shell-3.14.1/debian/changelog 2014-10-18 02:26:01.000000000 +0200
+++ gnome-shell-3.14.1/debian/changelog 2014-11-26 12:05:19.000000000 +0100
@@ -1,3 +1,18 @@
+gnome-shell (3.14.1-2) unstable; urgency=medium
+
+ [ Laurent Bigonville ]
+ * debian/gnome-shell.gsettings-override: nautilus.desktop has been renamed
+ to org.gnome.Nautilus.desktop
+ * debian/gnome-shell.gsettings-override: Replace epiphany by iceweasel, the
+ gnome metapackage is depending against iceweasel and we want new users to
+ have a webbrowser.
+
+ [ Jordi Mallach ]
+ * Add 50-compute-weeknumber-with-gdatetime.patch: Fix miscalculation of
+ week number in the calendar (closes: #769118).
+
+ -- Jordi Mallach <[email protected]> Wed, 26 Nov 2014 02:17:03 +0100
+
gnome-shell (3.14.1-1) unstable; urgency=medium
* New upstream release.
diff -Nru gnome-shell-3.14.1/debian/control gnome-shell-3.14.1/debian/control
--- gnome-shell-3.14.1/debian/control 2014-10-18 02:32:50.000000000 +0200
+++ gnome-shell-3.14.1/debian/control 2014-11-26 17:25:23.000000000 +0100
@@ -6,7 +6,7 @@
Section: gnome
Priority: optional
Maintainer: Debian GNOME Maintainers <[email protected]>
-Uploaders: Andreas Henriksson <[email protected]>, Laurent Bigonville <[email protected]>
+Uploaders: Andreas Henriksson <[email protected]>, Jordi Mallach <[email protected]>, Laurent Bigonville <[email protected]>
Build-Depends: autotools-dev,
cdbs,
debhelper (>= 8.1.3~),
diff -Nru gnome-shell-3.14.1/debian/gnome-shell.gsettings-override gnome-shell-3.14.1/debian/gnome-shell.gsettings-override
--- gnome-shell-3.14.1/debian/gnome-shell.gsettings-override 2013-02-26 21:48:17.000000000 +0100
+++ gnome-shell-3.14.1/debian/gnome-shell.gsettings-override 2014-11-26 02:16:36.000000000 +0100
@@ -1,2 +1,2 @@
[org.gnome.shell]
-favorite-apps=[ 'epiphany.desktop', 'evolution.desktop', 'empathy.desktop', 'rhythmbox.desktop', 'shotwell.desktop', 'libreoffice-writer.desktop', 'nautilus.desktop', 'yelp.desktop' ]
+favorite-apps=[ 'iceweasel.desktop', 'evolution.desktop', 'empathy.desktop', 'rhythmbox.desktop', 'shotwell.desktop', 'libreoffice-writer.desktop', 'org.gnome.Nautilus.desktop', 'yelp.desktop' ]
diff -Nru gnome-shell-3.14.1/debian/patches/50-compute-weeknumber-with-gdatetime.patch gnome-shell-3.14.1/debian/patches/50-compute-weeknumber-with-gdatetime.patch
--- gnome-shell-3.14.1/debian/patches/50-compute-weeknumber-with-gdatetime.patch 1970-01-01 01:00:00.000000000 +0100
+++ gnome-shell-3.14.1/debian/patches/50-compute-weeknumber-with-gdatetime.patch 2014-11-26 02:19:42.000000000 +0100
@@ -0,0 +1,53 @@
+From 29673deac7e1c34127b0ac1484d0e7766ecc9acc Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Florian=20M=C3=BCllner?= <[email protected]>
+Date: Thu, 13 Nov 2014 15:14:56 +0000
+Subject: [PATCH] calendar: Stop computing week number ourselves
+
+Correctly computing the ISO week number is tricky and we already
+have code in the platform to do it, so just refer its computation
+to GDateTime rather than doing it ourselves.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=736722
+---
+ js/ui/calendar.js | 19 +------------------
+ 1 file changed, 1 insertion(+), 18 deletions(-)
+
+diff --git a/js/ui/calendar.js b/js/ui/calendar.js
+index bc51d20..6edf69f 100644
+--- a/js/ui/calendar.js
++++ b/js/ui/calendar.js
+@@ -88,23 +88,6 @@ function _formatEventTime(event, clockFormat, periodBegin, periodEnd) {
+ return ret;
+ }
+
+-function _getCalendarWeekForDate(date) {
+- // Based on the algorithms found here:
+- // http://en.wikipedia.org/wiki/Talk:ISO_week_date
+- let midnightDate = new Date(date.getFullYear(), date.getMonth(), date.getDate());
+- // Need to get Monday to be 1 ... Sunday to be 7
+- let dayOfWeek = 1 + ((midnightDate.getDay() + 6) % 7);
+- let nearestThursday = new Date(midnightDate.getFullYear(), midnightDate.getMonth(),
+- midnightDate.getDate() + (4 - dayOfWeek));
+-
+- let jan1st = new Date(nearestThursday.getFullYear(), 0, 1);
+- let diffDate = nearestThursday - jan1st;
+- let dayNumber = Math.floor(Math.abs(diffDate) / MSECS_IN_DAY);
+- let weekNumber = Math.floor(dayNumber / 7) + 1;
+-
+- return weekNumber;
+-}
+-
+ function _getCalendarDayAbbreviation(dayNumber) {
+ let abbreviations = [
+ /* Translators: Calendar grid abbreviation for Sunday.
+@@ -672,7 +655,7 @@ const Calendar = new Lang.Class({
+ this._buttons.push(button);
+
+ if (this._useWeekdate && iter.getDay() == 4) {
+- let label = new St.Label({ text: _getCalendarWeekForDate(iter).toString(),
++ let label = new St.Label({ text: iter.toLocaleFormat('%V'),
+ style_class: 'calendar-day-base calendar-week-number'});
+ layout.attach(label, rtl ? 7 : 0, row, 1, 1);
+ }
+--
+2.1.0
\ No hi ha cap caràcter de salt de línia al final del fitxer
diff -Nru gnome-shell-3.14.1/debian/patches/series gnome-shell-3.14.1/debian/patches/series
--- gnome-shell-3.14.1/debian/patches/series 2014-10-18 02:16:24.000000000 +0200
+++ gnome-shell-3.14.1/debian/patches/series 2014-11-26 09:59:17.000000000 +0100
@@ -2,3 +2,4 @@
27-nm-libexec-path.patch
#30-remoteMenu-Prevent-the-shell-from-becoming-unrespons.patch
41-handle-logind-fail.patch
+50-compute-weeknumber-with-gdatetime.patch
--- End Message ---
--- Begin Message ---
On 2014-11-26 17:34, Jordi Mallach wrote:
> Package: release.debian.org
> Severity: normal
> User: [email protected]
> Usertags: unblock
>
> Please unblock package gnome-shell
>
> This updates the default GNOME browser to iceweasel, fixes Nautilus'
> desktop name and incorporates a patch to fix calculation of week numbers.
>
> unblock gnome-shell/3.14.1-2
>
> Diff attached.
>
> [...]
Unblocked, thanks.
~Niels
--- End Message ---
