debian/: Prepare release v0.6.0. Update packaging from Debian unstable.

25 files changed, 216 insertions, 299 deletions

diff --git a/debian/changelog b/debian/changelog
index 5f8f712..3550893 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libayatana-appindicator (0.6.0) UNRELEASED; urgency=medium
+
+  * Upstream-provided Debian package for libayatana-appindicator.
+    See upstream ChangeLog for recent changes.
+
+ -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de>  Wed, 10 Jun 2026 17:26:56 +0200
+
 libayatana-appindicator (0.5.94-0) unstable; urgency=medium
 
   * Upstream-provided Debian package for libayatana-appindicator.
diff --git a/debian/compat b/debian/compat
deleted file mode 100644
index ec63514..0000000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-9
diff --git a/debian/control b/debian/control
index 8f9cd58..2f748f9 100644
--- a/debian/control
+++ b/debian/control
@@ -1,86 +1,36 @@
 Source: libayatana-appindicator
 Section: libs
 Priority: optional
-XS-Python-Version: all
 Maintainer: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
-Build-Depends: debhelper (>= 9),
-               cmake,
-               cmake-extras,
-               dpkg-dev (>= 1.16.1.1),
+Build-Depends: cmake,
+               cmake-extras (>= 1.5-8~),
+               debhelper-compat (= 13),
                at-spi2-core,
-               cli-common-dev (>= 0.8~) [amd64 arm64 armel armhf i386 mipsel ppc64el s390x kfreebsd-amd64 kfreebsd-i386 powerpc ppc64],
-               gobject-introspection,
+               gir1.2-gobject-2.0-dev,
+               gir1.2-gtk-3.0-dev,
+               gobject-introspection (>= 1.80),
                intltool,
                gtk-doc-tools,
                libxml2-utils,
-               libnunit-cil-dev [amd64 arm64 armel armhf i386 mipsel ppc64el s390x kfreebsd-amd64 kfreebsd-i386 powerpc ppc64],
                dbus-test-runner,
                xvfb,
                valac,
-               mate-common,
-               mono-devel (>= 2.4.3) [amd64 arm64 armel armhf i386 mipsel ppc64el s390x kfreebsd-amd64 kfreebsd-i386 powerpc ppc64],
-               libglib2.0-dev (>= 2.35.4),
-               libgtk-3-dev (>= 2.91.3),
-               libgtk2.0-dev (>= 2.12.0),
+               libglib2.0-dev,
+               libgtk-3-dev,
                procps,
-               gtk-sharp3-gapi [amd64 arm64 armel armhf i386 mipsel ppc64el s390x kfreebsd-amd64 kfreebsd-i386 powerpc ppc64],
-               libgtk3.0-cil-dev [amd64 arm64 armel armhf i386 mipsel ppc64el s390x kfreebsd-amd64 kfreebsd-i386 powerpc ppc64],
-               gtk-sharp2-gapi [amd64 arm64 armel armhf i386 mipsel ppc64el s390x kfreebsd-amd64 kfreebsd-i386 powerpc ppc64],
-               libgtk2.0-cil-dev [amd64 arm64 armel armhf i386 mipsel ppc64el s390x kfreebsd-amd64 kfreebsd-i386 powerpc ppc64],
-               libayatana-indicator-dev (>= 0.6.0-0~),
-               libayatana-indicator3-dev (>= 0.6.0-0~),
-               libdbusmenu-glib-dev (>= 0.5.90),
-               libdbusmenu-gtk3-dev (>= 0.5.90),
-               libdbusmenu-gtk-dev (>= 0.5.90),
-               libgirepository1.0-dev,
-Standards-Version: 4.5.0
+               libayatana-indicator3-dev,
+               libdbusmenu-glib-dev,
+               libdbusmenu-gtk3-dev,
+Standards-Version: 4.7.2
+Rules-Requires-Root: no
 Homepage: https://github.com/AyatanaIndicators/libayatana-appindicator
-Vcs-Git: https://github.com/AyatanaIndicators/libayatana-appindicator
-Vcs-Browser: https://github.com/AyatanaIndicators/libayatana-appindicator
-
-Package: libayatana-appindicator1
-Architecture: any
-Depends: ${shlibs:Depends},
-         ${misc:Depends},
-Description: Ayatana Application Indicators (GTK-2+ version)
- A library and indicator to take menus from applications and place them in
- the panel.
- .
- This package contains shared libraries to be used by applications compiled
- against GTK-2+.
-
-Package: gir1.2-ayatanaappindicator-0.1
-Section: introspection
-Architecture: any
-Depends: ${misc:Depends},
-         ${gir:Depends},
-Description: Typelib files for libayatana-appindicator1 (GTK-2+ version)
- A library and indicator to take menus from applications and place them in
- the panel.
- .
- This package can be used by other packages using the GIRepository format
- to generate dynamic bindings (GTK-2+ version).
-
-Package: libayatana-appindicator-dev
-Section: libdevel
-Architecture: any
-Depends: ${shlibs:Depends},
-         ${misc:Depends},
-         libgtk2.0-dev,
-         gir1.2-ayatanaappindicator-0.1 (= ${binary:Version}),
-         libdbusmenu-glib-dev (>= 0.1.8),
-         libdbus-glib-1-dev (>= 0.76),
-         libayatana-appindicator1 (= ${binary:Version}),
-Description: Ayatana Application Indicators (development files, GTK-2+ version)
- A library and indicator to take menus from applications and place them in
- the panel.
- .
- This package contains files that are needed to build applications
- (GTK-2+ version).
+Vcs-Git: https://salsa.debian.org/debian-ayatana-team/libayatana-appindicator.git
+Vcs-Browser: https://salsa.debian.org/debian-ayatana-team/libayatana-appindicator
 
 Package: libayatana-appindicator-doc
 Section: doc
 Architecture: all
