debian/*: Update from official Debian packaging.

4 files changed, 48 insertions, 15 deletions

diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000..611869f
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,32 @@
+# vim: set ts=2 sts=2 sw=2 expandtab :
+dist: bionic
+language: shell
+os: linux
+services:
+  - docker
+
+addons:
+  apt:
+    packages:
+      - python3-pip
+      - python3-setuptools
+
+before_install:
+  # let's use the MATE project's docker build scripts...
+  - curl -Ls -o docker-build https://github.com/mate-desktop/mate-dev-scripts/raw/master/travis/docker-build
+  - curl -Ls -o gen-index https://github.com/mate-desktop/mate-dev-scripts/raw/master/travis/gen-index.sh
+  - sed -i gen-index -e "s/mate-desktop/ayatana-indicators/g"
+  - chmod +x docker-build gen-index
+
+install:
+  - pip3 install PyGithub
+  - ./docker-build --name ${DISTRO} --config .build.yml --install
+
+script:
+  - ./docker-build --name ${DISTRO} --verbose --config .build.yml --build scripts --build autotools
+
+env:
+  - DISTRO="archlinux:latest"
+  - DISTRO="debian:testing"
+#  - DISTRO="fedora:latest"
+  - DISTRO="ubuntu:rolling"
diff --git a/debian/control b/debian/control
index d787e7e..d24265b 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,7 @@ Build-Depends: debhelper (>= 9),
                libglib2.0-dev (>= 2.37),
                libgtk2.0-dev (>= 2.18),
                libgtk-3-dev (>= 2.91.3),
-               libayatana-ido3-dev (>= 0.8.0-0~),
+               libayatana-ido3-dev (>= 0.8.0),
                systemd [linux-any],
 Standards-Version: 4.5.0
 Rules-Requires-Root: no
@@ -93,16 +93,16 @@ Package: ayatana-indicator-common
 Architecture: all
 Depends: ${misc:Depends},
 Multi-Arch: foreign
-Breaks: ayatana-indicator-application (<< 0.8.0-0~),
-        ayatana-indicator-datetime (<< 0.8.0-0~),
-        ayatana-indicator-display (<< 0.8.0-0~),
-        ayatana-indicator-keyboard (<< 0.8.0-0~),
-        ayatana-indicator-messages (<< 0.8.0-0~),
-        ayatana-indicator-notifications (<< 0.8.0-0~),
-        ayatana-indicator-printers (<< 0.8.0-0~),
-        ayatana-indicator-power (<< 2.1.0-0~),
-        ayatana-indicator-session (<< 0.8.0-0~),
-        ayatana-indicator-sound (<< 0.8.0-0~),
+Breaks: ayatana-indicator-application (<< 0.8.0),
+        ayatana-indicator-datetime (<< 0.8.0),
+        ayatana-indicator-display (<< 0.8.0),
+        ayatana-indicator-keyboard (<< 0.8.0),
+        ayatana-indicator-messages (<< 0.8.0),
+        ayatana-indicator-notifications (<< 0.8.0),
+        ayatana-indicator-printers (<< 0.8.0),
+        ayatana-indicator-power (<< 2.1.0),
+        ayatana-indicator-session (<< 0.8.0),
+        ayatana-indicator-sound (<< 0.8.0),
 Description: libayatana-indicator shared files
  The Ayatana Indicators library contains information to build indicators
  to go into modern desktops' indicator applets.
diff --git a/debian/copyright b/debian/copyright
index 91b39fa..6b4d11d 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,9 +3,7 @@ Upstream-Name: libayatana-indicator
 Upstream-Contact: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
 Source: https://github.com/AyatanaIndicators/libayatana-indicator
 
-Files: libayatana-indicator/ayatanamenuitemfactory.c
- libayatana-indicator/ayatanamenuitemfactory.h
- libayatana-indicator/dbus-shared.h
+Files: libayatana-indicator/dbus-shared.h
  libayatana-indicator/indicator-desktop-shortcuts.c
  libayatana-indicator/indicator-desktop-shortcuts.h
  libayatana-indicator/indicator-image-helper.c
@@ -59,7 +57,7 @@ Files: AUTHORS
  autogen.sh
  configure.ac
  data/Makefile.am
- data/ayatana-indicators-pre.target
+ data/ayatana-indicators.target
  helper/test-loader-build
  helper/test-loader.c
  libayatana-indicator/Makefile.am
diff --git a/debian/rules b/debian/rules
index 6cb257a..35891d0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -70,3 +70,6 @@ override_dh_auto_clean:
 	dh_auto_clean
 	rm -Rf builddir/
 	rm -Rf build-aux/
+
+get-orig-source:
+	uscan --noconf --force-download --rename --download-current-version --destdir=..