--- Begin Message ---
- To: Debian Bug Tracking System <submit@bugs.debian.org>
- Subject: unblock: variety/0.6.3-4 (pre-upload approval)
- From: James Lu <bitflip3@gmail.com>
- Date: Thu, 27 Apr 2017 23:31:39 -0700
- Message-id: <149336109953.19869.15826680247896814770.reportbug@amoeba>
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Hi Release Team,
In the last few months I've prepared quite a few changes for variety, mostly
involving the removal of online wallpaper sources that no longer work, and also
fixing one fairly annoying bug causing menus to show up at the top left of the
screen. I realize this diff is quite significant, so here's a breakdown:
- The menu bug was reported at https://bugs.launchpad.net/variety/+bug/1598298
and fixed in Ubuntu zesty with SRUs to xenial and yakkety pending. The fix
first landed as 0.6.3-2 on March 17 and no regressions have been reported
since.
- The disable-panoramio.patch was based off a similar patch from Arch Linux's
0.6.3-3 package version, and disables Panoramio sources which have been shut
down per https://www.panoramio.com/maps-faq. I modified further also migrate
away from any configured Panoramio, and this change has been in experimental
for 10 days with no regressions reported.
- Cleaning up after the earlier Wallpapers.net source removal from 0.6.3-1:
removing its dependencies (libjs-underscore, python-lxml) which aren't used
anywhere else, and also removing Wallpapers.net from the package description.
- Finally, patch refreshes and updates as part of maintenance: I've also
removed an old setup.py-install-requires.diff patch which was never used in the
build in unstable.
- The only change that hasn't been previously pushed is removing python-lxml
from the build-dependencies, as I forgot to include that with 0.6.3-3.
Attached is a debdiff between 0.6.3-1 (currently in unstable) and 0.6.3-4,
which I plan to release if this is okay.
-- System Information:
Debian Release: 9.0
APT prefers testing
APT policy: (700, 'testing'), (500, 'unstable-debug'), (500, 'testing-
debug'), (500, 'unstable'), (101, 'experimental')
Architecture: amd64
(x86_64)
Foreign Architectures: i386
Kernel: Linux 4.9.0-2-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_CA.UTF-8, LC_CTYPE=en_CA.UTF-8 (charmap=UTF-8)
diff -Nru variety-0.6.3/debian/changelog variety-0.6.3/debian/changelog
--- variety-0.6.3/debian/changelog 2016-11-09 20:55:55.000000000 -0800
+++ variety-0.6.3/debian/changelog 2017-04-27 22:49:27.000000000 -0700
@@ -1,3 +1,35 @@
+variety (0.6.3-4) unstable; urgency=medium
+
+ * Upload to unstable.
+ * Remove python-lxml from build dependencies as well.
+
+ -- James Lu <bitflip3@gmail.com> Thu, 27 Apr 2017 22:49:27 -0700
+
+variety (0.6.3-3) experimental; urgency=medium
+
+ * d/control: Remove Wallpapers.net from the extended description; it was
+ removed upstream in Variety 0.6.1.
+ * Remove lxml dependency, it is unused since the Wallpapers.net removal in
+ Variety 0.6.1.
+ * Drop unused patch setup.py-install-requires.diff
+ * Add disable-panoramio.patch from Arch Linux version 0.6.3-3, modifying
+ it to also migrate away from Panoramio sources (LP: #1636389)
+ - Also remove libjs-underscore dependency, as Panoramio was the only
+ source using it.
+ * Refresh menu-position-varargs.patch.
+ * Refresh forwarded state & dates of most patches.
+
+ -- James Lu <bitflip3@gmail.com> Mon, 17 Apr 2017 11:13:39 -0700
+
+variety (0.6.3-2) experimental; urgency=medium
+
+ * Add menu-position-varargs.patch from upstream Bzr revision 582
+ (https://bazaar.launchpad.net/~peterlevi/variety/trunk/revision/582)
+ to fix menus showing up at the top left of the screen on some systems.
+ (LP: #1598298)
+
+ -- James Lu <bitflip3@gmail.com> Wed, 15 Mar 2017 12:12:09 -0700
+
variety (0.6.3-1) unstable; urgency=medium
* New upstream release.
diff -Nru variety-0.6.3/debian/control variety-0.6.3/debian/control
--- variety-0.6.3/debian/control 2016-11-09 20:53:19.000000000 -0800
+++ variety-0.6.3/debian/control 2017-04-27 22:49:24.000000000 -0700
@@ -8,7 +8,6 @@
python-pyexiv2,
python-pycurl,
python-configobj,
- python-lxml,
python-imaging,
python-cairo,
python-dbus
@@ -41,13 +40,10 @@
gir1.2-appindicator3-0.1,
imagemagick,
python-gi-cairo,
- python-lxml,
- libjs-underscore (>= 1.6.0~)
Recommends: yelp
Suggests: feh
Description: Wallpaper changer, downloader and manager
Variety is an open-source wallpaper changer, downloader, and manager for
Linux. It supports a variety of sources for wallpapers, including local
- files, online services such as Flickr, Wallbase.cc, Wallpapers.net,
- NASA Astronomy Picture of the Day, Desktoppr.co, and media RSS feeds
- (Picasa, deviantART, etc.).
+ files, online services such as Flickr, Wallbase.cc, NASA Astronomy Picture of
+ the Day, Desktoppr.co, and media RSS feeds (Picasa, deviantART, etc.).
diff -Nru variety-0.6.3/debian/patches/desktop-file-keywords.diff variety-0.6.3/debian/patches/desktop-file-keywords.diff
--- variety-0.6.3/debian/patches/desktop-file-keywords.diff 2016-11-09 20:53:19.000000000 -0800
+++ variety-0.6.3/debian/patches/desktop-file-keywords.diff 2017-04-27 22:49:24.000000000 -0700
@@ -1,7 +1,7 @@
Subject: Add keywords for variety.desktop, fixes Lintian info warning desktop-entry-lacks-keywords-entry
Author: James Lu <glolol1@hotmail.com>
-Forwarded: no
-Last-Update: 2015-09-01
+Forwarded: https://code.launchpad.net/~tacocat/variety/debpatches2/+merge/322633
+Last-Update: 2017-04-17
Index: variety/variety.desktop.in
===================================================================
diff -Nru variety-0.6.3/debian/patches/disable-panoramio.patch variety-0.6.3/debian/patches/disable-panoramio.patch
--- variety-0.6.3/debian/patches/disable-panoramio.patch 1969-12-31 16:00:00.000000000 -0800
+++ variety-0.6.3/debian/patches/disable-panoramio.patch 2017-04-27 22:49:24.000000000 -0700
@@ -0,0 +1,99 @@
+Author: Balló György <ballogyor@gmail.com>
+Subject: Disable Panoramio sources, which no longer work
+ .
+ This patch was imported from Arch Linux (link below) and modified by James Lu <bitflip3@gmail.com>
+ to migrate away from old Panoramio sources as well.
+
+From: vendor, https://git.archlinux.org/svntogit/community.git/tree/repos/community-any/fix-popup-menu.patch?h=packages/variety
+Forwarded: https://bugs.launchpad.net/variety/+bug/1636389
+Last-Update: 2017-04-17
+
+Index: variety/variety/PreferencesVarietyDialog.py
+===================================================================
+--- variety.orig/variety/PreferencesVarietyDialog.py 2017-03-24 11:55:52.916033568 -0700
++++ variety/variety/PreferencesVarietyDialog.py 2017-03-24 11:55:52.912033650 -0700
+@@ -32,7 +32,6 @@
+ from variety.AddFlickrDialog import AddFlickrDialog
+ from variety.AddMediaRssDialog import AddMediaRssDialog
+ from variety.AddRedditDialog import AddRedditDialog
+-from variety.AddPanoramioDialog import AddPanoramioDialog
+ from variety.EditFavoriteOperationsDialog import EditFavoriteOperationsDialog
+ from variety.SmartFeaturesConfirmationDialog import SmartFeaturesConfirmationDialog
+ from variety.LoginOrRegisterDialog import LoginOrRegisterDialog
+@@ -64,7 +63,6 @@
+ EDITABLE_TYPES = [
+ Options.SourceType.FLICKR,
+ Options.SourceType.MEDIA_RSS,
+- Options.SourceType.PANORAMIO,
+ Options.SourceType.WALLHAVEN,
+ Options.SourceType.REDDIT,
+ ]
+@@ -381,7 +379,6 @@
+ '-',
+ (_("Flickr"), self.on_add_flickr_clicked),
+ (_("Wallhaven.cc"), self.on_add_wallhaven_clicked),
+- (_("Panoramio"), self.on_add_panoramio_clicked),
+ (_("Reddit"), self.on_add_reddit_clicked),
+ (_("Media RSS"), self.on_add_mediarss_clicked),
+ ]
+@@ -672,8 +669,6 @@
+ self.dialog = AddRedditDialog()
+ elif type == Options.SourceType.MEDIA_RSS:
+ self.dialog = AddMediaRssDialog()
+- elif type == Options.SourceType.PANORAMIO:
+- self.dialog = AddPanoramioDialog()
+
+ self.dialog.set_edited_row(edited_row)
+ self.show_dialog(self.dialog)
+@@ -786,9 +781,6 @@
+ def on_add_wallhaven_clicked(self, widget=None):
+ self.show_dialog(AddWallhavenDialog())
+
+- def on_add_panoramio_clicked(self, widget=None):
+- self.show_dialog(AddPanoramioDialog())
+-
+ def show_dialog(self, dialog):
+ self.dialog = dialog
+ self.dialog.parent = self
+Index: variety/variety/VarietyWindow.py
+===================================================================
+--- variety.orig/variety/VarietyWindow.py 2017-03-24 11:55:52.916033568 -0700
++++ variety/variety/VarietyWindow.py 2017-03-24 11:55:52.912033650 -0700
+@@ -541,8 +541,6 @@
+ return UnsplashDownloader(self)
+ elif type == Options.SourceType.MEDIA_RSS:
+ return MediaRssDownloader(self, location)
+- elif type == Options.SourceType.PANORAMIO:
+- return PanoramioDownloader(self, location)
+ elif type == Options.SourceType.RECOMMENDED:
+ if self.smart.user:
+ return MediaRssDownloader(self, '%s/user/%s/recommended/rss' % (Smart.SITE_URL, self.smart.user["id"]))
+Index: variety/variety/Options.py
+===================================================================
+--- variety.orig/variety/Options.py 2017-03-24 11:55:52.916033568 -0700
++++ variety/variety/Options.py 2017-03-24 11:56:06.539756948 -0700
+@@ -42,7 +42,6 @@
+ APOD = 8
+ MEDIA_RSS = 10
+ EARTH = 11
+- PANORAMIO = 12
+ WALLHAVEN = 13
+ REDDIT = 14
+ BING = 15
+@@ -60,7 +59,6 @@
+ APOD: "apod",
+ MEDIA_RSS: "mediarss",
+ EARTH: "earth",
+- PANORAMIO: "panoramio",
+ WALLHAVEN: "wallhaven",
+ REDDIT: "reddit",
+ BING: "bing",
+@@ -72,7 +70,7 @@
+ str_to_type = dict((v,k) for k, v in type_to_str.items())
+
+ dl_types = [DESKTOPPR, FLICKR, APOD, MEDIA_RSS, EARTH,
+- PANORAMIO, WALLHAVEN, REDDIT, BING, UNSPLASH, RECOMMENDED, LATEST]
++ WALLHAVEN, REDDIT, BING, UNSPLASH, RECOMMENDED, LATEST]
+
+ class LightnessMode:
+ DARK = 0
diff -Nru variety-0.6.3/debian/patches/dont-embed-underscore.diff variety-0.6.3/debian/patches/dont-embed-underscore.diff
--- variety-0.6.3/debian/patches/dont-embed-underscore.diff 2016-08-26 14:52:05.000000000 -0700
+++ variety-0.6.3/debian/patches/dont-embed-underscore.diff 2017-04-27 22:49:24.000000000 -0700
@@ -1,7 +1,7 @@
Subject: Remove embedded copy of libjs-underscore
Author: James Lu <glolol1@hotmail.com>
-Forwarded: no
-Last-Update: 2015-08-28
+Forwarded: not-needed
+Last-Update: 2017-04-17
Index: variety/data/panoramio/underscore-min.js
===================================================================
diff -Nru variety-0.6.3/debian/patches/menu-position-varargs.patch variety-0.6.3/debian/patches/menu-position-varargs.patch
--- variety-0.6.3/debian/patches/menu-position-varargs.patch 1969-12-31 16:00:00.000000000 -0800
+++ variety-0.6.3/debian/patches/menu-position-varargs.patch 2017-04-27 22:49:24.000000000 -0700
@@ -0,0 +1,67 @@
+From: Peter Levi <peterlevi@peterlevi.com>
+Subject: Fix popup menu positioning
+Origin: upstream, https://bazaar.launchpad.net/~peterlevi/variety/trunk/revision/582
+Bug: https://bugs.launchpad.net/variety/+bug/1598298
+
+=== modified file 'variety/variety/PreferencesVarietyDialog.py'
+Index: variety/variety/PreferencesVarietyDialog.py
+===================================================================
+--- variety.orig/variety/PreferencesVarietyDialog.py 2017-03-24 11:32:18.777098469 -0700
++++ variety/variety/PreferencesVarietyDialog.py 2017-03-24 11:32:18.777098469 -0700
+@@ -355,7 +355,7 @@
+ timer.start()
+
+ def on_add_button_clicked(self, widget=None):
+- def position(x, y):
++ def position(*args, **kwargs):
+ button_alloc = self.ui.add_button.get_allocation()
+ window_pos = self.ui.add_button.get_window().get_position()
+ return button_alloc.x + window_pos[0], button_alloc.y + button_alloc.height + window_pos[1], True
+@@ -363,7 +363,7 @@
+ self.add_menu.popup(None, self.ui.add_button, position, None, 0, Gtk.get_current_event_time())
+
+ def on_remove_sources_clicked(self, widget=None):
+- def position(x, y):
++ def position(*args, **kwargs):
+ button_alloc = self.ui.remove_sources.get_allocation()
+ window_pos = self.ui.remove_sources.get_window().get_position()
+ return button_alloc.x + window_pos[0], button_alloc.y + button_alloc.height + window_pos[1], True
+Index: variety/variety/ThumbsManager.py
+===================================================================
+--- variety.orig/variety/ThumbsManager.py 2017-03-24 11:32:18.777098469 -0700
++++ variety/variety/ThumbsManager.py 2017-03-24 11:32:18.777098469 -0700
+@@ -268,10 +268,12 @@
+ _resume_scrolling()
+ else:
+ menu = self.create_menu(file)
+- def _compute_position(a, b, event=event):
++
++ def _compute_position(*args, **kwargs):
+ x, y = event.get_root_coords()[0], event.get_root_coords()[1]
+ h = menu.get_preferred_height()[1]
+ return x, y - h if y - h >= 40 else y, True
++
+ menu.connect("deactivate", _resume_scrolling)
+ menu.popup(None, None, _compute_position, None, 0, event.time)
+
+Index: variety/variety/indicator.py
+===================================================================
+--- variety.orig/variety/indicator.py 2017-03-24 11:32:18.777098469 -0700
++++ variety/variety/indicator.py 2017-03-24 11:32:18.777098469 -0700
+@@ -316,14 +316,11 @@
+ self.status_icon = None
+ self.visible = True
+
+- def pos(menu, icon):
+- return Gtk.StatusIcon.position_menu(self.menu, icon)
+-
+ def right_click_event(icon, button, time):
+- self.menu.popup(None, None, pos, self.status_icon, 0, time)
++ self.menu.popup(None, None, Gtk.StatusIcon.position_menu, self.status_icon, 0, time)
+
+ def left_click_event(data):
+- self.menu.popup(None, None, pos, self.status_icon, 0, Gtk.get_current_event_time())
++ self.menu.popup(None, None, Gtk.StatusIcon.position_menu, self.status_icon, 0, Gtk.get_current_event_time())
+
+ def on_indicator_scroll_status_icon(status_icon, event):
+ window.on_indicator_scroll(None, 1, event.direction)
diff -Nru variety-0.6.3/debian/patches/series variety-0.6.3/debian/patches/series
--- variety-0.6.3/debian/patches/series 2016-11-09 20:53:19.000000000 -0800
+++ variety-0.6.3/debian/patches/series 2017-04-27 22:49:24.000000000 -0700
@@ -1,3 +1,5 @@
+disable-panoramio.patch
+menu-position-varargs.patch
remove-timebombs.patch
desktop-file-keywords.diff
dont-embed-underscore.diff
diff -Nru variety-0.6.3/debian/patches/setup.py-install-requires.diff variety-0.6.3/debian/patches/setup.py-install-requires.diff
--- variety-0.6.3/debian/patches/setup.py-install-requires.diff 2016-11-09 20:53:19.000000000 -0800
+++ variety-0.6.3/debian/patches/setup.py-install-requires.diff 1969-12-31 16:00:00.000000000 -0800
@@ -1,17 +0,0 @@
-Subject: Add install_requires to setup.py, for automated dependency handling
-Author: James Lu <glolol1@hotmail.com>
-Forwarded: no
-Last-Update: 2015-09-02
-
-Index: variety/setup.py
-===================================================================
---- variety.orig/setup.py 2015-09-02 10:33:03.394893877 -0700
-+++ variety/setup.py 2015-09-02 10:33:45.647117625 -0700
-@@ -85,4 +85,6 @@
- "deviantART or any other place are also supported.",
- url='https://launchpad.net/variety',
-- cmdclass={'install': InstallAndUpdateDataDirectory}
-+ cmdclass={'install': InstallAndUpdateDataDirectory},
-+ install_requires=['bs4', 'configobj', 'pyexiv2', 'lxml', 'PIL', 'dbus',
-+ 'cairo', 'pycurl']
- )
--- End Message ---