Fork from Ubuntu's libappindicator project.

27 files changed, 96 insertions, 87 deletions

diff --git a/debian/changelog b/debian/changelog
index c806933..e76bbd0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libayatana-appindicator (0.5.0-0) UNRELEASED; urgency=medium
+
+  * Fork from Ubuntu's libappindicator project.
+
+ -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de>  Mon, 09 Nov 2015 14:00:48 +0000
+
 libappindicator (12.10.1+15.04.20141110-0ubuntu1) vivid; urgency=low
 
   [ Lars Uebernickel ]
diff --git a/debian/control b/debian/control
index 30c1b62..9c7c502 100644
--- a/debian/control
+++ b/debian/control
@@ -1,13 +1,13 @@
-Source: libappindicator
+Source: libayatana-appindicator
 Section: gnome
 Priority: optional
 XS-Python-Version: all
-Maintainer: Ubuntu Desktop Team <ubuntu-desktop@lists.ubuntu.com>
+Maintainer: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
 Build-Depends: debhelper (>= 9),
                dh-autoreconf,
                python-all-dev,
                at-spi2-core,
-               cli-common-dev (>= 0.5.7) [!arm64 !ppc64el],
+               cli-common-dev (>= 0.8~) [!arm64 !ppc64el],
                gobject-introspection,
                intltool,
                gtk-doc-tools,
@@ -24,139 +24,145 @@ Build-Depends: debhelper (>= 9),
                gtk-sharp2-gapi [!arm64 !ppc64el],
                libgtk2.0-cil-dev [!arm64 !ppc64el],
                libdbus-glib-1-dev (>= 0.82),
-               libindicator-dev (>= 0.3.90),
-               libindicator3-dev (>= 0.3.90),
+               libayatana-indicator-dev (>= 0.6.0),
+               libayatana-indicator3-dev (>= 0.6.0),
                libdbusmenu-glib-dev (>= 0.5.90),
                libdbusmenu-gtk-dev (>= 0.5.90),
                libdbusmenu-gtk3-dev (>= 0.5.90),
                libgirepository1.0-dev,
-Standards-Version: 3.9.1
-Homepage: https://launchpad.net/libappindicator
-# 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/libappindicator/trunk.13.04
-Vcs-Browser: https://bazaar.launchpad.net/~indicator-applet-developers/libappindicator/trunk.13.04/files
+Standards-Version: 3.9.6
+Homepage: https://github.com/ArcticaProject/libayatana-appindicator
+Vcs-Git: git://cgit.arctica-project.org/ayatana/libayatana-appindicator.git
+Vcs-Browser: https://cgit.arctica-project.org/ayatana/libayatana-appindicator.git/
 
-Package: python-appindicator
+Package: python-ayatana-appindicator
 Section: python
 Architecture: any
 XB-Python-Version: ${python:Versions}
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          ${python:Depends},
-         libappindicator1 (= ${binary:Version}),
+         libayatana-appindicator1 (= ${binary:Version}),
          python-gobject,
 Provides: ${python:Provides},
-Description: Python bindings for libappindicator
- This package provides Python bindings so that you can use libappindicator from 
- a Python program.
+Description: Python bindings for libayatana-appindicator (GTK2 version)
+ A library and indicator to take menus from applications and place them in
+ the panel.
+ .
+ This package provides Python bindings so that you can use
+ libayatana-appindicator from a Python program.
 
-Package: libappindicator1
+Package: libayatana-appindicator1
 Section: libs
 Architecture: any
-Pre-Depends: multiarch-support,
 Depends: ${shlibs:Depends},
          ${misc:Depends},
