Various fixes for making the library name change complete.

  - Fix debian/rules, resolves empty -dev packages.
  - Adapt share library names in pkconfig .pc files.y

3 files changed, 19 insertions, 19 deletions

diff --git a/debian/rules b/debian/rules
index af8e5c7..22cd860 100755
--- a/debian/rules
+++ b/debian/rules
@@ -36,15 +36,15 @@ doinstall-%:
 override_dh_install:
 	find debian/tmp -name \*.la -delete
 	find debian/tmp -name libdummy-indicator\* -delete
-	rm -f debian/tmp/gtk2/usr/share/libindicator/80indicator-debugging
-	dh_install -plibindicator7 --fail-missing --sourcedir=debian/tmp/gtk2
-	dh_install -plibindicator-dev --fail-missing --sourcedir=debian/tmp/gtk2
-	dh_install -plibindicator-tools --fail-missing --sourcedir=debian/tmp/gtk2
-	dh_install -plibindicator3-7 --fail-missing --sourcedir=debian/tmp/gtk3
-	dh_install -plibindicator3-dev --fail-missing --sourcedir=debian/tmp/gtk3
-	dh_install -plibindicator3-tools --fail-missing --sourcedir=debian/tmp/gtk3
+	rm -f debian/tmp/gtk2/usr/share/libayatana-indicator/80indicator-debugging
+	dh_install -plibayatana-indicator7 --fail-missing --sourcedir=debian/tmp/gtk2
+	dh_install -plibayatana-indicator-dev --fail-missing --sourcedir=debian/tmp/gtk2
+	dh_install -plibayatana-indicator-tools --fail-missing --sourcedir=debian/tmp/gtk2
+	dh_install -plibayatana-indicator3-7 --fail-missing --sourcedir=debian/tmp/gtk3
+	dh_install -plibayatana-indicator3-dev --fail-missing --sourcedir=debian/tmp/gtk3
+	dh_install -plibayatana-indicator3-tools --fail-missing --sourcedir=debian/tmp/gtk3
 
 override_dh_makeshlibs:
-	dh_makeshlibs -plibindicator7 -V 'libindicator7 (>= 0.4.90)'
-	dh_makeshlibs -plibindicator3-7 -V 'libindicator3-7 (>= 0.4.90)'
+	dh_makeshlibs -plibayatana-indicator7 -V 'libayatana-indicator7 (>= 0.6.0)'
+	dh_makeshlibs -plibayatana-indicator3-7 -V 'libayatana-indicator3-7 (>= 0.6.0)'
 
diff --git a/libayatana-indicator/ayatana-indicator-0.4.pc.in.in b/libayatana-indicator/ayatana-indicator-0.4.pc.in.in
index b5de163..02ff40d 100644
--- a/libayatana-indicator/ayatana-indicator-0.4.pc.in.in
+++ b/libayatana-indicator/ayatana-indicator-0.4.pc.in.in
@@ -4,14 +4,14 @@ libdir=@libdir@
 bindir=@bindir@
 includedir=@includedir@
 
-indicatordir=${exec_prefix}/lib/indicators/@indicator_abi_version@
+indicatordir=${exec_prefix}/lib/ayatana-indicators/@indicator_abi_version@
 iconsdir=@datarootdir@/@PACKAGE@/icons/
 
-Cflags: -I${includedir}/libindicator-0.@indicator_api_version@
+Cflags: -I${includedir}/libayatana-indicator-0.@indicator_api_version@
 Requires: gtk+-2.0
-Libs: -lindicator
+Libs: -layatana-indicator
 
-Name: libindicator
-Description: libindicator.
+Name: libayatana-indicator
+Description: libayatana-indicator.
 Version: @VERSION@
 
diff --git a/libayatana-indicator/ayatana-indicator3-0.4.pc.in.in b/libayatana-indicator/ayatana-indicator3-0.4.pc.in.in
index 8dc337c..ff0862e 100644
--- a/libayatana-indicator/ayatana-indicator3-0.4.pc.in.in
+++ b/libayatana-indicator/ayatana-indicator3-0.4.pc.in.in
@@ -4,13 +4,13 @@ libdir=@libdir@
 bindir=@bindir@
 includedir=@includedir@
 
-indicatordir=${exec_prefix}/lib/indicators3/@indicator_abi_version@/
+indicatordir=${exec_prefix}/lib/ayatana-indicators3/@indicator_abi_version@/
 iconsdir=@datarootdir@/@PACKAGE@/icons/
 
-Cflags: -I${includedir}/libindicator3-0.@indicator_api_version@
+Cflags: -I${includedir}/libayatana-indicator3-0.@indicator_api_version@
 Requires: gtk+-3.0
-Libs: -lindicator3
+Libs: -layatana-indicator3
 
-Name: libindicator3
-Description: libindicator3.
+Name: libayatana-indicator3
+Description: libayatana-indicator3.
 Version: @VERSION@