+Multi-Arch: foreign
 Depends: ${misc:Depends},
 Description: Ayatana Application Indicators (documentation files, GTK-2+ version)
  A library and indicator to take menus from applications and place them in
@@ -90,8 +40,12 @@ Description: Ayatana Application Indicators (documentation files, GTK-2+ version
 
 Package: libayatana-appindicator3-1
 Architecture: any
+Multi-Arch: same
 Depends: ${shlibs:Depends},
          ${misc:Depends},
+Provides: libappindicator3-1 (= 12.10)
+Conflicts: libappindicator3-1,
+Replaces: libappindicator3-1,
 Description: Ayatana Application Indicators (GTK-3+ version)
  A library and indicator to take menus from applications and place them in
  the panel.
@@ -102,13 +56,18 @@ Description: Ayatana Application Indicators (GTK-3+ version)
 Package: libayatana-appindicator3-dev
 Section: libdevel
 Architecture: any
+Multi-Arch: same
 Depends: ${shlibs:Depends},
          ${misc:Depends},
+         ${gir:Depends},
+         libayatana-indicator3-dev (>= 0.9.0),
+         libdbusmenu-glib-dev,
          libgtk-3-dev,
-         gir1.2-ayatanaappindicator3-0.1 (= ${binary:Version}),
-         libdbusmenu-glib-dev (>= 0.1.8),
-         libdbus-glib-1-dev (>= 0.76),
          libayatana-appindicator3-1 (= ${binary:Version}),
+Provides: ${gir:Provides},
+          libappindicator3-dev (= 12.10),
+Conflicts: libappindicator3-dev,
+Replaces: libappindicator3-dev,
 Description: Ayatana Application Indicators (development files, GTK-3+ version)
  A library and indicator to take menus from applications and place them in
  the panel.
@@ -119,6 +78,7 @@ Description: Ayatana Application Indicators (development files, GTK-3+ version)
 Package: gir1.2-ayatanaappindicator3-0.1
 Section: introspection
 Architecture: any
+Multi-Arch: same
 Depends: ${misc:Depends},
          ${gir:Depends},
 Description: Typelib files for libayatana-appindicator3-1 (GTK-3+ version)
@@ -127,53 +87,3 @@ Description: Typelib files for libayatana-appindicator3-1 (GTK-3+ version)
  .
  This package can be used by other packages using the GIRepository format
  to generate dynamic bindings (GTK-3+ version).
-
-Package: libayatana-appindicator0.1-cil
-Section: cli-mono
-Architecture: amd64 arm64 armel armhf i386 mipsel ppc64el s390x kfreebsd-amd64 kfreebsd-i386 powerpc ppc64
-Depends: ${shlibs:Depends},
-         ${misc:Depends},
-         ${cli:Depends},
-Description: CLI bindings for libayatana-appindicator
- This package provides the appindicator-sharp assembly that allows CLI (.NET)
- programs to take menus from applications and place them in the panel.
- .
- This package contains assemblies to be used by GTK-2+ Mono applications.
-
-Package: libayatana-appindicator0.1-cil-dev
-Section: cli-mono
-Architecture: amd64 arm64 armel armhf i386 mipsel ppc64el s390x kfreebsd-amd64 kfreebsd-i386 powerpc ppc64
-Depends: ${shlibs:Depends},
-         ${misc:Depends},
-         ${cli:Depends},
-         libayatana-appindicator0.1-cil (= ${binary:Version}),
-Description: Ayatana Application Indicators for Mono (GTK-2+ variant)
- A library and indicator to take menus from applications and place them in
- the panel.
- .
- This package contains files that are needed to build Mono applications.
-
-Package: libayatana-appindicator3-0.1-cil
-Section: cli-mono
-Architecture: amd64 arm64 armel armhf i386 mipsel ppc64el s390x kfreebsd-amd64 kfreebsd-i386 powerpc ppc64
-Depends: ${shlibs:Depends},
-         ${misc:Depends},
-         ${cli:Depends},
-Description: CLI bindings for libayatana-appindicator3
- This package provides the appindicator-sharp assembly that allows CLI (.NET)
- programs to take menus from applications and place them in the panel.
- .
- This package contains assemblies to be used by GTK-2+ Mono applications.
-
-Package: libayatana-appindicator3-0.1-cil-dev
-Section: cli-mono
-Architecture: amd64 arm64 armel armhf i386 mipsel ppc64el s390x kfreebsd-amd64 kfreebsd-i386 powerpc ppc64
-Depends: ${shlibs:Depends},
-         ${misc:Depends},
-         ${cli:Depends},
-         libayatana-appindicator3-0.1-cil (= ${binary:Version}),
-Description: Ayatana Application Indicators for Mono (GTK-3+ variant)
- A library and indicator to take menus from applications and place them in
- the panel.
- .
- This package contains files that are needed to build GTK-3+ Mono applications.
diff --git a/debian/copyright b/debian/copyright
index 9cd43ea..6795dd5 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,52 +1,56 @@
-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: libayatana-appindicator
 Upstream-Contact: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
 Source: https://github.com/AyatanaIndicators/libayatana-appindicator
 
-Files: AUTHORS
+Files: .build.yml
+ .travis.yml
+ AUTHORS
+ CMakeLists.txt
  ChangeLog
- Makefile.am.coverage
- Makefile.am.enum
- Makefile.am.marshal
- Makefile.am
+ INSTALL.md
  NEWS
- README
- autogen.sh
- bindings/Makefile.am
- bindings/mono/ApplicationIndicator.custom
- bindings/mono/Makefile.am
+ README.md
+ bindings/CMakeLists.txt
+ bindings/mono/ApplicationIndicatorCustom.cs.in
+ bindings/mono/CMakeLists.txt
  bindings/mono/app-indicator.sources.xml.in
  bindings/mono/ayatana-appindicator-sharp-0.1.pc.in
- bindings/mono/ayatana-appindicator-sharp.dll.config.in
+ bindings/mono/ayatana-appindicator-sharp.dll.config
  bindings/mono/ayatana-appindicator-sharp.snk
- bindings/mono/libayatana-appindicator-api.metadata
- bindings/mono/examples/Makefile.am
+ bindings/mono/ayatana-appindicator3-sharp-0.1.pc.in
+ bindings/mono/ayatana-appindicator3-sharp.dll.config
+ bindings/mono/ayatana-appindicator3-sharp.snk
+ bindings/mono/examples/CMakeLists.txt
  bindings/mono/examples/ayatana-indicator-example.in
+ bindings/mono/libayatana-appindicator-api.metadata
+ bindings/mono/libayatana-appindicator3-api.metadata
  bindings/mono/policy.0.0.ayatana-appindicator-sharp.config.in
+ bindings/mono/policy.0.0.ayatana-appindicator3-sharp.config.in
  bindings/mono/policy.0.1.ayatana-appindicator-sharp.config.in
- bindings/python/Makefile.am
- bindings/python/ayatana_appindicator.defs
- example/simple-client-test-icon.png
- bindings/vala/Makefile.am
- bindings/vala/examples/Makefile.am
- docs/Makefile.am
- docs/reference/Makefile.am
+ bindings/mono/policy.0.1.ayatana-appindicator3-sharp.config.in
+ bindings/vala/CMakeLists.txt
+ bindings/vala/ayatana-appindicator3-0.1.deps
+ bindings/vala/examples/CMakeLists.txt
+ docs/CMakeLists.txt
+ docs/reference/CMakeLists.txt
  docs/reference/libayatana-appindicator-docs.sgml.in
  docs/reference/libayatana-appindicator-overrides.txt
  docs/reference/libayatana-appindicator-sections.txt
  docs/reference/libayatana-appindicator.types
+ docs/reference/scangobj.sh.in
  docs/reference/version.xml.in
- example/Makefile.am
+ example/CMakeLists.txt
  example/simple-client-test-icon.png
- m4/gcov.m4
- src/AyatanaAppIndicator-0.1.metadata.in
- src/AyatanaAppIndicator3-0.1.metadata.in
- src/Makefile.am
+ src/AyatanaAppIndicator-0.1.metadata
+ src/AyatanaAppIndicator3-0.1.metadata
+ src/CMakeLists.txt
+ src/app-indicator.symbols
  src/ayatana-appindicator-0.1.pc.in
  src/ayatana-appindicator3-0.1.pc.in
  src/notification-item.xml
  src/notification-watcher.xml
- tests/Makefile.am
+ tests/CMakeLists.txt
  tests/run-xvfb.sh
  tests/test-libappindicator-fallback-item.c
  tests/test-libappindicator.desktop
@@ -59,8 +63,12 @@ Comment:
  Assuming same copyright holdership as in majority of the other files in
  this code project
 
-Files: bindings/mono/AssemblyInfo.cs
- bindings/mono/TestAyatanaIndicator.cs
+Files: cmake/FindVala.cmake
+ cmake/UseVala.cmake
+Copyright: 2011, Přemysl Janouch
+License: BSD-2-clause
+
+Files: bindings/mono/TestAyatanaIndicator.cs
  bindings/mono/examples/AyatanaIndicatorExample.cs
  bindings/vala/examples/ayatana-indicator-example.vala
  example/simple-client-vala.vala
@@ -82,49 +90,38 @@ Copyright: 2009, Canonical Ltd.
   2011, Canonical Ltd.
 License: GPL-3
 
-Files: bindings/python/__init__.py
- bindings/python/appindicator-arg-types.py
- bindings/python/ayatana_appindicator.override.in
- src/app-indicator-enum-types.c.in
+Files: src/app-indicator-enum-types.c.in
  src/app-indicator-enum-types.h.in
  src/app-indicator.c
  src/app-indicator.h
 Copyright: 2009, Canonical Ltd.
 License: LGPL-2.1 or LGPL-3
 
-Files: acinclude.m4
-Copyright: 1999-2004, Free Software Foundation, Inc.
-License: GPL-2+
-
-Files: configure.ac
-Copyright: 2009-2011, Canonical Ltd.
-  2015, Arctica Project
-License: LGPL-2.1 or LGPL-3 or GPL-3
-Comment:
- Assuming licenses as found in COPYING and COPYING.LGPL.2.1 file. As some
- code files are also licensed under GPL-3, assuming that one, as well.
- .
- Adding Canonical Ltd. to copyright holders, as they original set up this
- project.
-
-Files: bindings/python/ayatana_appindicatormodule.c
-Copyright: 2009, Canonical Ltd.
-  2015, Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
-License: LGPL-2.1 or LGPL-3
-
 Files: bindings/vala/ayatana-appindicator-0.1-custom.vala
 Copyright: 2011, Canonical, Ltd.
 License: LGPL-2.1 or LGPL-3
 
-Files: m4/introspection.m4
-Copyright: 2009, Johan Dahlin
-License: public-domain
+Files: cmake/FindGObjectIntrospection.cmake
+ cmake/UseGObjectIntrospection.cmake
+Copyright: 2010, Pino Toscano, <pino@kde.org>
+License: BSD-3-clause
+
+Files: bindings/mono/AssemblyInfo.cs
+Copyright: 2010, Canonical Ltd.
+  2010, Canonical, Ltd.
+  2015, Mike Gabriel
+  2021, Robert Tari
+License: GPL-3
 
 Files: debian/*
 Copyright: 2009-2011, Canonical Ltd.
-  2015-2017, Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
+  2015-2024, Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
 License: GPL-3
 
+Files: debian/patches/*
+Copyright: 2023, Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
+License: GPL-3 or LGPL-2.1 or LGPL-3
+
 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
@@ -159,23 +156,6 @@ License: LGPL-2.1
  .
  See /usr/share/common-licenses/LGPL-2.1 for the full license text.
 
-License: GPL-2+
- 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 2 of the License, or (at your
- option) any later version.
- .
- This program 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
- Library General Public License for more details.
- .
- You should have received a copy of the GNU General Public License along
- with this program; if not, write to the Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- .
- See /usr/share/common-licenses/GPL-2 for the full license text.
-
 License: LGPL-3
  This library is free software; you can redistribute it and/or
  modify it under the terms of the GNU Library General Public
@@ -197,3 +177,50 @@ License: public-domain
  This file is free software; the author(s) gives unlimited
  permission to copy and/or distribute it, with or without
  modifications, as long as this notice is preserved.
+
+License: BSD-3-clause
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ .
+ 1. Redistributions of source code must retain the copyright
+    notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the copyright
+    notice, this list of conditions and the following disclaimer in the
+    documentation and/or other materials provided with the distribution.
+ 3. The name of the author may not be used to endorse or promote products 
+    derived from this software without specific prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+License: BSD-2-clause
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+ .
+     * Redistributions of source code must retain the above copyright
+       notice, this list of conditions and the following disclaimer.
+     * Redistributions in binary form must reproduce the above copyright
+       notice, this list of conditions and the following disclaimer in the
+       documentation and/or other materials provided with the distribution.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS''
+ AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE
+ FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ OF SUCH DAMAGE.
+
diff --git a/debian/gir1.2-ayatanaappindicator-0.1.install b/debian/gir1.2-ayatanaappindicator-0.1.install
deleted file mode 100644
index 7f6cfb2..0000000
--- a/debian/gir1.2-ayatanaappindicator-0.1.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/girepository-1.0/AyatanaAppIndicator-0.1.typelib
diff --git a/debian/libayatana-appindicator-dev.install b/debian/libayatana-appindicator-dev.install
deleted file mode 100644
index 371055d..0000000
--- a/debian/libayatana-appindicator-dev.install
+++ /dev/null
@@ -1,4 +0,0 @@
-usr/include/libayatana-appindicator-0.1/*
-usr/lib/*/libayatana-appindicator.so
-usr/lib/*/pkgconfig/ayatana-appindicator-0.1.pc
-usr/share/gir-1.0/AyatanaAppIndicator-0.1.gir
diff --git a/debian/libayatana-appindicator-doc.doc-base b/debian/libayatana-appindicator-doc.doc-base
new file mode 100644
index 0000000..ccb7801
--- /dev/null
+++ b/debian/libayatana-appindicator-doc.doc-base
@@ -0,0 +1,9 @@
+Document: libayatana-appindicator-doc
+Title: libayatana-appindicator API documentation
+Author: Ayatana Indicators Team
+Abstract: This document describes the API of the libayatana-appindicator (GTK-3 variant) library.
+Section: Programming/C
+
+Format: HTML
+Index: /usr/share/doc/libayatana-appindicator3-dev/html/index.html
+Files: /usr/share/doc/libayatana-appindicator3-dev/html/*
diff --git a/debian/libayatana-appindicator-doc.install b/debian/libayatana-appindicator-doc.install
index b0e75e4..7ca670e 100644
--- a/debian/libayatana-appindicator-doc.install
+++ b/debian/libayatana-appindicator-doc.install
@@ -1 +1 @@
-usr/share/gtk-doc/html/libayatana-appindicator3/*
+usr/share/doc/libayatana-appindicator3-dev/html
diff --git a/debian/libayatana-appindicator-doc.links b/debian/libayatana-appindicator-doc.links
new file mode 100644
index 0000000..fd2ded5
--- /dev/null
+++ b/debian/libayatana-appindicator-doc.links
@@ -0,0 +1 @@
+usr/share/doc/libayatana-appindicator3-dev/html usr/share/gtk-doc/html/libayatana-appindicator3
diff --git a/debian/libayatana-appindicator0.1-cil-dev.install b/debian/libayatana-appindicator0.1-cil-dev.install
deleted file mode 100644
index 5194099..0000000
--- a/debian/libayatana-appindicator0.1-cil-dev.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/pkgconfig/ayatana-appindicator-sharp-0.1.pc
diff --git a/debian/libayatana-appindicator0.1-cil.install b/debian/libayatana-appindicator0.1-cil.install
deleted file mode 100644
index 2ce8022..0000000
--- a/debian/libayatana-appindicator0.1-cil.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/cli/ayatana-appindicator-sharp-0.1/* /usr/lib/cli/ayatana-appindicator-sharp-0.1/
diff --git a/debian/libayatana-appindicator0.1-cil.installcligac b/debian/libayatana-appindicator0.1-cil.installcligac
deleted file mode 100644
index a041e9e..0000000
--- a/debian/libayatana-appindicator0.1-cil.installcligac
+++ /dev/null
@@ -1,3 +0,0 @@
-/usr/lib/cli/ayatana-appindicator-sharp-0.1/ayatana-appindicator-sharp.dll
-/usr/lib/cli/ayatana-appindicator-sharp-0.1/policy.0.0.ayatana-appindicator-sharp.dll
-/usr/lib/cli/ayatana-appindicator-sharp-0.1/policy.0.1.ayatana-appindicator-sharp.dll
diff --git a/debian/libayatana-appindicator1.install b/debian/libayatana-appindicator1.install
deleted file mode 100644
index 96d99db..0000000
--- a/debian/libayatana-appindicator1.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/libayatana-appindicator.so.*
diff --git a/debian/libayatana-appindicator1.symbols b/debian/libayatana-appindicator1.symbols
deleted file mode 100644
index 9ed4f62..0000000
--- a/debian/libayatana-appindicator1.symbols
+++ /dev/null
@@ -1,42 +0,0 @@
-libayatana-appindicator.so.1 libayatana-appindicator1 #MINVER#
- _application_service_marshal_VOID__BOOLEAN_STRING_OBJECT@Base 0.5.90
- _application_service_marshal_VOID__INT_INT@Base 0.5.90
- _application_service_marshal_VOID__INT_STRING@Base 0.5.90
- _application_service_marshal_VOID__INT_STRING_STRING@Base 0.5.90
- _application_service_marshal_VOID__INT_UINT@Base 0.5.90
- _application_service_marshal_VOID__STRING_INT_STRING_STRING_STRING_STRING_STRING@Base 0.5.90
- _application_service_marshal_VOID__STRING_STRING@Base 0.5.90
- _generate_id@Base 0.5.90
-#MISSING: 0.5.92-0# _notification_item@Base 0.5.90
-#MISSING: 0.5.92-0# _notification_watcher@Base 0.5.90
- app_indicator_build_menu_from_desktop@Base 0.2.91
- app_indicator_category_get_type@Base 0.2.91
- app_indicator_get_attention_icon@Base 0.2.91
- app_indicator_get_attention_icon_desc@Base 0.2.96
- app_indicator_get_category@Base 0.2.91
- app_indicator_get_icon@Base 0.2.91
- app_indicator_get_icon_desc@Base 0.2.96
- app_indicator_get_icon_theme_path@Base 0.2.91
- app_indicator_get_id@Base 0.2.91
- app_indicator_get_label@Base 0.2.91
- app_indicator_get_label_guide@Base 0.2.91
- app_indicator_get_menu@Base 0.2.91
- app_indicator_get_ordering_index@Base 0.2.91
- app_indicator_get_secondary_activate_target@Base 0.3.91
- app_indicator_get_status@Base 0.2.91
- app_indicator_get_title@Base 0.4.90
- app_indicator_get_type@Base 0.2.91
- app_indicator_new@Base 0.2.91
- app_indicator_new_with_path@Base 0.2.91
- app_indicator_set_attention_icon@Base 0.2.91
- app_indicator_set_attention_icon_full@Base 0.2.96
- app_indicator_set_icon@Base 0.2.91
- app_indicator_set_icon_full@Base 0.2.96
- app_indicator_set_icon_theme_path@Base 0.2.91
- app_indicator_set_label@Base 0.2.91
- app_indicator_set_menu@Base 0.2.91
- app_indicator_set_ordering_index@Base 0.2.91
- app_indicator_set_secondary_activate_target@Base 0.3.91
- app_indicator_set_status@Base 0.2.91
- app_indicator_set_title@Base 0.4.90
- app_indicator_status_get_type@Base 0.2.91
diff --git a/debian/libayatana-appindicator3-0.1-cil-dev.install b/debian/libayatana-appindicator3-0.1-cil-dev.install
deleted file mode 100644
index 57152eb..0000000
--- a/debian/libayatana-appindicator3-0.1-cil-dev.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/pkgconfig/ayatana-appindicator3-sharp-0.1.pc
diff --git a/debian/libayatana-appindicator3-0.1-cil.install b/debian/libayatana-appindicator3-0.1-cil.install
deleted file mode 100644
index d481a30..0000000
--- a/debian/libayatana-appindicator3-0.1-cil.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/cli/ayatana-appindicator3-sharp-0.1/* /usr/lib/cli/ayatana-appindicator3-sharp-0.1/
diff --git a/debian/libayatana-appindicator3-0.1-cil.installcligac b/debian/libayatana-appindicator3-0.1-cil.installcligac
deleted file mode 100644
index c6c3188..0000000
--- a/debian/libayatana-appindicator3-0.1-cil.installcligac
+++ /dev/null
@@ -1,3 +0,0 @@
-/usr/lib/cli/ayatana-appindicator3-sharp-0.1/ayatana-appindicator3-sharp.dll
-/usr/lib/cli/ayatana-appindicator3-sharp-0.1/policy.0.0.ayatana-appindicator3-sharp.dll
-/usr/lib/cli/ayatana-appindicator3-sharp-0.1/policy.0.1.ayatana-appindicator3-sharp.dll
diff --git a/debian/libayatana-appindicator3-1.install b/debian/libayatana-appindicator3-1.install
index e6eda14..d577173 100644
--- a/debian/libayatana-appindicator3-1.install
+++ b/debian/libayatana-appindicator3-1.install
@@ -1 +1,2 @@
 usr/lib/*/libayatana-appindicator3.so.*
+usr/lib/*/libappindicator3.so.*
diff --git a/debian/libayatana-appindicator3-1.symbols b/debian/libayatana-appindicator3-1.symbols
index ffff17a..1daee34 100644
--- a/debian/libayatana-appindicator3-1.symbols
+++ b/debian/libayatana-appindicator3-1.symbols
@@ -1,14 +1,15 @@
 libayatana-appindicator3.so.1 libayatana-appindicator3-1 #MINVER#
- _application_service_marshal_VOID__BOOLEAN_STRING_OBJECT@Base 0.5.90
- _application_service_marshal_VOID__INT_INT@Base 0.5.90
- _application_service_marshal_VOID__INT_STRING@Base 0.5.90
- _application_service_marshal_VOID__INT_STRING_STRING@Base 0.5.90
- _application_service_marshal_VOID__INT_UINT@Base 0.5.90
- _application_service_marshal_VOID__STRING_INT_STRING_STRING_STRING_STRING_STRING@Base 0.5.90
- _application_service_marshal_VOID__STRING_STRING@Base 0.5.90
- _generate_id@Base 0.5.90
-#MISSING: 0.5.92-0# _notification_item@Base 0.5.90
-#MISSING: 0.5.92-0# _notification_watcher@Base 0.5.90
+* Build-Depends-Package: libayatana-appindicator3-dev
+#MISSING: 0.5.94-1# _application_service_marshal_VOID__BOOLEAN_STRING_OBJECT@Base 0.5.90
+#MISSING: 0.5.94-1# _application_service_marshal_VOID__INT_INT@Base 0.5.90
+#MISSING: 0.5.94-1# _application_service_marshal_VOID__INT_STRING@Base 0.5.90
+#MISSING: 0.5.94-1# _application_service_marshal_VOID__INT_STRING_STRING@Base 0.5.90
+#MISSING: 0.5.94-1# _application_service_marshal_VOID__INT_UINT@Base 0.5.90
+#MISSING: 0.5.94-1# _application_service_marshal_VOID__STRING_INT_STRING_STRING_STRING_STRING_STRING@Base 0.5.90
+#MISSING: 0.5.94-1# _application_service_marshal_VOID__STRING_STRING@Base 0.5.90
+#MISSING: 0.5.94-1# _generate_id@Base 0.5.90
+#MISSING: 0.5.93+really-1# _notification_item@Base 0.5.90
+#MISSING: 0.5.93+really-1# _notification_watcher@Base 0.5.90
  app_indicator_build_menu_from_desktop@Base 0.2.92
  app_indicator_category_get_type@Base 0.2.92
  app_indicator_get_attention_icon@Base 0.2.92
@@ -25,6 +26,9 @@ libayatana-appindicator3.so.1 libayatana-appindicator3-1 #MINVER#
  app_indicator_get_secondary_activate_target@Base 0.3.91
  app_indicator_get_status@Base 0.2.92
  app_indicator_get_title@Base 0.4.90
+ app_indicator_get_tooltip_body@Base 0.6.0
+ app_indicator_get_tooltip_icon@Base 0.6.0
+ app_indicator_get_tooltip_title@Base 0.6.0
  app_indicator_get_type@Base 0.2.92
  app_indicator_new@Base 0.2.92
  app_indicator_new_with_path@Base 0.2.92
@@ -39,4 +43,8 @@ libayatana-appindicator3.so.1 libayatana-appindicator3-1 #MINVER#
  app_indicator_set_secondary_activate_target@Base 0.3.91
  app_indicator_set_status@Base 0.2.92
  app_indicator_set_title@Base 0.4.90
+ app_indicator_set_tooltip_body@Base 0.6.0
+ app_indicator_set_tooltip_full@Base 0.6.0
+ app_indicator_set_tooltip_icon@Base 0.6.0
+ app_indicator_set_tooltip_title@Base 0.6.0
  app_indicator_status_get_type@Base 0.2.92
diff --git a/debian/libayatana-appindicator3-dev.examples b/debian/libayatana-appindicator3-dev.examples
new file mode 100644
index 0000000..562bab9
--- /dev/null
+++ b/debian/libayatana-appindicator3-dev.examples
@@ -0,0 +1 @@
+bindings/vala/examples/*
diff --git a/debian/libayatana-appindicator3-dev.install b/debian/libayatana-appindicator3-dev.install
index 59edd11..5e5b65c 100644
--- a/debian/libayatana-appindicator3-dev.install
+++ b/debian/libayatana-appindicator3-dev.install
@@ -1,4 +1,5 @@
 usr/lib/*/libayatana-appindicator3.so
+usr/lib/*/libappindicator3.so
 usr/lib/*/pkgconfig/ayatana-appindicator3-0.1.pc
 usr/include/libayatana-appindicator3-0.1/*
 usr/share/gir-1.0/AyatanaAppIndicator3-0.1.gir
diff --git a/debian/rules b/debian/rules
index bb5ba21..944c630 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,7 +2,7 @@
 
 include /usr/share/dpkg/architecture.mk
 
-FLAVOURS = gtk3 gtk2
+FLAVOURS = gtk3
 
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 DPKG_EXPORT_BUILDFLAGS = 1
@@ -10,22 +10,19 @@ include /usr/share/dpkg/buildflags.mk
 
 API_VERSION = 0.1
 
-CONFIGURE_COMMON_FLAGS = -DENABLE_TESTS=ON
-ifeq (,$(filter $(DEB_HOST_ARCH),amd64 arm64 armel armhf i386 mipsel ppc64el s390x kfreebsd-amd64 kfreebsd-i386 powerpc ppc64))
-# CONFIGURE_COMMON_FLAGS += -DENABLE_MONO_TESTS=OFF
-  CONFIGURE_COMMON_FLAGS +=
-else
-  dh_extra_args = ,cli
-endif
-CONFIGURE_FLAGS_gtk2 = -DFLAVOUR_GTK2=ON -DENABLE_GTKDOC=OFF
-CONFIGURE_FLAGS_gtk3 = -DFLAVOUR_GTK3=ON -DENABLE_GTKDOC=ON
+DO_PACKAGES := $(shell dh_listpackages)
+
+CONFIGURE_COMMON_FLAGS = -DENABLE_TESTS=ON -DENABLE_BINDINGS_MONO=OFF
+CONFIGURE_FLAGS_gtk3 = \
+	-DFLAVOUR_GTK3=ON \
+	-DENABLE_GTKDOC=$(if $(filter libayatana-appindicator-doc,$(DO_PACKAGES)),ON,OFF)
 
 export DPKG_GENSYMBOLS_CHECK_LEVEL = 4
 
 CFLAGS += -fPIC
 
 %:
-	dh $@ --with gir$(dh_extra_args)
+	dh $@ --with gir
 
 override_dh_auto_configure: $(FLAVOURS:%=doconfigure-%)
 
@@ -47,21 +44,30 @@ override_dh_install:
 	find debian/tmp -name \*.a -exec rm {} \;
 	rm -rf debian/tmp/*/usr/lib/mono
 	rm -rf debian/tmp/*/usr/share/vala/vapi/ayatana-appindicator*-0.1.deps
-	dh_install -plibayatana-appindicator1 --fail-missing --sourcedir=debian/tmp/gtk2
-	dh_install -pgir1.2-ayatanaappindicator-0.1 --fail-missing --sourcedir=debian/tmp/gtk2
-	dh_install -plibayatana-appindicator-dev --fail-missing --sourcedir=debian/tmp/gtk2
-	dh_install -plibayatana-appindicator-doc --fail-missing --sourcedir=debian/tmp/gtk3
-	dh_install -plibayatana-appindicator3-1 --fail-missing --sourcedir=debian/tmp/gtk3
-	dh_install -plibayatana-appindicator3-dev --fail-missing --sourcedir=debian/tmp/gtk3
-	dh_install -pgir1.2-ayatanaappindicator3-0.1 --fail-missing --sourcedir=debian/tmp/gtk3
-	if echo amd64 arm64 armel armhf i386 mipsel ppc64el s390x kfreebsd-amd64 kfreebsd-i386 powerpc ppc64 | grep -q $(DEB_HOST_ARCH); then \
-	    dh_install -plibayatana-appindicator3-0.1-cil --fail-missing --sourcedir=debian/tmp/gtk3; \
-	    dh_install -plibayatana-appindicator3-0.1-cil-dev --fail-missing --sourcedir=debian/tmp/gtk3; \
-	    dh_install -plibayatana-appindicator0.1-cil --fail-missing --sourcedir=debian/tmp/gtk2; \
-	    dh_install -plibayatana-appindicator0.1-cil-dev --fail-missing --sourcedir=debian/tmp/gtk2; \
-	fi
+	mkdir -p debian/tmp/gtk3/usr/share/doc/libayatana-appindicator3-dev/
+ifneq ($(filter libayatana-appindicator-doc,$(DO_PACKAGES)),)
+	mv debian/tmp/gtk3/usr/share/gtk-doc/html/libayatana-appindicator3 debian/tmp/gtk3/usr/share/doc/libayatana-appindicator3-dev/html
+endif
+
+	ln -s libayatana-appindicator3.so   debian/tmp/gtk3/usr/lib/$(DEB_HOST_MULTIARCH)/libappindicator3.so
+	ln -s libayatana-appindicator3.so.1 debian/tmp/gtk3/usr/lib/$(DEB_HOST_MULTIARCH)/libappindicator3.so.1
+
+	dh_install -plibayatana-appindicator-doc --sourcedir=debian/tmp/gtk3
+	dh_install -plibayatana-appindicator3-1 --sourcedir=debian/tmp/gtk3
+	dh_install -plibayatana-appindicator3-dev --sourcedir=debian/tmp/gtk3
+	dh_install -pgir1.2-ayatanaappindicator3-0.1 --sourcedir=debian/tmp/gtk3
+
+override_dh_missing:
+	dh_missing -plibayatana-appindicator-doc --fail-missing --sourcedir=debian/tmp/gtk3
+	dh_missing -plibayatana-appindicator3-1 --fail-missing --sourcedir=debian/tmp/gtk3
+	dh_missing -plibayatana-appindicator3-dev --fail-missing --sourcedir=debian/tmp/gtk3
+	dh_missing -pgir1.2-ayatanaappindicator3-0.1 --fail-missing --sourcedir=debian/tmp/gtk3
+
+override_dh_link:
+	dh_link -plibayatana-appindicator-doc
 
 override_dh_auto_test:
+ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 	mkdir -p $(CURDIR)/debian/tmphome-gtk3/.local/share
 	mkdir -p $(CURDIR)/debian/tmphome-gtk3/.cache
 	export HOME=$(CURDIR)/debian/tmphome-gtk3 \
@@ -72,18 +78,14 @@ override_dh_auto_test:
 	# View test's log file for better debugging of problems when built in clean chroots.
 	if [ -e build/gtk3/tests/test-suite.log ]; then cat build/gtk3/tests/test-suite.log; fi
 	rm -Rf $(CURDIR)/debian/tmphome-gtk3
-
-	mkdir -p $(CURDIR)/debian/tmphome-gtk2/.local/share
-	mkdir -p $(CURDIR)/debian/tmphome-gtk2/.cache
-	export HOME=$(CURDIR)/debian/tmphome-gtk2 \
-	    && export XDG_DATA_HOME=$(CURDIR)/debian/tmphome-gtk2/.local/share \
-	    && export XDG_CACHE_HOME=$(CURDIR)/debian/tmphome-gtk2/.cache \
-	    && unset DBUS_SESSION_BUS_ADDRESS \
-	    && dh_auto_test --no-parallel --builddirectory=build/gtk2
-	# View test's log file for better debugging of problems when built in clean chroots.
-	if [ -e build/gtk2/tests/test-suite.log ]; then cat build/gtk2/tests/test-suite.log; fi
-	rm -Rf $(CURDIR)/debian/tmphome-gtk2
+endif
 
 override_dh_auto_clean:
 	dh_auto_clean
 	rm -rf build
+
+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 d3827e7..89ae9db 100644
--- a/debian/source/format
+++ b/debian/source/format
@@ -1 +1 @@
-1.0
+3.0 (native)
diff --git a/debian/upstream/metadata b/debian/upstream/metadata
new file mode 100644
index 0000000..2c09bef
--- /dev/null
+++ b/debian/upstream/metadata
@@ -0,0 +1,6 @@
+Bug-Database: https://github.com/AyatanaIndicators/libayatana-appindicator/issues
+Bug-Submit: https://github.com/AyatanaIndicators/libayatana-appindicator/issues/new
+Donation: https://ubports.com/donate
+Repository: https://github.com/AyatanaIndicators/libayatana-appindicator
+Repository-Browse: https://github.com/AyatanaIndicators/libayatana-appindicator
+Security-Contact: security@ayatana-indicators.org
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 0000000..7e23e6c
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,3 @@
+version=4
+opts=pgpsigurlmangle=s/$/.asc/ \
+https://releases.ayatana-indicators.org/source/libayatana-appindicator/libayatana-appindicator-(.+)\.tar\.gz