Merge version 3.22.26-2+rpi1 and 3.22.28-1 to produce 3.22.28-1+rpi1 archive/raspbian/3.22.28-1+rpi1 raspbian/3.22.28-1+rpi1
authorRaspbian forward pporter <root@raspbian.org>
Wed, 21 Feb 2018 06:21:32 +0000 (06:21 +0000)
committerRaspbian forward pporter <root@raspbian.org>
Wed, 21 Feb 2018 06:21:32 +0000 (06:21 +0000)
1  2 
debian/changelog
debian/control
debian/control.in
debian/patches/series
debian/rules

index 4d3b626e364db16eeec79c0fa9f29c90fcea7982,4a1089b63410dea01387391b049a98aa7ac09dac..b166f92131217a17d2d9ef3be7c10b4a394b38da
@@@ -1,15 -1,13 +1,26 @@@
- gtk+3.0 (3.22.26-2+rpi1) buster-staging; urgency=medium
++gtk+3.0 (3.22.28-1+rpi1) buster-staging; urgency=medium
 +
 +  [changes brought forward from 3.16.6-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Fri, 25 Sep 2015 01:49:45 +0000]
 +  * Disable wayland backend in debian/rules
 +  * Move libegl1-mesa-dev and libwayland-dev from Depends and Build-Depends to
 +    Build-Conflicts
 +  * Add symbols file hack for wayland changes.
 +  * Fix clean target.
 +  [changes introduced in 3.20.6-2+rpi1 by Peter Michael Green]
 +  * Disable testsuite.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Wed, 27 Dec 2017 21:47:16 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Wed, 21 Feb 2018 06:21:32 +0000
++
+ gtk+3.0 (3.22.28-1) unstable; urgency=medium
+   * New upstream release (LP: #1698270) (LP: #1714518)
+   * Update Vcs fields for conversion to git
+   * Add debian/gbp.conf
+   * Bump Standards-Version to 4.1.3
+   * Update Vcs fields for migration to https://salsa.debian.org/
+   * Drop git_text-view-support-emoji-chooser.patch: Applied in new release
+  -- Jeremy Bicha <jbicha@debian.org>  Thu, 15 Feb 2018 05:23:44 -0500
  
  gtk+3.0 (3.22.26-2) unstable; urgency=medium
  
diff --cc debian/control
Simple merge
Simple merge
index 665b91f0c9cf38bf8d8ee081acecb502139286cf,7d510f5526cd7f1edcfd692850e689bcafd3aa33..2d0b2e6bc0fff2c16b48ca899edcdb2d2d691acd
@@@ -6,5 -6,3 +6,4 @@@
  no-accessibility-dump.patch
  reftest-known-fail.patch
  gdk-x11-Check-if-we-have-access-to-GL-before-using-G.patch
- git_text-view-support-emoji-chooser.patch
 +auto-3.22.11-1+rpi1-bbd9d41abb4e27ecfc2cd7bd15f11332f36883bf-1491663248
diff --cc debian/rules
Simple merge