Fork from Ubuntus' indicator-display project.

5 files changed, 44 insertions, 22 deletions

diff --git a/debian/changelog b/debian/changelog
index 8c8e124..e75a952 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+ayatana-indicator-display (0.2-0) UNRELEASED; urgency=medium
+
+  * Fork ayatana-indicator-datetime from Ubuntu's indicator-display.
+
+  * Upstream-provided Debian package for ayatana-indicator-display.
+    See upstream ChangeLog for recent changes.
+
+ -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de>  Fri, 24 Nov 2017 10:04:00 +0100
+
 indicator-display (0.1+17.04.20170210-0ubuntu1) zesty; urgency=medium
 
   * Remove old autostart files.
diff --git a/debian/control b/debian/control
index 7871d0f..84930d7 100644
--- a/debian/control
+++ b/debian/control
@@ -1,8 +1,7 @@
-Source: indicator-display
-Section: misc
+Source: ayatana-indicator-display
+Section: x11
 Priority: optional
-Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
-XSBC-Original-Maintainer: Charles Kerr <charles.kerr@canonical.com>
+Maintainer: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
 Build-Depends: cmake,
                cmake-extras (>= 0.10),
                dbus,
@@ -12,32 +11,28 @@ Build-Depends: cmake,
 # for coverage reports
                gcovr,
                lcov,
+# Ubuntu B-Ds, if on Ubuntu
+               gsettings-ubuntu-schemas (>= 0.0.2+14.10.20140813) | hello,
 # for tests
-               qt5-default,
                qtbase5-dev,
                libqtdbusmock1-dev,
                libqtdbustest1-dev,
                cppcheck,
                googletest | google-mock (>= 1.6.0+svn437),
-               gsettings-ubuntu-schemas (>= 0.0.2+14.10.20140813),
 # for packaging
                debhelper (>= 9),
-               dh-translations,
 # for systemd unit
-               systemd,
-Standards-Version: 3.9.5
-Homepage: http://launchpad.net/indicator-display/
-X-Ubuntu-Use-Langpack: yes
-# If you aren't a member of ~indicator-applet-developers but need to upload 
-# packaging changes, just go ahead.  ~indicator-applet-developers will notice and 
-# sync up the code again.
-Vcs-Bzr: https://code.launchpad.net/~indicator-applet-developers/indicator-display/trunk.14.10
+               systemd [linux-any],
+Standards-Version: 4.1.1
+Homepage: http://github.com/AyatanaIndicators/ayatana-indicator-display
+Vcs-Git: http://github.com/AyatanaIndicators/ayatana-indicator-display
+Vcs-Browser: http://github.com/AyatanaIndicators/ayatana-indicator-display
 
-Package: indicator-display
+Package: ayatana-indicator-display
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
-         gsettings-ubuntu-schemas (>= 0.0.2+14.10.20140813),
-         indicator-common,
-Description: Collection of small indicators
- Indicators too small to merit separate codebases, such as Rotation Lock
+         ayatana-indicator-common,
+Description: Ayatana Indicator for Display configuration
+ This Ayatana Indicator is designed to be placed on the right side of a
+ panel and give the user easy control for changing their display settings.
diff --git a/debian/copyright b/debian/copyright
index 7809d7c..54b1359 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -5,6 +5,13 @@ Source: http://launchpad.net/indicator-display
 Files: *
 Copyright: 2014, Canonical Ltd.
 License: GPL-3
+
+Files: debian/*
+Copyright: 2014, Canonical Ltd.
+  2017, Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
+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.
diff --git a/debian/indicator-display.maintscript b/debian/indicator-display.maintscript
deleted file mode 100644
index 6013bd1..0000000
--- a/debian/indicator-display.maintscript
+++ /dev/null
@@ -1 +0,0 @@
-rm_conffile /etc/xdg/autostart/indicator-display.desktop 0.1+17.04.20170210-0ubuntu1~
diff --git a/debian/rules b/debian/rules
index 9bd9847..4ff937e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,17 @@
 #!/usr/bin/make -f
+# -*- makefile -*-
+
+# 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
 
 %:
-	dh $@ --parallel --with translations
+	dh $@ --parallel
 
+get-orig-source:
+	uscan --noconf --force-download --rename --download-current-version --destdir=..