100% re-write of the keyboard indicator in plain C.

6 files changed, 50 insertions, 53 deletions

diff --git a/debian/ayatana-indicator-keyboard.links b/debian/ayatana-indicator-keyboard.links
new file mode 100644
index 00000000..d5f82959
--- /dev/null
+++ b/debian/ayatana-indicator-keyboard.links
@@ -0,0 +1,3 @@
+# Because dh-systemd does not support user units for compat levels below 12, we manually make the WantedBy link
+# FIXME: drop this once we bump DH compat level to 12 or higher
+/usr/lib/systemd/user/ayatana-indicator-keyboard.service /usr/lib/systemd/user/ayatana-indicators.target.wants/ayatana-indicator-keyboard.service
diff --git a/debian/control b/debian/control
index d5bf8862..118b0d57 100644
--- a/debian/control
+++ b/debian/control
@@ -1,36 +1,26 @@
 Source: ayatana-indicator-keyboard
-Section: x11
+Section: misc
 Priority: optional
-Maintainer: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
-Build-Depends: debhelper (>= 9),
-               dbus,
+Uploaders:
+ Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
+Build-Depends: cmake,
+               libglib2.0-dev (>= 2.36),
+               libx11-dev (>=1.7.0),
+               libxklavier-dev (>=5.4),
+# for packaging
+               debhelper (>= 9),
                dpkg-dev (>= 1.16.1.1),
-               fcitx-libs-dev (>= 1:4.2.8.3),
-               gir1.2-fcitx-1.0,
-               libaccountsservice-dev,
-               libgee-0.8-dev | libgee-dev,
-               libgirepository1.0-dev,
-               libgnome-desktop-3-dev,
-               libgnomekbd-dev,
-               libgtk-3-dev,
-               libibus-1.0-dev (>= 1.5.0),
-               lightdm-vala | liblightdm-gobject-1-dev,
-               valac,
-               xauth,
-               xvfb,
-Standards-Version: 4.1.1
+               intltool,
+# for systemd unit
+               systemd [linux-any],
+Standards-Version: 4.1.3
 Homepage: https://github.com/AyatanaIndicators/ayatana-indicator-keyboard
 Vcs-Git: https://github.com/AyatanaIndicators/ayatana-indicator-keyboard
 Vcs-Browser: https://github.com/AyatanaIndicators/ayatana-indicator-keyboard
 
 Package: ayatana-indicator-keyboard
 Architecture: any
-Depends: ${misc:Depends},
-         ${shlibs:Depends},
-Breaks: ibus (<< 1.5.5-1ubuntu3),
-Description: Ayatana Keyboard indicator
- This package contains the keyboard indicator, which should show as an
- icon in the top panel of indicator aware desktop environments.
- .
- It can be used to switch keyboard layouts or languages, and helps the
- user identifying which layouts are currently in use.
+Depends: ${shlibs:Depends},
+         ${misc:Depends},
+         ayatana-indicator-common,
+Description: Ayatana Indicator Keyboard Applet
diff --git a/debian/copyright b/debian/copyright
index 8ad93a5c..ec42afba 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,30 +1,29 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: ayatana-indicator-keyboard
-Upstream-Contact: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
-Source: https://code.launchpad.net/indicator-keyboard
+Upstream-Contact: Robert Tari <robert@tari.in>
+Source: https://github.com/AyatanaIndicators/ayatana-indicator-keyboard
 
 Files: *
-Copyright: 2013 Canonical Ltd.
-License: GPL-3
+Copyright: 2021, Robert Tari <robert@tari.in>
+License: GPL-3+
 
 Files: debian/*
-Copyright: 2013 Canonical Ltd.
-  2017, Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
-License: GPL-3
+Copyright: 2021 Robert Tari <robert@tari.in>
+License: GPL-3+
 
-License: GPL-3
- This package is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License as
- published by the Free Software Foundation; version 3 of the
- License.
+License: GPL-3+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
  .
  This package is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- General Public License for more details.
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
  .
  You should have received a copy of the GNU General Public License
  along with this program. If not, see <http://www.gnu.org/licenses/>.
  .
- On Debian systems, the complete text of the GNU General Public
- License can be found in "/usr/share/common-licenses/GPL-3".
+ On Debian systems, the complete text of the GNU General
+ Public License version 3 can be found in "/usr/share/common-licenses/GPL-3".
diff --git a/debian/docs b/debian/docs
new file mode 100644
index 00000000..50bd824b
--- /dev/null
+++ b/debian/docs
@@ -0,0 +1,2 @@
+NEWS
+README
diff --git a/debian/rules b/debian/rules
index 5da073ca..e7fca45d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,19 +4,22 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+export DPKG_GENSYMBOLS_CHECK_LEVEL=4
+
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 DPKG_EXPORT_BUILDFLAGS = 1
 include /usr/share/dpkg/buildflags.mk
 
-export DPKG_GENSYMBOLS_CHECK_LEVEL=4
-
 %:
-	dh $@
-
-override_dh_autoreconf:
-	NOCONFIGURE=1 ./autogen.sh
+	dh $@ --with systemd
 
 override_dh_install:
-	find debian/ayatana-indicator-keyboard/usr/lib -name *.la -delete
-	find debian/ayatana-indicator-keyboard/usr/lib -name *.a -delete
+	find debian/ayatana-indicator-keyboard -name \*.la -delete
+	find debian/ayatana-indicator-keyboard -name \*.a -delete
 	dh_install --fail-missing
+
+override_dh_installchangelogs:
+	dh_installchangelogs NEWS
+
+get-orig-source:
+	uscan --noconf --force-download --rename --download-current-version --destdir=..
diff --git a/debian/source/format b/debian/source/format
index d3827e75..9f8e9b69 100644
--- a/debian/source/format
+++ b/debian/source/format
@@ -1 +1 @@
-1.0
+1.0
\ No newline at end of file