summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon McVittie <smcv@debian.org>2019-08-01 22:15:54 +0100
committerSimon McVittie <smcv@debian.org>2019-08-01 22:15:54 +0100
commitcada68f33e9e1c2581e773e40f7d2d118d9d6063 (patch)
treea5e5569a3912314a52913fd542fb1b6834e572b1
parente4aa5e8768b56287d0ccbdabe549b7ca9c44f5d3 (diff)
Drop patches, applied upstream
-rw-r--r--debian/changelog1
-rw-r--r--debian/patches/Add-a-build-system-for-gschemas.compiled.patch42
-rw-r--r--debian/patches/Do-not-force-enable-BT-on-extension-enable-only-do-sync-i.patch33
-rw-r--r--debian/patches/series2
4 files changed, 1 insertions, 77 deletions
diff --git a/debian/changelog b/debian/changelog
index b8bf6c4..2569c8a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
gnome-shell-extension-bluetooth-quick-connect (10-1) UNRELEASED; urgency=medium
* New upstream release
+ * Drop patches, applied upstream
-- Simon McVittie <smcv@debian.org> Thu, 01 Aug 2019 22:15:08 +0100
diff --git a/debian/patches/Add-a-build-system-for-gschemas.compiled.patch b/debian/patches/Add-a-build-system-for-gschemas.compiled.patch
deleted file mode 100644
index c216787..0000000
--- a/debian/patches/Add-a-build-system-for-gschemas.compiled.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From: Simon McVittie <smcv@debian.org>
-Date: Mon, 25 Feb 2019 15:16:09 +0000
-Subject: Add a build system for gschemas.compiled
-
-Instead of including it in the git repository, build it from its source
-code (the XML) as needed.
-
-Forwarded: https://github.com/bjarosze/gnome-bluetooth-quick-connect/pull/9
-Applied-upstream: upstream, 9, commit:3604aefeb87a06f0bec880384492f7c18b5626bf
----
- .gitignore | 1 +
- Makefile | 14 ++++++++++++++
- 2 files changed, 15 insertions(+)
- create mode 100644 Makefile
-
-diff --git a/.gitignore b/.gitignore
-index a09c56d..e666a92 100644
---- a/.gitignore
-+++ b/.gitignore
-@@ -1 +1,2 @@
- /.idea
-+/schemas/gschemas.compiled
-diff --git a/Makefile b/Makefile
-new file mode 100644
-index 0000000..b34acee
---- /dev/null
-+++ b/Makefile
-@@ -0,0 +1,14 @@
-+# Copyright 2019 Simon McVittie
-+# SPDX-License-Identifier: GPL-2.0-or-later
-+# (see extension.js for details)
-+
-+all:
-+ glib-compile-schemas --strict --targetdir=schemas schemas
-+
-+dist: all
-+ zip gnome-bluetooth-quick-connect.zip -9r *
-+
-+clean:
-+ rm -fr gnome-bluetooth-quick-connect.zip schemas/gschemas.compiled
-+
-+.PHONY: all clean dist
diff --git a/debian/patches/Do-not-force-enable-BT-on-extension-enable-only-do-sync-i.patch b/debian/patches/Do-not-force-enable-BT-on-extension-enable-only-do-sync-i.patch
deleted file mode 100644
index b04f412..0000000
--- a/debian/patches/Do-not-force-enable-BT-on-extension-enable-only-do-sync-i.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From: Andrei Tatar <6143482+andreittr@users.noreply.github.com>
-Date: Sat, 15 Jun 2019 14:12:02 +0200
-Subject: Do not force-enable BT on extension enable & only do sync if BT on
-
-Forwarded: https://github.com/bjarosze/gnome-bluetooth-quick-connect/pull/8
-Applied-upstream: upstream, 9, commit:9d28614c75e76805b808d4b93d77c8dc37bec066
----
- extension.js | 7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/extension.js b/extension.js
-index 0a9b9d2..403d956 100644
---- a/extension.js
-+++ b/extension.js
-@@ -95,14 +95,15 @@ class BluetoothQuickConnect {
- if (isOpen && this._autoPowerOnEnabled())
- this._proxy.BluetoothAirplaneMode = false;
- });
--
-+
- this._connectSignal(this._model, 'row-changed', () => this._sync());
- this._connectSignal(this._model, 'row-deleted', () => this._sync());
- this._connectSignal(this._model, 'row-inserted', () => this._sync());
-
-- this._proxy.BluetoothAirplaneMode = false;
- this._idleMonitor();
-- this._sync();
-+ if (!this._proxy.BluetoothAirplaneMode) {
-+ this._sync();
-+ }
- }
-
- disable() {
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index d95eed9..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-Do-not-force-enable-BT-on-extension-enable-only-do-sync-i.patch
-Add-a-build-system-for-gschemas.compiled.patch