-Recommends: indicator-application (>= 0.2.93),
-Description: Application Indicators
+Recommends: ayatana-indicator-application (>= 0.2.93),
+Description: Ayatana Application Indicators (GTK2 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.
+ This package contains shared libraries to be used by applications compiled
+ against GTK2.
 
-Package: gir1.2-appindicator-0.1
+Package: gir1.2-ayatanaappindicator-0.1
 Section: introspection
 Architecture: any
 Depends: ${misc:Depends},
          ${gir:Depends},
-Description: Typelib files for libappindicator1.
+Description: Typelib files for libayatana-appindicator1 (GTK2 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.
+ to generate dynamic bindings (GTK2 version).
 
-Package: libappindicator-dev
+Package: libayatana-appindicator-dev
 Section: libdevel
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
-         gir1.2-appindicator-0.1 (= ${binary:Version}),
+         gir1.2-ayatanaappindicator-0.1 (= ${binary:Version}),
          libdbusmenu-glib-dev (>= 0.1.8),
          libdbus-glib-1-dev (>= 0.76),
-         libappindicator1 (= ${binary:Version}),
-Description: Application Indicators
+         libayatana-appindicator1 (= ${binary:Version}),
+Description: Ayatana Application Indicators (development files, GTK2 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.
+ This package contains files that are needed to build applications (GTK2
+ version).
 
-Package: libappindicator-doc
+Package: libayatana-appindicator-doc
 Section: doc
 Architecture: all
 Depends: ${misc:Depends},
-Description:  Application Indicators
+Description:  Ayatana Application Indicators (documentation files, GTK2 version)
  A library and indicator to take menus from applications and place them in
  the panel.
  .
- This package contains developer documentation.
+ This package contains developer documentation (GTK2 version).
 
-Package: libappindicator3-1
+Package: libayatana-appindicator3-1
 Section: libs
 Architecture: any
-Pre-Depends: multiarch-support,
 Depends: ${shlibs:Depends},
          ${misc:Depends},
-Recommends: indicator-application (>= 0.2.93),
-Description: Application Indicators
+Recommends: ayatana-indicator-application (>= 0.2.93),
+Description: Ayatana Application Indicators (GTK3 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.
+ This package contains shared libraries to be used by applications compiled
+ against GTK3.
 
-Package: libappindicator3-dev
+Package: libayatana-appindicator3-dev
 Section: libdevel
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
-         gir1.2-appindicator3-0.1 (= ${binary:Version}),
+         gir1.2-ayatanaappindicator3-0.1 (= ${binary:Version}),
          libdbusmenu-glib-dev (>= 0.1.8),
          libdbus-glib-1-dev (>= 0.76),
-         libappindicator3-1 (= ${binary:Version}),
-Description: Application Indicators
+         libayatana-appindicator3-1 (= ${binary:Version}),
+Description: Ayatana Application Indicators (development files, GTK3 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.
+ This package contains files that are needed to build applications (GTK3
+ version).
 
-Package: gir1.2-appindicator3-0.1
+Package: gir1.2-ayatanaappindicator3-0.1
 Section: introspection
 Architecture: any
 Depends: ${misc:Depends},
          ${gir:Depends},
-Description: Typelib files for libappindicator3-1.
+Description: Typelib files for libayatana-appindicator3-1 (GTK3 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.
+ to generate dynamic bindings (GTK3 version).
 
-Package: libappindicator0.1-cil
+Package: libayatana-appindicator0.1-cil
 Section: cli-mono
 Architecture: all
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          ${cli:Depends},
-Description: CLI bindings for libappindicator
+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 applications.
 
-Package: libappindicator0.1-cil-dev
-Section: libdevel
+Package: libayatana-appindicator0.1-cil-dev
+Section: cli-mono
 Architecture: all
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          ${cli:Depends},
-         libappindicator0.1-cil (= ${binary:Version}),
+         libayatana-appindicator0.1-cil (= ${binary:Version}),
 Description: Application Indicators
  A library and indicator to take menus from applications and place them in
  the panel.
diff --git a/debian/gir1.2-appindicator-0.1.install b/debian/gir1.2-appindicator-0.1.install
deleted file mode 100644
index 00139ac..0000000
--- a/debian/gir1.2-appindicator-0.1.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/girepository-1.0/AppIndicator-0.1.typelib usr/lib/girepository-1.0
diff --git a/debian/gir1.2-appindicator3-0.1.install b/debian/gir1.2-appindicator3-0.1.install
deleted file mode 100644
index 46bb935..0000000
--- a/debian/gir1.2-appindicator3-0.1.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/girepository-1.0/AppIndicator3-0.1.typelib usr/lib/girepository-1.0
diff --git a/debian/gir1.2-ayatanaappindicator-0.1.install b/debian/gir1.2-ayatanaappindicator-0.1.install
new file mode 100644
index 0000000..e9a3f26
--- /dev/null
+++ b/debian/gir1.2-ayatanaappindicator-0.1.install
@@ -0,0 +1 @@
+usr/lib/*/girepository-1.0/AyatanaAppIndicator-0.1.typelib usr/lib/girepository-1.0
diff --git a/debian/gir1.2-ayatanaappindicator3-0.1.install b/debian/gir1.2-ayatanaappindicator3-0.1.install
new file mode 100644
index 0000000..ab51907
--- /dev/null
+++ b/debian/gir1.2-ayatanaappindicator3-0.1.install
@@ -0,0 +1 @@
+usr/lib/*/girepository-1.0/AyatanaAppIndicator3-0.1.typelib usr/lib/girepository-1.0
diff --git a/debian/libappindicator-dev.install b/debian/libappindicator-dev.install
deleted file mode 100644
index 092a809..0000000
--- a/debian/libappindicator-dev.install
+++ /dev/null
@@ -1,5 +0,0 @@
-usr/include/libappindicator-0.1/*
-usr/lib/*/libappindicator.so
-usr/lib/*/pkgconfig/appindicator-0.1.pc
-usr/share/gir-1.0/AppIndicator-0.1.gir
-usr/share/vala/vapi/appindicator-0.1.vapi
diff --git a/debian/libappindicator-doc.install b/debian/libappindicator-doc.install
deleted file mode 100644
index f2d9d8e..0000000
--- a/debian/libappindicator-doc.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/gtk-doc/html/libappindicator/*
diff --git a/debian/libappindicator0.1-cil-dev.install b/debian/libappindicator0.1-cil-dev.install
deleted file mode 100644
index 22bd601..0000000
--- a/debian/libappindicator0.1-cil-dev.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/pkgconfig/appindicator-sharp-0.1.pc usr/share/pkgconfig
diff --git a/debian/libappindicator0.1-cil.install b/debian/libappindicator0.1-cil.install
deleted file mode 100644
index 1a0aeca..0000000
--- a/debian/libappindicator0.1-cil.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/cli/appindicator-sharp-0.1/* /usr/lib/cli/appindicator-sharp-0.1/
diff --git a/debian/libappindicator0.1-cil.installcligac b/debian/libappindicator0.1-cil.installcligac
deleted file mode 100644
index f3e5bfc..0000000
--- a/debian/libappindicator0.1-cil.installcligac
+++ /dev/null
@@ -1,3 +0,0 @@
-/usr/lib/cli/appindicator-sharp-0.1/appindicator-sharp.dll
-/usr/lib/cli/appindicator-sharp-0.1/policy.0.0.appindicator-sharp.dll
-/usr/lib/cli/appindicator-sharp-0.1/policy.0.1.appindicator-sharp.dll
diff --git a/debian/libappindicator1.install b/debian/libappindicator1.install
deleted file mode 100644
index 94db7c9..0000000
--- a/debian/libappindicator1.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/libappindicator.so.*
diff --git a/debian/libappindicator3-1.install b/debian/libappindicator3-1.install
deleted file mode 100644
index b77e45c..0000000
--- a/debian/libappindicator3-1.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/libappindicator3.so.*
diff --git a/debian/libappindicator3-dev.install b/debian/libappindicator3-dev.install
deleted file mode 100644
index 50dc770..0000000
--- a/debian/libappindicator3-dev.install
+++ /dev/null
@@ -1,5 +0,0 @@
-usr/lib/*/libappindicator3.so
-usr/lib/*/pkgconfig/appindicator3-0.1.pc
-usr/include/libappindicator3-0.1/*
-usr/share/gir-1.0/AppIndicator3-0.1.gir
-usr/share/vala/vapi/appindicator3-0.1.vapi
diff --git a/debian/libayatana-appindicator-dev.install b/debian/libayatana-appindicator-dev.install
new file mode 100644
index 0000000..763a667
--- /dev/null
+++ b/debian/libayatana-appindicator-dev.install
@@ -0,0 +1,5 @@
+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
+usr/share/vala/vapi/ayatana-appindicator-0.1.vapi
diff --git a/debian/libayatana-appindicator-doc.install b/debian/libayatana-appindicator-doc.install
new file mode 100644
index 0000000..f454912
--- /dev/null
+++ b/debian/libayatana-appindicator-doc.install
@@ -0,0 +1 @@
+usr/share/gtk-doc/html/libayatana-appindicator/*
diff --git a/debian/libayatana-appindicator0.1-cil-dev.install b/debian/libayatana-appindicator0.1-cil-dev.install
new file mode 100644
index 0000000..5194099
--- /dev/null
+++ b/debian/libayatana-appindicator0.1-cil-dev.install
@@ -0,0 +1 @@
+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
new file mode 100644
index 0000000..2ce8022
--- /dev/null
+++ b/debian/libayatana-appindicator0.1-cil.install
@@ -0,0 +1 @@
+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
new file mode 100644
index 0000000..a041e9e
--- /dev/null
+++ b/debian/libayatana-appindicator0.1-cil.installcligac
@@ -0,0 +1,3 @@
+/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
new file mode 100644
index 0000000..96d99db
--- /dev/null
+++ b/debian/libayatana-appindicator1.install
@@ -0,0 +1 @@
+usr/lib/*/libayatana-appindicator.so.*
diff --git a/debian/libappindicator1.symbols b/debian/libayatana-appindicator1.symbols
index ded488e..6ffb9c7 100644
--- a/debian/libappindicator1.symbols
+++ b/debian/libayatana-appindicator1.symbols
@@ -1,4 +1,4 @@
-libappindicator.so.1 libappindicator1 #MINVER#
+libayatana-appindicator.so.1 libayatana-appindicator1 #MINVER#
  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
diff --git a/debian/libayatana-appindicator3-1.install b/debian/libayatana-appindicator3-1.install
new file mode 100644
index 0000000..e6eda14
--- /dev/null
+++ b/debian/libayatana-appindicator3-1.install
@@ -0,0 +1 @@
+usr/lib/*/libayatana-appindicator3.so.*
diff --git a/debian/libappindicator3-1.symbols b/debian/libayatana-appindicator3-1.symbols
index 3b63f22..cb8f189 100644
--- a/debian/libappindicator3-1.symbols
+++ b/debian/libayatana-appindicator3-1.symbols
@@ -1,4 +1,4 @@
-libappindicator3.so.1 libappindicator3-1 #MINVER#
+libayatana-appindicator3.so.1 libayatana-appindicator3-1 #MINVER#
  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
diff --git a/debian/libayatana-appindicator3-dev.install b/debian/libayatana-appindicator3-dev.install
new file mode 100644
index 0000000..59edd11
--- /dev/null
+++ b/debian/libayatana-appindicator3-dev.install
@@ -0,0 +1,5 @@
+usr/lib/*/libayatana-appindicator3.so
+usr/lib/*/pkgconfig/ayatana-appindicator3-0.1.pc
+usr/include/libayatana-appindicator3-0.1/*
+usr/share/gir-1.0/AyatanaAppIndicator3-0.1.gir
+usr/share/vala/vapi/ayatana-appindicator3-0.1.vapi
diff --git a/debian/python-appindicator.install b/debian/python-ayatana-appindicator.install
index b468dac..b468dac 100644
--- a/debian/python-appindicator.install
+++ b/debian/python-ayatana-appindicator.install
diff --git a/debian/rules b/debian/rules
index 4fe4e6b..e4f1b8c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -60,17 +60,17 @@ override_dh_install:
 	find debian/tmp -name \*.la -exec rm {} \;
 	find debian/tmp -name \*.a -exec rm {} \;
 	rm -rf debian/tmp/*/usr/lib/mono
-	rm -rf debian/tmp/*/usr/share/vala/vapi/appindicator*-0.1.deps
-	dh_install -ppython-appindicator --fail-missing --sourcedir=debian/tmp/gtk2
-	dh_install -plibappindicator1 --fail-missing --sourcedir=debian/tmp/gtk2
-	dh_install -pgir1.2-appindicator-0.1 --fail-missing --sourcedir=debian/tmp/gtk2
-	dh_install -plibappindicator-dev --fail-missing --sourcedir=debian/tmp/gtk2
-	dh_install -plibappindicator-doc --fail-missing --sourcedir=debian/tmp/gtk2
-	dh_install -plibappindicator3-1 --fail-missing --sourcedir=debian/tmp/gtk3
-	dh_install -plibappindicator3-dev --fail-missing --sourcedir=debian/tmp/gtk3
-	dh_install -pgir1.2-appindicator3-0.1 --fail-missing --sourcedir=debian/tmp/gtk3
-	dh_install -plibappindicator0.1-cil --fail-missing --sourcedir=debian/tmp/gtk2
-	dh_install -plibappindicator0.1-cil-dev --fail-missing --sourcedir=debian/tmp/gtk2
+	rm -rf debian/tmp/*/usr/share/vala/vapi/ayatana-appindicator*-0.1.deps
+	dh_install -ppython-ayatana-appindicator --fail-missing --sourcedir=debian/tmp/gtk2
+	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/gtk2
+	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
+	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
 
 override_dh_auto_test: $(FLAVORS:%=dotest-%)
 
@@ -90,4 +90,3 @@ dotestgtk2-%:
 override_dh_auto_clean:
 	dh_auto_clean
 	rm -rf build
-
diff --git a/debian/watch b/debian/watch
deleted file mode 100644
index 2e00b43..0000000
--- a/debian/watch
+++ /dev/null
@@ -1,2 +0,0 @@
-version=3
-http://launchpad.net/libappindicator/+download .*/libappindicator-([0-9.]+)\.tar\.gz