r52301 - in /desktop/unstable/gtk+3.0/debian: changelog control patches/Revert-move-of-.flat-from-frame-border-to-frame.patch patches/series patches/wayland-make-sure-to-clear-up-the-number-of-keys.patch rules

[biebl at users.alioth.debian.org]

Author: biebl
Date: Fri Mar 24 01:27:40 2017
New Revision: 52301

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=52301
Log:
Drop patches which have been merged upstream.

Removed:
    desktop/unstable/gtk+3.0/debian/patches/Revert-move-of-.flat-from-frame-border-to-frame.patch
    desktop/unstable/gtk+3.0/debian/patches/wayland-make-sure-to-clear-up-the-number-of-keys.patch
Modified:
    desktop/unstable/gtk+3.0/debian/changelog
    desktop/unstable/gtk+3.0/debian/control
    desktop/unstable/gtk+3.0/debian/patches/series
    desktop/unstable/gtk+3.0/debian/rules

Modified: desktop/unstable/gtk+3.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B3.0/debian/changelog?rev=52301&op=diff
==============================================================================
--- desktop/unstable/gtk+3.0/debian/changelog	[utf-8] (original)
+++ desktop/unstable/gtk+3.0/debian/changelog	[utf-8] Fri Mar 24 01:27:40 2017
@@ -1,6 +1,7 @@
 gtk+3.0 (3.22.11-1) UNRELEASED; urgency=medium
 
   * New upstream release.
+  * Drop patches which have been merged upstream.
 
  -- Michael Biebl <biebl at debian.org>  Fri, 24 Mar 2017 02:07:48 +0100
 

Modified: desktop/unstable/gtk+3.0/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B3.0/debian/control?rev=52301&op=diff
==============================================================================
--- desktop/unstable/gtk+3.0/debian/control	[utf-8] (original)
+++ desktop/unstable/gtk+3.0/debian/control	[utf-8] Fri Mar 24 01:27:40 2017
@@ -2,7 +2,7 @@
 Section: libs
 Priority: optional
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
-Uploaders: Andreas Henriksson <andreas at fatal.se>, Michael Biebl <biebl at debian.org>
+Uploaders: Michael Biebl <biebl at debian.org>
 Build-Depends: debhelper (>= 9.20141010),
                cdbs (>= 0.4.93),
                gnome-pkg-tools (>= 0.11),

Modified: desktop/unstable/gtk+3.0/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B3.0/debian/patches/series?rev=52301&op=diff
==============================================================================
--- desktop/unstable/gtk+3.0/debian/patches/series	[utf-8] (original)
+++ desktop/unstable/gtk+3.0/debian/patches/series	[utf-8] Fri Mar 24 01:27:40 2017
@@ -6,5 +6,3 @@
 no-accessibility-dump.patch
 reftest-known-fail.patch
 gdk-x11-Check-if-we-have-access-to-GL-before-using-G.patch
-wayland-make-sure-to-clear-up-the-number-of-keys.patch
-Revert-move-of-.flat-from-frame-border-to-frame.patch

Modified: desktop/unstable/gtk+3.0/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B3.0/debian/rules?rev=52301&op=diff
==============================================================================
--- desktop/unstable/gtk+3.0/debian/rules	[utf-8] (original)
+++ desktop/unstable/gtk+3.0/debian/rules	[utf-8] Fri Mar 24 01:27:40 2017
@@ -162,10 +162,6 @@
 	rm -f $(call dh_subst_files,$(DEB_ALL_PACKAGES))
 	rm -f testsuite/reftests/*.ui.known_fail
 	rm -rf debian/build debian/install
-	# The build system does not automatically update the GResource files
-	# when resources change. Force an update since we modify CSS files in
-	# Revert-move-of-.flat-from-frame-border-to-frame.patch.
-	rm -f gtk/gtkresources.c gtk/gtkresources.h
 
 pre-build::
 	# Mark reftests with known failures as non-fatal