From 2a0070acc1c3e9f57ecf9615540fac18901bb880 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Wed, 8 Dec 2010 15:35:51 -0600
Subject: debian/control: Removing the indicator-application bin package.

---
 debian/control | 7 -------
 1 file changed, 7 deletions(-)

(limited to 'debian/control')

diff --git a/debian/control b/debian/control
index 44e5ea1..f0eec91 100644
--- a/debian/control
+++ b/debian/control
@@ -47,13 +47,6 @@ Description: Python bindings for libappindicator
  This package provides Python bindings so that you can use libappindicator from 
  a Python program.
 
-Package: indicator-application
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: Application Indicators
- A library and indicator to take menus from applications and place them in
- the panel.
-
 Package: libappindicator1
 Section: libs
 Architecture: any
-- 
cgit v1.2.3


From 86419fbda78c03528f96fcb17602276b2d2cfc3f Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Wed, 8 Dec 2010 16:01:51 -0600
Subject: Converting over to libappindicator with a dummy commit for merge
 upstream

---
 debian/control | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'debian/control')

diff --git a/debian/control b/debian/control
index f0eec91..c48cbc1 100644
--- a/debian/control
+++ b/debian/control
@@ -1,4 +1,4 @@
-Source: indicator-application
+Source: libappindicator
 Section: gnome
 Priority: optional
 XS-Python-Version: all
-- 
cgit v1.2.3


From d4236cd10ace941a85060e2f4be9902becde40b2 Mon Sep 17 00:00:00 2001
From: Ken VanDine <ken.vandine@canonical.com>
Date: Wed, 8 Dec 2010 17:51:34 -0500
Subject: move python-appindicator to the end

---
 debian/control | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

(limited to 'debian/control')

diff --git a/debian/control b/debian/control
index c48cbc1..f87b2aa 100644
--- a/debian/control
+++ b/debian/control
@@ -33,20 +33,6 @@ Standards-Version: 3.8.4
 Homepage: https://launchpad.net/indicator-application
 Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-desktop/indicator-application/ubuntu
 
-Package: python-appindicator
-Section: python
-Architecture: any
-XB-Python-Version: ${python:Versions}
-Depends: ${shlibs:Depends},
-         ${misc:Depends},
-         ${python:Depends},
-         libappindicator1 (= ${binary:Version}),
-         python-gobject
-Provides: ${python:Provides}
-Description: Python bindings for libappindicator
- This package provides Python bindings so that you can use libappindicator from 
- a Python program.
-
 Package: libappindicator1
 Section: libs
 Architecture: any
@@ -125,3 +111,17 @@ Description: Typelib files for libappindicator1.
  .
  This package can be used by other packages using the GIRepository format
  to generate dynamic bindings.
+
+Package: python-appindicator
+Section: python
+Architecture: any
+XB-Python-Version: ${python:Versions}
+Depends: ${shlibs:Depends},
+         ${misc:Depends},
+         ${python:Depends},
+         libappindicator1 (= ${binary:Version}),
+         python-gobject
+Provides: ${python:Provides}
+Description: Python bindings for libappindicator
+ This package provides Python bindings so that you can use libappindicator from 
+ a Python program.
-- 
cgit v1.2.3


From 29871df079babc88c93255f101edb19d266efd30 Mon Sep 17 00:00:00 2001
From: Ken VanDine <ken.vandine@canonical.com>
Date: Fri, 10 Dec 2010 16:38:00 -0500
Subject: * debian/rules   - Changes to build targets to get it building
 multipass for     python 2.6 and 2.7

---
 debian/control | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

(limited to 'debian/control')

diff --git a/debian/control b/debian/control
index f87b2aa..bea497c 100644
--- a/debian/control
+++ b/debian/control
@@ -16,8 +16,8 @@ Build-Depends: debhelper (>= 5.0),
                libindicate-dev (>= 0.2.0),
                libindicate-gtk-dev (>= 0.2.0),
                libindicator-dev (>= 0.3.14),
-               libdbusmenu-gtk-dev (>= 0.3.90),
-               libdbusmenu-glib-dev (>= 0.3.90),
+               libdbusmenu-gtk-dev (>= 0.3.90+r175),
+               libdbusmenu-glib-dev (>= 0.3.90+r175),
                cli-common-dev (>= 0.5.7),
                mono-devel (>= 2.4.3),
                gtk-sharp2-gapi,
@@ -33,6 +33,20 @@ Standards-Version: 3.8.4
 Homepage: https://launchpad.net/indicator-application
 Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-desktop/indicator-application/ubuntu
 
+Package: python-appindicator
+Section: python
+Architecture: any
+XB-Python-Version: ${python:Versions}
+Depends: ${shlibs:Depends},
+         ${misc:Depends},
+         ${python:Depends},
+         libappindicator1 (= ${binary:Version}),
+         python-gobject
+Provides: ${python:Provides}
+Description: Python bindings for libappindicator
+ This package provides Python bindings so that you can use libappindicator from 
+ a Python program.
+
 Package: libappindicator1
 Section: libs
 Architecture: any
@@ -111,17 +125,3 @@ Description: Typelib files for libappindicator1.
  .
  This package can be used by other packages using the GIRepository format
  to generate dynamic bindings.
-
-Package: python-appindicator
-Section: python
-Architecture: any
-XB-Python-Version: ${python:Versions}
-Depends: ${shlibs:Depends},
-         ${misc:Depends},
-         ${python:Depends},
-         libappindicator1 (= ${binary:Version}),
-         python-gobject
-Provides: ${python:Provides}
-Description: Python bindings for libappindicator
- This package provides Python bindings so that you can use libappindicator from 
- a Python program.
-- 
cgit v1.2.3