diff options
| -rw-r--r-- | Makefile.am | 1 | ||||
| -rw-r--r-- | configure.ac | 6 | ||||
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | debian/control | 21 | ||||
| -rw-r--r-- | debian/indicator-applet.install | 4 | ||||
| -rw-r--r-- | debian/libindicate-dev.install | 5 | ||||
| -rw-r--r-- | debian/libindicate.install | 1 | ||||
| -rw-r--r-- | libindicate/Makefile.am | 2 | ||||
| -rw-r--r-- | tests/Makefile.am (renamed from libindicate/tests/Makefile.am) | 12 | ||||
| -rw-r--r-- | tests/indicate-alot.c (renamed from libindicate/tests/indicate-alot.c) | 0 | ||||
| -rw-r--r-- | tests/indicate-and-crash.c (renamed from libindicate/tests/indicate-and-crash.c) | 2 | ||||
| -rw-r--r-- | tests/listen-and-print.c (renamed from libindicate/tests/listen-and-print.c) | 0 | ||||
| -rwxr-xr-x | tests/test.js (renamed from libindicate/tests/test.js) | 0 |
13 files changed, 48 insertions, 12 deletions
diff --git a/Makefile.am b/Makefile.am index 083ceff..555e6d5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,5 +2,6 @@ SUBDIRS = \ src \ libindicate \ + tests \ data \ po diff --git a/configure.ac b/configure.ac index cff6775..dc408e3 100644 --- a/configure.ac +++ b/configure.ac @@ -46,7 +46,9 @@ AC_SUBST(APPLET_LIBS) AC_PATH_PROG(GCONFTOOL, gconftool-2) AM_GCONF_SOURCE_2 -PKG_CHECK_MODULES(LIBINDICATE, gtk+-2.0 >= $GTK_REQUIRED_VERSION +GLIB_REQUIRED_VERSION=2.18 + +PKG_CHECK_MODULES(LIBINDICATE, glib-2.0 >= $GLIB_REQUIRED_VERSION dbus-glib-1 >= $DBUS_REQUIRED_VERSION) AC_SUBST(LIBINDICATE_CFLAGS) AC_SUBST(LIBINDICATE_LIBS) @@ -70,7 +72,7 @@ Makefile src/Makefile libindicate/Makefile libindicate/indicate.pc -libindicate/tests/Makefile +tests/Makefile data/Makefile data/icons/Makefile data/icons/16x16/Makefile diff --git a/debian/changelog b/debian/changelog index 11b1a13..7831cd7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +indicator-applet (0.1~ppa9) intrepid; urgency=low + + * Adding in the libindicate lib. + + -- Ted Gould <ted@ubuntu.com> Fri, 16 Jan 2009 12:41:32 -0600 + indicator-applet (0.1~ppa8) intrepid; urgency=low * Moving the indicator directory cross-packages. diff --git a/debian/control b/debian/control index 946cce9..e5d5cc3 100644 --- a/debian/control +++ b/debian/control @@ -14,6 +14,25 @@ Standards-Version: 3.8.0 Package: indicator-applet Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, gnome-panel +Depends: ${shlibs:Depends}, + ${misc:Depends}, + gnome-panel Description: Applet for the GNOME panel providing various indicators for display to users. + +Package: libindicate +Section: libs +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends} +Description: A library used to indicate. + +Package: libindicate-dev +Section: libdevel +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends}, + libindicate (= ${binary:Version}), + libdbus-glib-1-dev (>= 0.76), + libgtk2.0-dev (>= 2.12.0) +Description: Development files. diff --git a/debian/indicator-applet.install b/debian/indicator-applet.install new file mode 100644 index 0000000..d5b122e --- /dev/null +++ b/debian/indicator-applet.install @@ -0,0 +1,4 @@ +debian/tmp/etc +debian/tmp/usr/lib/bonobo +debian/tmp/usr/lib/indicator-applet +debian/tmp/usr/share diff --git a/debian/libindicate-dev.install b/debian/libindicate-dev.install new file mode 100644 index 0000000..76e63d7 --- /dev/null +++ b/debian/libindicate-dev.install @@ -0,0 +1,5 @@ +debian/tmp/usr/include/ usr/ +debian/tmp/usr/lib/pkgconfig usr/lib/ +debian/tmp/usr/lib/libindicate.a usr/lib/ +debian/tmp/usr/lib/libindicate.la usr/lib/ +debian/tmp/usr/lib/libindicate.so usr/lib/ diff --git a/debian/libindicate.install b/debian/libindicate.install new file mode 100644 index 0000000..c31fb18 --- /dev/null +++ b/debian/libindicate.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/libindicate.so.* usr/lib diff --git a/libindicate/Makefile.am b/libindicate/Makefile.am index 53917b7..d2a0811 100644 --- a/libindicate/Makefile.am +++ b/libindicate/Makefile.am @@ -1,6 +1,4 @@ -SUBDIRS = tests - INCLUDES= \ -DG_LOG_DOMAIN=\"libindicate\" diff --git a/libindicate/tests/Makefile.am b/tests/Makefile.am index 208da5b..03ec716 100644 --- a/libindicate/tests/Makefile.am +++ b/tests/Makefile.am @@ -8,31 +8,31 @@ indicate_and_crash_SOURCES = \ indicate-and-crash.c indicate_and_crash_CFLAGS = \ - -I $(srcdir)/../.. \ + -I $(srcdir)/.. \ $(LIBINDICATE_CFLAGS) indicate_and_crash_LDADD = \ - ../libindicate.la \ + ../libindicate/libindicate.la \ $(LIBINDICATE_LIBS) indicate_alot_SOURCES = \ indicate-alot.c indicate_alot_CFLAGS = \ - -I $(srcdir)/../.. \ + -I $(srcdir)/.. \ $(LIBINDICATE_CFLAGS) indicate_alot_LDADD = \ - ../libindicate.la \ + ../libindicate/libindicate.la \ $(LIBINDICATE_LIBS) listen_and_print_SOURCES = \ listen-and-print.c listen_and_print_CFLAGS = \ - -I $(srcdir)/../.. \ + -I $(srcdir)/.. \ $(LIBINDICATE_CFLAGS) listen_and_print_LDADD = \ - ../libindicate.la \ + ../libindicate/libindicate.la \ $(LIBINDICATE_LIBS) diff --git a/libindicate/tests/indicate-alot.c b/tests/indicate-alot.c index bebf726..bebf726 100644 --- a/libindicate/tests/indicate-alot.c +++ b/tests/indicate-alot.c diff --git a/libindicate/tests/indicate-and-crash.c b/tests/indicate-and-crash.c index 44be76e..5a50e30 100644 --- a/libindicate/tests/indicate-and-crash.c +++ b/tests/indicate-and-crash.c @@ -2,7 +2,7 @@ #include <glib.h> #include "libindicate/indicator.h" -gboolean crashfunc (gpointer data) { *(int *)data = 5; } +gboolean crashfunc (gpointer data) { *(int *)data = 5; return FALSE;} int main (int argc, char ** argv) diff --git a/libindicate/tests/listen-and-print.c b/tests/listen-and-print.c index 9ad2cc8..9ad2cc8 100644 --- a/libindicate/tests/listen-and-print.c +++ b/tests/listen-and-print.c diff --git a/libindicate/tests/test.js b/tests/test.js index 45b0d05..45b0d05 100755 --- a/libindicate/tests/test.js +++ b/tests/test.js |