Merge lp:~indicator-applet-developers/libindicate/ubuntu into lp:~ubuntu-desktop/libindicate/ubuntu

[Ted Gould]

FTBFS Fix

[lp:~indicator-applet-developers/libindicate/ubuntu]

324. By Ted Gould on 2010-09-27

Adding bug number

=== modified file 'AUTHORS'
--- AUTHORS	2009-02-11 21:59:42 +0000
+++ AUTHORS	2010-09-27 16:42:44 +0000
@@ -1,1 +1,2 @@
-Ted Gould <[e-mail]>
+# Generated by Makefile
+
 
=== modified file 'ChangeLog'
--- ChangeLog	2008-10-30 02:30:35 +0000
+++ ChangeLog	2010-09-27 16:42:44 +0000
@@ -0,0 +1,2 @@
+# Genrated by Makefile
+
 
=== modified file 'Makefile.am'
--- Makefile.am	2010-06-02 17:53:11 +0000
+++ Makefile.am	2010-09-27 16:42:44 +0000
@@ -20,3 +20,28 @@
 	libindicate-*.tar.gz \
 	gtk-doc.make
 
+dist-hook:
+	@if test -d "$(top_srcdir)/.bzr"; \
+		then \
+			echo Creating ChangeLog && \
+				( cd "$(top_srcdir)" && \
+				echo '# Generated by Makefile. Do not edit.'; echo; \
+				$(top_srcdir)/missing --run bzr log --gnu-changelog ) > ChangeLog.tmp \
+				&& mv -f ChangeLog.tmp $(top_distdir)/ChangeLog \
+				|| (rm -f ChangeLog.tmp; \
+					echo Failed to generate ChangeLog >&2 ); \
+        else \
+			echo Failed to generate ChangeLog: not a branch >&2; \
+	fi
+	@if test -d "$(top_srcdir)/.bzr"; \
+		then \
+			echo Creating AUTHORS && \
+				( cd "$(top_srcdir)" && \
+				echo '# Generated by Makefile. Do not edit.'; echo; \
+				$(top_srcdir)/missing --run  bzr log --long --levels=0 | grep -e "^\s*author:" -e "^\s*committer:" | cut -d ":" -f 2 | cut -d "<" -f 1 | sort -u) > AUTHORS.tmp \
+				&& mv -f AUTHORS.tmp $(top_distdir)/AUTHORS \
+				|| (rm -f AUTHORS.tmp; \
+					echo Failed to generate AUTHORS >&2 ); \
+        else \
+			echo Failed to generate AUTHORS: not a branch >&2; \
+	fi
 
=== modified file 'debian/changelog'
--- debian/changelog	2010-09-15 18:01:49 +0000
+++ debian/changelog	2010-09-27 16:42:44 +0000
@@ -1,3 +1,11 @@
+libindicate (0.4.4-0ubuntu2~ppa1) maverick; urgency=low
+
+  * Upstream Merge
+    * Updating dist build to generate AUTHORS and ChangeLog
+    * Expanding typedef'd callbacks for Vala 0.10 FTBFS (LP: #649083)
+
+ -- Ted Gould <[e-mail]>  Mon, 27 Sep 2010 10:41:17 -0500
+
 libindicate (0.4.4-0ubuntu1) maverick; urgency=low
 
   * New upstream release.
@@ -19,6 +27,16 @@
 
  -- Ted Gould <[e-mail]>  Thu, 09 Sep 2010 12:19:03 -0500
 
+libindicate (0.4.1-2) unstable; urgency=low
+
+  * Fix package name in debian/rules and use the correct SONAME in the
+    dllmap for indicate-sharp.dll and indicate-gtk-sharp.dll
+    Closes: #595318
+    Thanks: Andrew Mitchell
+  * Standards-Version: 3.9.1
+
+ -- Evgeni Golov <[e-mail]>  Fri, 10 Sep 2010 09:43:36 +0200
+
 libindicate (0.4.1-1) unstable; urgency=low
 
   * Merge from Ubuntu.
@@ -28,7 +46,9 @@
     - Add myself as Uploader.
     - Update Vcs-* fields.
     - Standards-Version: 3.8.4
