aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/control11
-rw-r--r--debian/libindicator-tools.install2
-rw-r--r--debian/libindicator3-tools.install1
-rwxr-xr-xdebian/rules2
-rw-r--r--tools/Makefile.am4
5 files changed, 2 insertions, 18 deletions
diff --git a/debian/control b/debian/control
index fee7987..3bc0bd7 100644
--- a/debian/control
+++ b/debian/control
@@ -48,17 +48,6 @@ Description: panel indicator applet - library development files
.
This package contains files that are needed to build applications.
-Package: libindicator-tools
-Section: devel
-Architecture: any
-Depends: ${shlibs:Depends},
- ${misc:Depends},
- libindicator7 (= ${binary:Version}),
-Description: Tools for libindicator
- Tools useful for developers of applications using indicators.
- .
- This package contains files that are needed to build applications.
-
Package: libindicator3-7
Section: libs
Architecture: any
diff --git a/debian/libindicator-tools.install b/debian/libindicator-tools.install
deleted file mode 100644
index a92f82e..0000000
--- a/debian/libindicator-tools.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/*/indicator-loader
-usr/share/libindicator/80indicator-debugging /usr/share/libindicator/
diff --git a/debian/libindicator3-tools.install b/debian/libindicator3-tools.install
index b73bb85..a58fa0b 100644
--- a/debian/libindicator3-tools.install
+++ b/debian/libindicator3-tools.install
@@ -1 +1,2 @@
usr/lib/*/indicator-loader3
+usr/share/libindicator/80indicator-debugging /usr/share/libindicator/
diff --git a/debian/rules b/debian/rules
index b73bf84..af8e5c7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -36,7 +36,7 @@ doinstall-%:
override_dh_install:
find debian/tmp -name \*.la -delete
find debian/tmp -name libdummy-indicator\* -delete
- rm -f debian/tmp/gtk3/usr/share/libindicator/80indicator-debugging
+ 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
diff --git a/tools/Makefile.am b/tools/Makefile.am
index cefd944..8df5445 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -2,10 +2,6 @@ if USE_GTK3
INDICATOR_LIB = -lindicator3
libexec_PROGRAMS = indicator-loader3
VER=3
-else
-VER=
-INDICATOR_LIB = -lindicator
-libexec_PROGRAMS = indicator-loader
endif