--- carrick-1.0.0.orig/debian/carrick.install
+++ carrick-1.0.0/debian/carrick.install
@@ -0,0 +1,6 @@
+debian/tmp/etc/xdg/autostart
+debian/tmp/usr/bin
+debian/tmp/usr/share/carrick/icons/*.png
+
+
+
--- carrick-1.0.0.orig/debian/copyright
+++ carrick-1.0.0/debian/copyright
@@ -0,0 +1,20 @@
+Packaging
+==============
+This package was debianized by Michael Terry michael.terry@canonical.com:
+  Copyright (C) 2009  Canonical Ltd. All rights reserved
+
+Packaging licensed under the terms of the GNU General Public
+License 3 (or any later version), see:
+  /usr/share/common-licenses/GPL
+
+Carrick Sources
+===============
+Download:
+  carrick was downloaded from:
+
+git://git.moblin.org/carrick-ng
+
+License:
+
+   © 2009 Intel, all rights reserved
+
--- carrick-1.0.0.orig/debian/rules
+++ carrick-1.0.0/debian/rules
@@ -0,0 +1,33 @@
+#!/usr/bin/make -f
+
+DEB_SOURCE := $(shell dpkg-parsechangelog | grep Source: | sed -e 's/Source: //')
+DEB_VERSION := $(shell dpkg-parsechangelog | grep Version: | sed -e 's/Version: //')
+DEB_UPSTREAM_VERSION := $(shell echo $(DEB_VERSION) | sed -e 's/-[^-]*$$//')
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/autotools.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
+
+DEB_DESTDIR = $(CURDIR)/debian/tmp/
+GIT_URL = git://git.moblin.org/carrick-ng
+
+get-orig-source::
+	set -e; if echo $(DEB_VERSION) | grep -c "git"; \
+	then \
+		git_version=`echo $(DEB_VERSION) | sed -e 's/^.*git\.*\([0-9]*\.\)*\(.*\)-.*$$/\2/g'`; \
+	else \
+		git_version=$(DEB_UPSTREAM_VERSION); \
+	fi; \
+	tmpdir=`mktemp -d -t`; \
+	cd $$tmpdir; \
+		echo "cloning upstream repository ..."; \
+		git clone $(GIT_URL); echo "getting specific upstream revision/tag: $$git_version"; \
+		cd `ls | head -n 1`; git checkout -b orig $$git_version; \
+		echo "autotools bootstrapping ..."; \
+		sh ./autogen.sh; \
+		echo "cleaning up autotools caches (autom4te.cache) ..."; \
+		rm -rf autom4te.cache; \
+		cd ..; tar --exclude=.git -cvzf $(CURDIR)/$(DEB_SOURCE)_$(DEB_UPSTREAM_VERSION).orig.tar.gz `ls | head -n 1`; \
+		cd $(CURDIR); rm -rf $$tmpdir
+
+
--- carrick-1.0.0.orig/debian/compat
+++ carrick-1.0.0/debian/compat
@@ -0,0 +1 @@
+5
--- carrick-1.0.0.orig/debian/changelog
+++ carrick-1.0.0/debian/changelog
@@ -0,0 +1,64 @@
+carrick (1.0.0-0ubuntu1~moblin4) jaunty; urgency=low
+
+  * Changing rules to use simple-patchsys instead of quilt
+
+ -- Rusty Lynch <rusty.lynch@intel.com>  Sat, 22 Aug 2009 15:39:51 -0700
+
+carrick (1.0.0-0ubuntu1~moblin3) jaunty; urgency=low
+
+  * Bumping the version up to allow resending to the
+    ppa
+
+ -- Rusty Lynch <rusty.lynch@intel.com>  Sat, 22 Aug 2009 08:54:59 -0700
+
+carrick (1.0.0-0ubuntu1~moblin2) jaunty; urgency=low
+
+  * Carrick: Notification always reports network type 
+    by first connecting type
+    http://bugzilla.moblin.org/show_bug.cgi?id=2770
+
+  * Booting system with Ethernet plugged, ICON still 
+    shows "no connection" although Wired connected
+    http://bugzilla.moblin.org/show_bug.cgi?id=4163
+
+  * When we disconnect one connection, the ICON does 
+    not change to "No connect"
+    http://bugzilla.moblin.org/show_bug.cgi?id=4846
+
+  * [i18n] Connman crashes, if add connect to a "None" 
+    (in non-English) encrypted hidden AP
+    http://bugzilla.moblin.org/show_bug.cgi?id=4848 
+
+ -- Rusty Lynch <rusty.lynch@intel.com>  Fri, 21 Aug 2009 14:03:03 -0700
+
+carrick (1.0.0-0ubuntu1~moblin1) jaunty; urgency=low
+
+  * Upgrade to new upstream release (based on 1.0.0-3.1.moblin2).
+  * Tighten build dependencies on libgconnman-dev.
+
+ -- Matthias Klose <doko@ubuntu.com>  Fri, 07 Aug 2009 17:16:27 +0200
+
+carrick (0.0.11-0ubuntu1~moblin2) jaunty; urgency=low
+
+  * Upgrade to new upstream release (based on 0.0.11-2.1.moblin2).
+  * Tighten build dependencies on libgconnman-dev.
+
+ -- Matthias Klose <doko@ubuntu.com>  Wed, 08 Jul 2009 23:59:01 +0200
+
+carrick (0.0.7-0ubuntu1~moblin2) jaunty; urgency=low
+
+  * Upgrade to new upstream release 
+
+ -- Tony Espy <espy@ubuntu.com>  Fri, 29 May 2009 15:26:55 +0200
+
+carrick (0.0.6-0ubuntu1~molin2) jaunty; urgency=low
+
+  * Upgrade to new upstream release.     
+
+ -- Tony Espy <espy@ubuntu.com>  Thu, 28 May 2009 16:02:42 +0200
+
+carrick (0.0.1-0jaunty1) jaunty; urgency=low
+
+  * Initial Release.
+
+ -- Michael Terry <michael.terry@canonical.com>  Mon, 20 Oct 2008 13:00:47 -0400
--- carrick-1.0.0.orig/debian/control
+++ carrick-1.0.0/debian/control
@@ -0,0 +1,20 @@
+Source: carrick
+Section: gnome
+Priority: optional
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+Homepage: http://www.moblin.org/
+Build-Depends: cdbs, 
+	       debhelper (>= 7), 
+	       connman-dev (>= 0.36), 
+	       libgtk2.0-dev, 
+	       libdbus-glib-1-dev (>= 0.73),
+	       libnbtk-dev (>= 0.7.4),
+	       libgconnman-dev (>= 0.5.0),
+	       libnotify-dev
+Standards-Version: 3.8.0
+
+Package: carrick
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: Connection management panel
+ Carrick is a connection management panel for Mutter-Moblin.
--- carrick-1.0.0.orig/debian/patches/2770-Notification-type.patch
+++ carrick-1.0.0/debian/patches/2770-Notification-type.patch
@@ -0,0 +1,48 @@
+From 9363f0583b7cd7a816d90523ed1ae61e46d37d2b Mon Sep 17 00:00:00 2001
+From: Rusty Lynch <rusty.lynch@intel.com>
+Date: Mon, 27 Jul 2009 16:31:32 -0700
+Subject: [PATCH 1/4] CarrickNotificationManager: Fix for bug #2770
+
+Use our stashed away network name or network type for the
+first part of the message instead of the currently connected
+name/type.
+---
+ carrick/carrick-notification-manager.c |   15 +++++++++++++--
+ 1 files changed, 13 insertions(+), 2 deletions(-)
+
+diff --git a/carrick/carrick-notification-manager.c b/carrick/carrick-notification-manager.c
+index 0c13246..83e5dca 100644
+--- a/carrick/carrick-notification-manager.c
++++ b/carrick/carrick-notification-manager.c
+@@ -230,15 +230,26 @@ _tell_changed (CarrickNotificationManager *self,
+   gchar *message = NULL;
+   const gchar *icon;
+ 
++  if (priv->last_name == NULL && priv->last_type == NULL)
++  {
++    /*
++     * If we have never been notified of a previous network 
++     * name or network type then we it would be better to just
++     * not send a notification.
++     */
++    g_free (title);
++    return;
++  }
++
+   if (priv->last_name)
+   {
+     old = g_strdup_printf (_("Sorry, your connection to %s was lost. So we've "),
+-                           name);
++                           priv->last_name);
+   }
+   else
+   {
+     old = g_strdup_printf (_("Sorry, your %s connection was lost. So we've "),
+-                           type);
++                           priv->last_type);
+   }
+ 
+   if (g_strcmp0 (type, "ethernet") == 0)
+-- 
+1.6.2.5
+
--- carrick-1.0.0.orig/debian/patches/4848-crasher-from-sending-translated-string.patch
+++ carrick-1.0.0/debian/patches/4848-crasher-from-sending-translated-string.patch
@@ -0,0 +1,38 @@
+From d4e57658b21c772e53b8070306e6618fe2fb3416 Mon Sep 17 00:00:00 2001
+From: Joshua Lock <josh@linux.intel.com>
+Date: Wed, 29 Jul 2009 09:49:11 +0100
+Subject: [PATCH] CarrickPane: Fix crasher caused by sending ConnMan an invalid value
+
+The 0th item is the None entry. Because we have marked that string for
+translation we should convert it to a form that ConnMan recognises if it has
+been selected.
+
+Fixes MB #4848
+---
+ carrick/carrick-pane.c |   10 +++++++++-
+ 1 files changed, 9 insertions(+), 1 deletions(-)
+
+diff --git a/carrick/carrick-pane.c b/carrick/carrick-pane.c
+index 4d6a096..3e9e38d 100644
+--- a/carrick/carrick-pane.c
++++ b/carrick/carrick-pane.c
+@@ -478,7 +478,15 @@ _new_connection_cb (GtkButton *button,
+     if (network == NULL)
+       return;
+ 
+-    if (g_strcmp0 (security, "WPA2") == 0)
++    if (gtk_combo_box_get_active (GTK_COMBO_BOX (security_combo)) == 0)
++    {
++      /* The 0th item is the None entry. Because we have marked that string
++       * for translation we should convert it to a form that ConnMan recognises
++       * if it has been selected */
++      g_free (security);
++      security = g_strdup ("none");
++    }
++    else if(g_strcmp0 (security, "WPA2") == 0)
+     {
+       g_free (security);
+       security = g_strdup ("rsn");
+-- 
+1.6.2.5
+
--- carrick-1.0.0.orig/debian/patches/4846-icon-doesnt-change-to-no-connect.patch
+++ carrick-1.0.0/debian/patches/4846-icon-doesnt-change-to-no-connect.patch
@@ -0,0 +1,50 @@
+diff --git a/carrick/carrick-status-icon.c b/carrick/carrick-status-icon.c
+index d6f7c83..e7cd503 100644
+--- a/carrick/carrick-status-icon.c
++++ b/carrick/carrick-status-icon.c
+@@ -170,6 +170,13 @@ carrick_status_icon_update (CarrickStatusIcon *icon)
+   CmService *service = NULL;
+   const GList *services = NULL;
+ 
++  /* Disconnect this handler in case there's still a lingering
++   * connection. This might have been caused by the service the handler
++   * was connected to disappearing */
++  g_signal_handlers_disconnect_by_func (service,
++                                        _service_updated_cb,
++                                        icon);
++
+   if (priv->manager)
+   {
+     services = cm_manager_get_services (priv->manager);
+@@ -180,6 +187,7 @@ carrick_status_icon_update (CarrickStatusIcon *icon)
+   if (service)
+   {
+     type = cm_service_get_type (service);
++
+     if (g_strcmp0 (type, "ethernet") == 0)
+     {
+         icon_state = ICON_ACTIVE;
+@@ -224,6 +232,12 @@ carrick_status_icon_update (CarrickStatusIcon *icon)
+                           G_CALLBACK (_service_updated_cb),
+                           icon);
+     }
++
++    /* We've now set the icon for the top service, if this service
++     * is not connected we should set the icon to the offline one.
++     */
++    if (!cm_service_get_connected (service))
++      icon_state = ICON_OFFLINE;
+   }
+   else
+   {
+@@ -281,6 +295,10 @@ carrick_status_icon_update_manager (CarrickStatusIcon *icon,
+                       "services-changed",
+                       G_CALLBACK (_manager_change_cb),
+                       icon);
++    g_signal_connect (priv->manager,
++                      "state-changed",
++                      G_CALLBACK (_manager_change_cb),
++                      icon);
+   }
+ 
+   carrick_status_icon_update (icon);
--- carrick-1.0.0.orig/debian/patches/4163-icon-on-start.patch
+++ carrick-1.0.0/debian/patches/4163-icon-on-start.patch
@@ -0,0 +1,185 @@
+diff --git a/carrick/carrick-applet.c b/carrick/carrick-applet.c
+index 74e2fc6..b9df5d2 100644
+--- a/carrick/carrick-applet.c
++++ b/carrick/carrick-applet.c
+@@ -43,40 +43,10 @@ struct _CarrickAppletPrivate {
+   CmManager          *manager;
+   GtkWidget          *icon;
+   GtkWidget          *pane;
+-  gchar              *state;
+   CarrickIconFactory *icon_factory;
+   CarrickNotificationManager *notifications;
+ };
+ 
+-static void
+-manager_services_changed_cb (CmManager *manager,
+-			     gpointer   user_data)
+-{
+-  CarrickApplet *applet = CARRICK_APPLET (user_data);
+-  CarrickAppletPrivate *priv = GET_PRIVATE (applet);
+-
+-  if (priv->icon)
+-    carrick_status_icon_update (CARRICK_STATUS_ICON (priv->icon));
+-}
+-
+-static void
+-manager_state_changed_cb (CmManager *manager,
+-                          gpointer   user_data)
+-{
+-  CarrickApplet *applet = CARRICK_APPLET (user_data);
+-  CarrickAppletPrivate *priv = GET_PRIVATE (applet);
+-  gchar *new_state = g_strdup (cm_manager_get_state (manager));
+-
+-  if (g_strcmp0 (priv->state, new_state) != 0)
+-  {
+-    g_free (priv->state);
+-    priv->state = new_state;
+-  }
+-
+-  if (priv->icon)
+-    carrick_status_icon_update (CARRICK_STATUS_ICON (priv->icon));
+-}
+-
+ GtkWidget*
+ carrick_applet_get_pane (CarrickApplet *applet)
+ {
+@@ -157,7 +127,6 @@ carrick_applet_init (CarrickApplet *self)
+   }
+   /* FIXME: handle return value here */
+   cm_manager_refresh (priv->manager);
+-  priv->state = g_strdup (cm_manager_get_state (priv->manager));
+   priv->icon_factory = carrick_icon_factory_new ();
+   priv->icon = carrick_status_icon_new (priv->icon_factory,
+                                         priv->manager);
+@@ -166,15 +135,6 @@ carrick_applet_init (CarrickApplet *self)
+                                  priv->notifications,
+                                  priv->manager);
+   gtk_widget_show (priv->pane);
+-
+-  g_signal_connect (priv->manager,
+-                    "state-changed",
+-                    G_CALLBACK (manager_state_changed_cb),
+-                    self);
+-  g_signal_connect (priv->manager,
+-                    "services-changed",
+-                    G_CALLBACK (manager_services_changed_cb),
+-                    self);
+ }
+ 
+ CarrickApplet*
+diff --git a/carrick/carrick-status-icon.c b/carrick/carrick-status-icon.c
+index 2233061..d6f7c83 100644
+--- a/carrick/carrick-status-icon.c
++++ b/carrick/carrick-status-icon.c
+@@ -46,6 +46,13 @@ enum
+   PROP_MANAGER
+ };
+ 
++/* Forward declaration of private method */
++static void
++carrick_status_icon_update_manager (CarrickStatusIcon *icon,
++                                    CmManager         *manager);
++static void
++carrick_status_icon_update (CarrickStatusIcon *icon);
++
+ static void
+ carrick_status_icon_get_property (GObject *object, guint property_id,
+                                   GValue *value, GParamSpec *pspec)
+@@ -142,7 +149,17 @@ carrick_status_icon_init (CarrickStatusIcon *self)
+                                   GTK_STOCK_NETWORK);
+ }
+ 
+-void
++static void
++_service_updated_cb (CmService         *service,
++                     CarrickStatusIcon *icon)
++{
++  g_signal_handlers_disconnect_by_func (service,
++                                        _service_updated_cb,
++                                        icon);
++  carrick_status_icon_update (icon);
++}
++
++static void
+ carrick_status_icon_update (CarrickStatusIcon *icon)
+ {
+   CarrickStatusIconPrivate *priv = GET_PRIVATE (icon);
+@@ -151,10 +168,13 @@ carrick_status_icon_update (CarrickStatusIcon *icon)
+   guint strength;
+   const gchar *type = NULL;
+   CmService *service = NULL;
++  const GList *services = NULL;
+ 
+   if (priv->manager)
+   {
+-    service  = cm_manager_get_active_service (priv->manager);
++    services = cm_manager_get_services (priv->manager);
++    if (services)
++      service  = services->data;
+   }
+ 
+   if (service)
+@@ -199,6 +219,10 @@ carrick_status_icon_update (CarrickStatusIcon *icon)
+     else
+     {
+         icon_state = ICON_ERROR;
++        g_signal_connect (service,
++                          "service-updated",
++                          G_CALLBACK (_service_updated_cb),
++                          icon);
+     }
+   }
+   else
+@@ -226,7 +250,14 @@ carrick_status_icon_set_active (CarrickStatusIcon *icon,
+   carrick_status_icon_update (icon);
+ }
+ 
+-void
++static void
++_manager_change_cb (CmManager         *manager,
++                   CarrickStatusIcon *icon)
++{
++  carrick_status_icon_update (icon);
++}
++
++static void
+ carrick_status_icon_update_manager (CarrickStatusIcon *icon,
+                                     CmManager         *manager)
+ {
+@@ -234,6 +265,10 @@ carrick_status_icon_update_manager (CarrickStatusIcon *icon,
+ 
+   if (priv->manager)
+   {
++    g_signal_handlers_disconnect_by_func (priv->manager,
++                                          _manager_change_cb,
++                                          icon);
++
+     g_object_unref (priv->manager);
+     priv->manager= NULL;
+   }
+@@ -241,6 +276,11 @@ carrick_status_icon_update_manager (CarrickStatusIcon *icon,
+   if (manager)
+   {
+     priv->manager= g_object_ref (manager);
++
++    g_signal_connect (priv->manager,
++                      "services-changed",
++                      G_CALLBACK (_manager_change_cb),
++                      icon);
+   }
+ 
+   carrick_status_icon_update (icon);
+diff --git a/carrick/carrick-status-icon.h b/carrick/carrick-status-icon.h
+index ba0729b..98a7daf 100644
+--- a/carrick/carrick-status-icon.h
++++ b/carrick/carrick-status-icon.h
+@@ -61,9 +61,6 @@ GtkWidget* carrick_status_icon_new (CarrickIconFactory *factory,
+ 
+ void carrick_status_icon_set_active (CarrickStatusIcon *icon,
+                                      gboolean           active);
+-void carrick_status_icon_update_manager (CarrickStatusIcon *icon,
+-                                         CmManager         *manager);
+-void carrick_status_icon_update (CarrickStatusIcon *icon);
+ void carrick_status_icon_set_connecting (CarrickStatusIcon *icon);
+ G_END_DECLS
+ 