-    - Update package descriptions. 
+    - Update package descriptions.
+    - -doc package is Arch:all
+    - -doc package does not need to depend on the lib.
   * debian/copyright:
     - Convert to DEP5 format.
     - Add Ken and Sebastien, according to changelog.
@@ -36,7 +56,7 @@
   * debian/{control,rules}:
     - Force python2.6.
 
- -- Evgeni Golov <[e-mail]>  Wed, 16 Jun 2010 11:49:45 +0200
+ -- Evgeni Golov <[e-mail]>  Sun, 20 Jun 2010 14:01:00 +0200
 
 libindicate (0.4.1-0ubuntu4) maverick; urgency=low
 
 
=== modified file 'debian/control'
--- debian/control	2010-09-09 16:49:35 +0000
+++ debian/control	2010-09-27 16:42:44 +0000
@@ -30,7 +30,7 @@
                python-all-dev,
                python-gtk2-dev,
                valac
-Standards-Version: 3.8.4
+Standards-Version: 3.9.1
 Homepage: https://launchpad.net/libindicate
 Vcs-Bzr: https://code.launchpad.net/~indicator-applet-developers/libindicate/ubuntu
 Vcs-Browser: http://bazaar.launchpad.net/~indicator-applet-developers/libindicate/ubuntu
@@ -84,11 +84,11 @@
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends}
-Description: library for raising indicators via DBus - GTK bindings
+Description: library for raising indicators via DBus - GTK+ bindings
  A small library for applications to raise "flags" on DBus for other components
  of the desktop to pick up and visualize.
  .
- This package contains shared libraries to be used by applications.
+ This package contains shared libraries to be used by GTK+ applications.
 
 Package: libindicate-gtk-dev
 Section: libdevel
@@ -99,26 +99,21 @@
          libindicate-dev (= ${binary:Version}),
          libdbus-glib-1-dev (>= 0.76),
          libgtk2.0-dev (>= 2.12.0)
-Description: library for raising indicators via DBus - GTK bindings development files
+Description: library for raising indicators via DBus - GTK+ bindings development files
  A small library for applications to raise "flags" on DBus for other components
  of the desktop to pick up and visualize.
  .
- This package contains files that are needed to build applications.
+ This package contains files that are needed to build GTK+ applications.
 
 Package: libindicate-doc
 Section: doc
-Architecture: any
-Depends: ${shlibs:Depends},
-         ${misc:Depends},
-         libindicate4 (= ${binary:Version}),
-         libindicate-gtk2 (= ${binary:Version}),
-         libdbus-glib-1-dev (>= 0.76),
-         libgtk2.0-dev (>= 2.12.0)
+Architecture: all
+Depends: ${misc:Depends},
 Description: library for raising indicators via DBus - documentation
- indicator-applet is an applet to display information from
- various applications consistently in the GNOME panel.
+ A small library for applications to raise "flags" on DBus for other components
+ of the desktop to pick up and visualize.
  .
- This package contains files that are needed to build applications.
+ This package contains the documentation.
 
 Package: gir1.0-indicate-0.2
 Section: libs
@@ -131,6 +126,8 @@
  A small library for applications to raise "flags" on DBus for other components
  of the desktop to pick up and visualize.
  .
+ This package can be used by other packages using the GIRepository format to
+ generate dynamic bindings for libindicate4.
 
 Package: gir1.0-indicate-gtk-0.2
 Section: libs
@@ -143,6 +140,8 @@
  A small library for applications to raise "flags" on DBus for other components
  of the desktop to pick up and visualize.
  .
+ This package can be used by other packages using the GIRepository format to
+ generate dynamic bindings for libindicate-gtk2.
 
 Package: libindicate0.1-cil
 Section: cli-mono
@@ -189,7 +188,7 @@
  This package provides the indicate-sharp assembly that allows CLI (.NET)
  programs to display information consistently in the GNOME panel.
  .
- This package contains assemblies to be used by applications.
+ This package contains assemblies to be used by GTK# applications.
 
 Package: libindicate-gtk0.1-cil-dev
 Section: libdevel
@@ -205,4 +204,4 @@
  This package provides the indicate-sharp assembly that allows CLI (.NET)
  programs to display information consistently in the GNOME panel.
  .
