From e85c5b2816d7eda8d503ebbf226fb993f1a8fecd Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 10 Aug 2010 15:42:30 -0500 Subject: Autogen --- debian/changelog | 3 ++- docs/reference/Makefile.in | 10 ++++++-- src/Makefile.in | 64 ++++++++++++++++++++++++++++------------------ 3 files changed, 49 insertions(+), 28 deletions(-) diff --git a/debian/changelog b/debian/changelog index 59b6ea8..14222a0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,8 +2,9 @@ indicator-application (0.2.3-0ubuntu2~ppa5~order1) UNRELEASED; urgency=low * Upstream Merge * Add in ordering IDs + * Autogen - -- Ted Gould Tue, 10 Aug 2010 15:25:45 -0500 + -- Ted Gould Tue, 10 Aug 2010 15:42:22 -0500 indicator-application (0.2.3-0ubuntu2~ppa4) maverick; urgency=low diff --git a/docs/reference/Makefile.in b/docs/reference/Makefile.in index 8d6228d..1718e50 100644 --- a/docs/reference/Makefile.in +++ b/docs/reference/Makefile.in @@ -44,8 +44,11 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ $(srcdir)/version.xml.in $(top_srcdir)/gtk-doc.local.make subdir = docs/reference ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \ + $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -157,6 +160,8 @@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PYGTK_CODEGEN = @PYGTK_CODEGEN@ PYGTK_DEFSDIR = @PYGTK_DEFSDIR@ PYTHON = @PYTHON@ @@ -295,6 +300,7 @@ IGNORE_HFILES = \ dbus-properties-client.h \ dbus-properties-server.h \ dbus-shared.h \ + generate-id.h \ notification-item-client.h \ notification-item-server.h \ notification-watcher-client.h \ diff --git a/src/Makefile.in b/src/Makefile.in index e7e06e3..5ed2a9a 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -124,7 +124,8 @@ am__objects_1 = am_libappindicator_la_OBJECTS = $(am__objects_1) \ libappindicator_la-app-indicator-enum-types.lo \ libappindicator_la-app-indicator.lo \ - libappindicator_la-application-service-marshal.lo + libappindicator_la-application-service-marshal.lo \ + libappindicator_la-generate-id.lo libappindicator_la_OBJECTS = $(am_libappindicator_la_OBJECTS) AM_V_lt = $(am__v_lt_$(V)) am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) @@ -146,10 +147,10 @@ PROGRAMS = $(libexec_PROGRAMS) am_indicator_application_service_OBJECTS = \ indicator_application_service-application-service.$(OBJEXT) \ indicator_application_service-application-service-appstore.$(OBJEXT) \ - indicator_application_service-application-service-lru-file.$(OBJEXT) \ indicator_application_service-application-service-marshal.$(OBJEXT) \ indicator_application_service-application-service-watcher.$(OBJEXT) \ - indicator_application_service-app-indicator-enum-types.$(OBJEXT) + indicator_application_service-app-indicator-enum-types.$(OBJEXT) \ + indicator_application_service-generate-id.$(OBJEXT) indicator_application_service_OBJECTS = \ $(am_indicator_application_service_OBJECTS) indicator_application_service_DEPENDENCIES = $(am__DEPENDENCIES_1) \ @@ -288,6 +289,8 @@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PYGTK_CODEGEN = @PYGTK_CODEGEN@ PYGTK_DEFSDIR = @PYGTK_DEFSDIR@ PYTHON = @PYTHON@ @@ -402,13 +405,13 @@ indicator_application_service_SOURCES = \ application-service.c \ application-service-appstore.h \ application-service-appstore.c \ - application-service-lru-file.h \ - application-service-lru-file.c \ application-service-marshal.c \ application-service-watcher.h \ application-service-watcher.c \ app-indicator-enum-types.c \ - dbus-shared.h + dbus-shared.h \ + generate-id.h \ + generate-id.c indicator_application_service_CFLAGS = \ $(INDICATOR_CFLAGS) \ @@ -445,10 +448,12 @@ libappindicator_la_SOURCES = \ $(libappindicator_headers) \ app-indicator-enum-types.c \ app-indicator.c \ - application-service-marshal.c + application-service-marshal.c \ + generate-id.h \ + generate-id.c libappindicator_la_LDFLAGS = \ - -version-info 0:0:0 \ + -version-info 1:0:0 \ -no-undefined \ -export-symbols-regex "^[^_d].*" @@ -656,13 +661,14 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/indicator_application_service-app-indicator-enum-types.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/indicator_application_service-application-service-appstore.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/indicator_application_service-application-service-lru-file.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/indicator_application_service-application-service-marshal.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/indicator_application_service-application-service-watcher.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/indicator_application_service-application-service.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/indicator_application_service-generate-id.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libappindicator_la-app-indicator-enum-types.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libappindicator_la-app-indicator.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libappindicator_la-application-service-marshal.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libappindicator_la-generate-id.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libapplication_la-application-service-marshal.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libapplication_la-indicator-application.Plo@am__quote@ @@ -714,6 +720,14 @@ libappindicator_la-application-service-marshal.lo: application-service-marshal.c @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libappindicator_la_CFLAGS) $(CFLAGS) -c -o libappindicator_la-application-service-marshal.lo `test -f 'application-service-marshal.c' || echo '$(srcdir)/'`application-service-marshal.c +libappindicator_la-generate-id.lo: generate-id.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libappindicator_la_CFLAGS) $(CFLAGS) -MT libappindicator_la-generate-id.lo -MD -MP -MF $(DEPDIR)/libappindicator_la-generate-id.Tpo -c -o libappindicator_la-generate-id.lo `test -f 'generate-id.c' || echo '$(srcdir)/'`generate-id.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libappindicator_la-generate-id.Tpo $(DEPDIR)/libappindicator_la-generate-id.Plo +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='generate-id.c' object='libappindicator_la-generate-id.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libappindicator_la_CFLAGS) $(CFLAGS) -c -o libappindicator_la-generate-id.lo `test -f 'generate-id.c' || echo '$(srcdir)/'`generate-id.c + libapplication_la-application-service-marshal.lo: application-service-marshal.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libapplication_la_CFLAGS) $(CFLAGS) -MT libapplication_la-application-service-marshal.lo -MD -MP -MF $(DEPDIR)/libapplication_la-application-service-marshal.Tpo -c -o libapplication_la-application-service-marshal.lo `test -f 'application-service-marshal.c' || echo '$(srcdir)/'`application-service-marshal.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libapplication_la-application-service-marshal.Tpo $(DEPDIR)/libapplication_la-application-service-marshal.Plo @@ -762,22 +776,6 @@ indicator_application_service-application-service-appstore.obj: application-serv @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_application_service_CFLAGS) $(CFLAGS) -c -o indicator_application_service-application-service-appstore.obj `if test -f 'application-service-appstore.c'; then $(CYGPATH_W) 'application-service-appstore.c'; else $(CYGPATH_W) '$(srcdir)/application-service-appstore.c'; fi` -indicator_application_service-application-service-lru-file.o: application-service-lru-file.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_application_service_CFLAGS) $(CFLAGS) -MT indicator_application_service-application-service-lru-file.o -MD -MP -MF $(DEPDIR)/indicator_application_service-application-service-lru-file.Tpo -c -o indicator_application_service-application-service-lru-file.o `test -f 'application-service-lru-file.c' || echo '$(srcdir)/'`application-service-lru-file.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/indicator_application_service-application-service-lru-file.Tpo $(DEPDIR)/indicator_application_service-application-service-lru-file.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='application-service-lru-file.c' object='indicator_application_service-application-service-lru-file.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_application_service_CFLAGS) $(CFLAGS) -c -o indicator_application_service-application-service-lru-file.o `test -f 'application-service-lru-file.c' || echo '$(srcdir)/'`application-service-lru-file.c - -indicator_application_service-application-service-lru-file.obj: application-service-lru-file.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_application_service_CFLAGS) $(CFLAGS) -MT indicator_application_service-application-service-lru-file.obj -MD -MP -MF $(DEPDIR)/indicator_application_service-application-service-lru-file.Tpo -c -o indicator_application_service-application-service-lru-file.obj `if test -f 'application-service-lru-file.c'; then $(CYGPATH_W) 'application-service-lru-file.c'; else $(CYGPATH_W) '$(srcdir)/application-service-lru-file.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/indicator_application_service-application-service-lru-file.Tpo $(DEPDIR)/indicator_application_service-application-service-lru-file.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='application-service-lru-file.c' object='indicator_application_service-application-service-lru-file.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_application_service_CFLAGS) $(CFLAGS) -c -o indicator_application_service-application-service-lru-file.obj `if test -f 'application-service-lru-file.c'; then $(CYGPATH_W) 'application-service-lru-file.c'; else $(CYGPATH_W) '$(srcdir)/application-service-lru-file.c'; fi` - indicator_application_service-application-service-marshal.o: application-service-marshal.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_application_service_CFLAGS) $(CFLAGS) -MT indicator_application_service-application-service-marshal.o -MD -MP -MF $(DEPDIR)/indicator_application_service-application-service-marshal.Tpo -c -o indicator_application_service-application-service-marshal.o `test -f 'application-service-marshal.c' || echo '$(srcdir)/'`application-service-marshal.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/indicator_application_service-application-service-marshal.Tpo $(DEPDIR)/indicator_application_service-application-service-marshal.Po @@ -826,6 +824,22 @@ indicator_application_service-app-indicator-enum-types.obj: app-indicator-enum-t @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_application_service_CFLAGS) $(CFLAGS) -c -o indicator_application_service-app-indicator-enum-types.obj `if test -f 'app-indicator-enum-types.c'; then $(CYGPATH_W) 'app-indicator-enum-types.c'; else $(CYGPATH_W) '$(srcdir)/app-indicator-enum-types.c'; fi` +indicator_application_service-generate-id.o: generate-id.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_application_service_CFLAGS) $(CFLAGS) -MT indicator_application_service-generate-id.o -MD -MP -MF $(DEPDIR)/indicator_application_service-generate-id.Tpo -c -o indicator_application_service-generate-id.o `test -f 'generate-id.c' || echo '$(srcdir)/'`generate-id.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/indicator_application_service-generate-id.Tpo $(DEPDIR)/indicator_application_service-generate-id.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='generate-id.c' object='indicator_application_service-generate-id.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_application_service_CFLAGS) $(CFLAGS) -c -o indicator_application_service-generate-id.o `test -f 'generate-id.c' || echo '$(srcdir)/'`generate-id.c + +indicator_application_service-generate-id.obj: generate-id.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_application_service_CFLAGS) $(CFLAGS) -MT indicator_application_service-generate-id.obj -MD -MP -MF $(DEPDIR)/indicator_application_service-generate-id.Tpo -c -o indicator_application_service-generate-id.obj `if test -f 'generate-id.c'; then $(CYGPATH_W) 'generate-id.c'; else $(CYGPATH_W) '$(srcdir)/generate-id.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/indicator_application_service-generate-id.Tpo $(DEPDIR)/indicator_application_service-generate-id.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='generate-id.c' object='indicator_application_service-generate-id.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_application_service_CFLAGS) $(CFLAGS) -c -o indicator_application_service-generate-id.obj `if test -f 'generate-id.c'; then $(CYGPATH_W) 'generate-id.c'; else $(CYGPATH_W) '$(srcdir)/generate-id.c'; fi` + mostlyclean-libtool: -rm -f *.lo -- cgit v1.2.3 From 1c31b31680c5664bb2034f1c4374312b57f29ea7 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 10 Aug 2010 15:56:58 -0500 Subject: releasing version 0.2.3-0ubuntu2~ppa5~order1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 14222a0..fa3b845 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,10 @@ -indicator-application (0.2.3-0ubuntu2~ppa5~order1) UNRELEASED; urgency=low +indicator-application (0.2.3-0ubuntu2~ppa5~order1) maverick; urgency=low * Upstream Merge * Add in ordering IDs * Autogen - -- Ted Gould Tue, 10 Aug 2010 15:42:22 -0500 + -- Ted Gould Tue, 10 Aug 2010 15:56:55 -0500 indicator-application (0.2.3-0ubuntu2~ppa4) maverick; urgency=low -- cgit v1.2.3 From 3d26f164477c05863f0c57e8d65e2922392a7d63 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 10 Aug 2010 21:27:10 -0500 Subject: Autogen --- data/Makefile.in | 62 +++++++++++++++++++++++++++++++++++++++++++------------- debian/changelog | 3 ++- src/Makefile.in | 1 + 3 files changed, 51 insertions(+), 15 deletions(-) diff --git a/data/Makefile.in b/data/Makefile.in index 16e54e9..c4b3d91 100644 --- a/data/Makefile.in +++ b/data/Makefile.in @@ -37,8 +37,11 @@ host_triplet = @host@ subdir = data DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \ + $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -74,8 +77,9 @@ am__nobase_list = $(am__nobase_strip_setup); \ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__installdirs = "$(DESTDIR)$(dbus_servicesdir)" -DATA = $(dbus_services_DATA) +am__installdirs = "$(DESTDIR)$(dbus_servicesdir)" \ + "$(DESTDIR)$(overridedir)" +DATA = $(dbus_services_DATA) $(override_DATA) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AL = @AL@ @@ -171,6 +175,8 @@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PYGTK_CODEGEN = @PYGTK_CODEGEN@ PYGTK_DEFSDIR = @PYGTK_DEFSDIR@ PYTHON = @PYTHON@ @@ -245,8 +251,15 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ dbus_servicesdir = $(DBUSSERVICEDIR) dbus_services_DATA = indicator-application.service -EXTRA_DIST = indicator-application.service.in -CLEANFILES = indicator-application.service +overridedir = $(pkgdatadir) +override_DATA = ordering-override.keyfile +EXTRA_DIST = \ + indicator-application.service.in \ + ordering-override.keyfile + +CLEANFILES = \ + indicator-application.service + all: all-am .SUFFIXES: @@ -306,6 +319,26 @@ uninstall-dbus_servicesDATA: test -n "$$files" || exit 0; \ echo " ( cd '$(DESTDIR)$(dbus_servicesdir)' && rm -f" $$files ")"; \ cd "$(DESTDIR)$(dbus_servicesdir)" && rm -f $$files +install-overrideDATA: $(override_DATA) + @$(NORMAL_INSTALL) + test -z "$(overridedir)" || $(MKDIR_P) "$(DESTDIR)$(overridedir)" + @list='$(override_DATA)'; test -n "$(overridedir)" || list=; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(overridedir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(overridedir)" || exit $$?; \ + done + +uninstall-overrideDATA: + @$(NORMAL_UNINSTALL) + @list='$(override_DATA)'; test -n "$(overridedir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + test -n "$$files" || exit 0; \ + echo " ( cd '$(DESTDIR)$(overridedir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(overridedir)" && rm -f $$files tags: TAGS TAGS: @@ -347,7 +380,7 @@ check-am: all-am check: check-am all-am: Makefile $(DATA) installdirs: - for dir in "$(DESTDIR)$(dbus_servicesdir)"; do \ + for dir in "$(DESTDIR)$(dbus_servicesdir)" "$(DESTDIR)$(overridedir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am @@ -396,7 +429,7 @@ info: info-am info-am: -install-data-am: install-dbus_servicesDATA +install-data-am: install-dbus_servicesDATA install-overrideDATA install-dvi: install-dvi-am @@ -440,7 +473,7 @@ ps: ps-am ps-am: -uninstall-am: uninstall-dbus_servicesDATA +uninstall-am: uninstall-dbus_servicesDATA uninstall-overrideDATA .MAKE: install-am install-strip @@ -450,11 +483,12 @@ uninstall-am: uninstall-dbus_servicesDATA install-data install-data-am install-dbus_servicesDATA \ install-dvi install-dvi-am install-exec install-exec-am \ install-html install-html-am install-info install-info-am \ - install-man install-pdf install-pdf-am install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am uninstall uninstall-am uninstall-dbus_servicesDATA + install-man install-overrideDATA install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ + uninstall-dbus_servicesDATA uninstall-overrideDATA %.service: %.service.in diff --git a/debian/changelog b/debian/changelog index 76926b4..946aaf4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,8 +2,9 @@ indicator-application (0.2.3-0ubuntu2~ppa5~order2) UNRELEASED; urgency=low * Upstream Merge * Adding in override files for the ordering IDs + * Autogen - -- Ted Gould Tue, 10 Aug 2010 21:23:31 -0500 + -- Ted Gould Tue, 10 Aug 2010 21:26:58 -0500 indicator-application (0.2.3-0ubuntu2~ppa5~order1) maverick; urgency=low diff --git a/src/Makefile.in b/src/Makefile.in index 5ed2a9a..b0ceb16 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -415,6 +415,7 @@ indicator_application_service_SOURCES = \ indicator_application_service_CFLAGS = \ $(INDICATOR_CFLAGS) \ + -DDATADIR="\"$(pkgdatadir)\"" \ -Wall -Werror \ -DG_LOG_DOMAIN=\"indicator-application-service\" -- cgit v1.2.3 From 77beabaa23a8ff37b5c0060647ba3988dc27e13e Mon Sep 17 00:00:00 2001 From: Sebastien Bacher Date: Wed, 11 Aug 2010 11:07:58 +0200 Subject: releasing version 0.2.3-0ubuntu2 --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index b9586bb..d368614 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +indicator-application (0.2.3-0ubuntu2) maverick; urgency=low + + * Rebuild with the new gobject introspection + + -- Sebastien Bacher Wed, 11 Aug 2010 11:07:51 +0200 + indicator-application (0.2.3-0ubuntu1) maverick; urgency=low * New upstream release. -- cgit v1.2.3 From d47d1f12edc019578621d30a4a392d421e89c739 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 11 Aug 2010 09:05:47 -0500 Subject: debian/indicator-application.install: Adding in the ordering-override file to this package. --- debian/changelog | 4 +++- debian/indicator-application.install | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 946aaf4..c2fc342 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,8 +3,10 @@ indicator-application (0.2.3-0ubuntu2~ppa5~order2) UNRELEASED; urgency=low * Upstream Merge * Adding in override files for the ordering IDs * Autogen + * debian/indicator-application.install: Adding in the ordering-override + file to this package. - -- Ted Gould Tue, 10 Aug 2010 21:26:58 -0500 + -- Ted Gould Tue, 10 Aug 2010 21:31:11 -0500 indicator-application (0.2.3-0ubuntu2~ppa5~order1) maverick; urgency=low diff --git a/debian/indicator-application.install b/debian/indicator-application.install index 4429197..c525a81 100644 --- a/debian/indicator-application.install +++ b/debian/indicator-application.install @@ -1,3 +1,4 @@ debian/tmp/usr/lib/indicators/* debian/tmp/usr/lib/indicator-application/indicator-application-service debian/tmp/usr/share/dbus-1/services/indicator-application.service +debian/tmp/usr/share/indicator-application/ordering-override.keyfile -- cgit v1.2.3 From bceb5ace37cf6b0de1c41525610824fd77f71334 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 11 Aug 2010 09:05:53 -0500 Subject: releasing version 0.2.3-0ubuntu2~ppa5~order2 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index c2fc342..4534043 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -indicator-application (0.2.3-0ubuntu2~ppa5~order2) UNRELEASED; urgency=low +indicator-application (0.2.3-0ubuntu2~ppa5~order2) maverick; urgency=low * Upstream Merge * Adding in override files for the ordering IDs @@ -6,7 +6,7 @@ indicator-application (0.2.3-0ubuntu2~ppa5~order2) UNRELEASED; urgency=low * debian/indicator-application.install: Adding in the ordering-override file to this package. - -- Ted Gould Tue, 10 Aug 2010 21:31:11 -0500 + -- Ted Gould Wed, 11 Aug 2010 09:05:49 -0500 indicator-application (0.2.3-0ubuntu2~ppa5~order1) maverick; urgency=low -- cgit v1.2.3 From 5dcb1d4db537966b7cc685dcba2a6e5352476232 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 11 Aug 2010 09:10:38 -0500 Subject: releasing version 0.2.3-0ubuntu2~ppa5~order3 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 9a47422..c4cebb6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,11 @@ -indicator-application (0.2.3-0ubuntu2~ppa5~order3) UNRELEASED; urgency=low +indicator-application (0.2.3-0ubuntu2~ppa5~order3) maverick; urgency=low * Upstream Merge * Checking to make sure we get a list of keys before using them. * Fixing typo for group name in overrides file. - -- Ted Gould Wed, 11 Aug 2010 09:06:58 -0500 + -- Ted Gould Wed, 11 Aug 2010 09:10:34 -0500 indicator-application (0.2.3-0ubuntu2~ppa5~order2) maverick; urgency=low -- cgit v1.2.3 From bd56ec87751365e80a0a85b8446d08f06ebec186 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 11 Aug 2010 12:12:38 -0500 Subject: releasing version 0.2.3-0ubuntu2~ppa5~order4 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index ae26613..5b3a158 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,10 @@ -indicator-application (0.2.3-0ubuntu2~ppa5~order4) UNRELEASED; urgency=low +indicator-application (0.2.3-0ubuntu2~ppa5~order4) maverick; urgency=low * Upstream Merge * Cleaning up the ID creation and ordering to put low numbers to the right. - -- Ted Gould Wed, 11 Aug 2010 12:11:00 -0500 + -- Ted Gould Wed, 11 Aug 2010 12:12:35 -0500 indicator-application (0.2.3-0ubuntu2~ppa5~order3) maverick; urgency=low -- cgit v1.2.3 From c1b795ef9c73fb679fdcac0d24d892b30ef3c7de Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 11 Aug 2010 15:48:19 -0500 Subject: releasing version 0.2.3-0ubuntu2~ppa5~order5 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 8871376..793c662 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,10 @@ -indicator-application (0.2.3-0ubuntu2~ppa5~order5) UNRELEASED; urgency=low +indicator-application (0.2.3-0ubuntu2~ppa5~order5) maverick; urgency=low * Upstream Merge * Various fixes to the ordering index calculation * Putting ordering indexes in the X namespace - -- Ted Gould Wed, 11 Aug 2010 15:45:47 -0500 + -- Ted Gould Wed, 11 Aug 2010 15:48:17 -0500 indicator-application (0.2.3-0ubuntu2~ppa5~order4) maverick; urgency=low -- cgit v1.2.3 From 92aca3cb128d7e27f009b2c48e075b7f93e02010 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 12 Aug 2010 09:36:17 -0500 Subject: releasing version 0.2.3-0ubuntu2~ppa6 --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 98cdd75..73a61e2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,7 +3,7 @@ indicator-application (0.2.3-0ubuntu2~ppa6) maverick; urgency=low * Upstream Merge * Add in ordering IDs - -- Ted Gould Thu, 12 Aug 2010 09:30:51 -0500 + -- Ted Gould Thu, 12 Aug 2010 09:36:12 -0500 indicator-application (0.2.3-0ubuntu2~ppa5) maverick; urgency=low -- cgit v1.2.3 From 2368f530f2ada528bdfee8922088e7f836441d77 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 12 Aug 2010 13:57:20 -0500 Subject: releasing version 0.2.4-0ubuntu1~ppa1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 174ff9d..4ef8fa9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -indicator-application (0.2.4-0ubuntu1~ppa1) UNRELEASED; urgency=low +indicator-application (0.2.4-0ubuntu1~ppa1) maverick; urgency=low * New upstream release. * Add in ordering IDs @@ -10,7 +10,7 @@ indicator-application (0.2.4-0ubuntu1~ppa1) UNRELEASED; urgency=low * debian/control: Moving libappindicator0 to libappindicator1 * debian/rules: Moving libappindicator0 to libappindicator1 - -- Ted Gould Thu, 12 Aug 2010 13:53:54 -0500 + -- Ted Gould Thu, 12 Aug 2010 13:57:17 -0500 indicator-application (0.2.3-0ubuntu2) maverick; urgency=low -- cgit v1.2.3