Fork from Ubuntu's indicator-keyboard.

4 files changed, 29 insertions, 20 deletions

diff --git a/debian/changelog b/debian/changelog
index 111842a9..348789e6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,10 @@
-ayatana-indicator-keyboard (0.1.0-0) UNRELEASED; urgency=medium
+ayatana-indicator-keyboard (0.1.1-0) UNRELEASED; urgency=medium
 
   * Fork from Ubuntu's indicator-keyboard.
 
+  * Upstream-provided Debian package for ayatana-indicator-keyboard.
+    See upstream ChangeLog for recent changes.
+
  -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de>  Thu, 12 Nov 2015 13:32:10 +0100
 
 indicator-keyboard (0.0.0+15.10.20151006-0ubuntu1) wily; urgency=medium
diff --git a/debian/control b/debian/control
index 3bf1be69..d5bf8862 100644
--- a/debian/control
+++ b/debian/control
@@ -1,27 +1,27 @@
-Source: indicator-keyboard
-Section: gnome
+Source: ayatana-indicator-keyboard
+Section: x11
 Priority: optional
 Maintainer: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
-Build-Depends: debhelper (>= 9.0.0),
-               dh-autoreconf,
+Build-Depends: debhelper (>= 9),
                dbus,
+               dpkg-dev (>= 1.16.1.1),
                fcitx-libs-dev (>= 1:4.2.8.3),
                gir1.2-fcitx-1.0,
                libaccountsservice-dev,
-               libgee-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),
-               liblightdm-gobject-1-dev,
+               lightdm-vala | liblightdm-gobject-1-dev,
                valac,
                xauth,
                xvfb,
-Standards-Version: 3.9.4
-Homepage: https://github.com/ArcticaProject/ayatana-indicator-keyboard
-Vcs-Git: git://cgit.arctica-project.org/ayatana/ayatana-indicator-keyboard.git
-Vcs-Browser: https://cgit.arctica-project.org/ayatana/ayatana-indicator-keyboard.git/
+Standards-Version: 4.1.1
+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
@@ -30,7 +30,7 @@ Depends: ${misc: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 destkop environments.
+ icon in the top panel of indicator aware desktop environments.
  .
- It can be used to switch key layouts or languages, and helps the user
- identifying which layouts are currently in use.
+ It can be used to switch keyboard layouts or languages, and helps the
+ user identifying which layouts are currently in use.
diff --git a/debian/copyright b/debian/copyright
index 6354e29b..8ad93a5c 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,16 +1,18 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: indicator-keyboard
+Upstream-Name: ayatana-indicator-keyboard
+Upstream-Contact: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
 Source: https://code.launchpad.net/indicator-keyboard
 
 Files: *
 Copyright: 2013 Canonical Ltd.
-License: GPL-3.0
+License: GPL-3
 
 Files: debian/*
 Copyright: 2013 Canonical Ltd.
-License: GPL-3.0
+  2017, Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
+License: GPL-3
 
-License: GPL-3.0
+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
diff --git a/debian/rules b/debian/rules
index e290d9e1..5da073ca 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,13 +4,17 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+DPKG_EXPORT_BUILDFLAGS = 1
+include /usr/share/dpkg/buildflags.mk
+
 export DPKG_GENSYMBOLS_CHECK_LEVEL=4
 
 %:
-	dh $@ --with autoreconf
+	dh $@
 
 override_dh_autoreconf:
-	NOCONFIGURE=1 dh_autoreconf ./autogen.sh
+	NOCONFIGURE=1 ./autogen.sh
 
 override_dh_install:
 	find debian/ayatana-indicator-keyboard/usr/lib -name *.la -delete