- This package contains files that are needed to build applications.
+ This package contains files that are needed to build GTK# applications.
 
=== modified file 'libindicate/listener.h'
--- libindicate/listener.h	2010-02-15 14:35:52 +0000
+++ libindicate/listener.h	2010-09-27 16:42:44 +0000
@@ -126,31 +126,31 @@
                                                             IndicateListenerServer * server,
                                                             IndicateListenerIndicator * indicator,
                                                             gchar * property,
-                                                            indicate_listener_get_property_value_cb callback,
+                                                            void (*callback) (IndicateListener * listener, IndicateListenerServer * server, IndicateListenerIndicator * indicator, gchar * property, const GValue * propertydata, gpointer data),
                                                             gpointer data);
 void                  indicate_listener_get_property       (IndicateListener * listener,
                                                             IndicateListenerServer * server,
                                                             IndicateListenerIndicator * indicator,
                                                             gchar * property,
-                                                            indicate_listener_get_property_cb callback,
+                                                            void (*callback) (IndicateListener * listener, IndicateListenerServer * server, IndicateListenerIndicator * indicator, gchar * property, const gchar * propertydata, gpointer data),
                                                             gpointer data);
 void                  indicate_listener_get_property_time  (IndicateListener * listener,
                                                             IndicateListenerServer * server,
                                                             IndicateListenerIndicator * indicator,
                                                             gchar * property,
-                                                            indicate_listener_get_property_time_cb callback,
+                                                            void (*callback) (IndicateListener * listener, IndicateListenerServer * server, IndicateListenerIndicator * indicator, gchar * property, const GTimeVal * propertydata, gpointer data),
                                                             gpointer data);
 void                  indicate_listener_get_property_int   (IndicateListener * listener,
                                                             IndicateListenerServer * server,
                                                             IndicateListenerIndicator * indicator,
                                                             gchar * property,
-                                                            indicate_listener_get_property_int_cb callback,
+                                                            void (*callback) (IndicateListener * listener, IndicateListenerServer * server, IndicateListenerIndicator * indicator, gchar * property, gint propertydata, gpointer data),
                                                             gpointer data);
 void                  indicate_listener_get_property_bool  (IndicateListener * listener,
                                                             IndicateListenerServer * server,
                                                             IndicateListenerIndicator * indicator,
                                                             gchar * property,
-                                                            indicate_listener_get_property_bool_cb callback,
+                                                            void (*callback) (IndicateListener * listener, IndicateListenerServer * server, IndicateListenerIndicator * indicator, gchar * property, gboolean propertydata, gpointer data),
                                                             gpointer data);
 void                  indicate_listener_display            (IndicateListener * listener,
                                                             IndicateListenerServer * server,
@@ -162,19 +162,19 @@
                                                             gboolean displayed);
 void                  indicate_listener_server_get_type    (IndicateListener * listener,
                                                             IndicateListenerServer * server,
-                                                            indicate_listener_get_server_property_cb callback,
+                                                            void (*callback) (IndicateListener * listener, IndicateListenerServer * server, gchar * value, gpointer data),
                                                             gpointer data);
 void                  indicate_listener_server_get_desktop (IndicateListener * listener,
                                                             IndicateListenerServer * server,
-                                                            indicate_listener_get_server_property_cb callback,
+                                                            void (*callback) (IndicateListener * listener, IndicateListenerServer * server, gchar * value, gpointer data),
                                                             gpointer data);
 void                  indicate_listener_server_get_count   (IndicateListener * listener,
                                                             IndicateListenerServer * server,
-                                                            indicate_listener_get_server_uint_property_cb callback,
+                                                            void (*callback) (IndicateListener * listener, IndicateListenerServer * server, guint value, gpointer data),
                                                             gpointer data);
 void                  indicate_listener_server_get_menu    (IndicateListener * listener,
                                                             IndicateListenerServer * server,
-                                                            indicate_listener_get_server_property_cb callback,
+                                                            void (*callback) (IndicateListener * listener, IndicateListenerServer * server, gchar * value, gpointer data),
                                                             gpointer data);
 const gchar *         indicate_listener_server_get_dbusname      (IndicateListenerServer * server);
 guint                 indicate_listener_indicator_get_id         (IndicateListenerIndicator * indicator);