* Added mono bindings

* debian/rules
  - don't use gnome.mk, specify all the targets to build python
    bindings for each supported python version
* Adding in Python bindings.
* debian/control, debian/python-appindicator.install: Building
  a binary package for the python bindings.
* debian/control: Adding python building build deps
* debian/control
  - make libappindicator0 recommend indicator-application
* debian/rules:
  - removed the disable-scrollkeeper configure arg
  - don't include .la and .a files
* debian/patches/clean_up_docs.patch
  - removed, merged upstream
* debian/control:
  - removed Build-Depend for scrollkeeper
  - libappindicator-dev needs to depend on libdbusmenu-glib-dev
  - bump standards version to 3.8.3
  - libappindicator-doc doesn't need to depend on libappindicator0
  - set libappindicator-doc arch all
  - make libappindicator-dev depend on libappindicator0
* debian/copyright
  - Include the proper licenses (LGPL-2.1 and LGPL-3)

7 files changed, 167 insertions, 34 deletions

diff --git a/debian/changelog b/debian/changelog
index 67c869c..fb3e347 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,30 +1,42 @@
-indicator-application (0.0.4-0ubuntu1~ppa3) UNRELEASED; urgency=low
+indicator-application (0.0.4-0ubuntu3) UNRELEASED; urgency=low
 
-  * Upstream work
-    * Python bindings
-    * Mono binding clean up
+  * Added mono bindings 
+  * debian/rules
+    - don't use gnome.mk, specify all the targets to build python
+      bindings for each supported python version
+
+  [ Ted Gould ]
+  * Adding in Python bindings.
+  * debian/control, debian/python-appindicator.install: Building
+    a binary package for the python bindings.
+  * debian/control: Adding python building build deps
 
- -- Ted Gould <ted@ubuntu.com>  Thu, 17 Dec 2009 00:14:29 -0600
+ -- Ken VanDine <ken.vandine@canonical.com>  Wed, 16 Dec 2009 14:36:05 -0500
 
-indicator-application (0.0.4-0ubuntu1~ppa2) karmic; urgency=low
+indicator-application (0.0.4-0ubuntu2) lucid; urgency=low
 
-  * Upstream work
-    * Mono bindings
-  * debian/control: Adding in mono build depends.
+  * debian/control
+    - make libappindicator0 recommend indicator-application
 
- -- Ted Gould <ted@ubuntu.com>  Mon, 14 Dec 2009 11:25:45 -0600
+ -- Ken VanDine <ken.vandine@canonical.com>  Tue, 15 Dec 2009 10:40:07 -0500
 
-indicator-application (0.0.4-0ubuntu1~ppa1) karmic; urgency=low
+indicator-application (0.0.4-0ubuntu1) lucid; urgency=low
 
   * Upstream release 0.0.4
-    * Adding files to the tarball
-    * Putting version number in docs
-    * Removing cruft in docs
-  * debian/patches/clean_up_docs.patch: Remove as merged upstream.
+  * debian/rules:
+    - removed the disable-scrollkeeper configure arg
+    - don't include .la and .a files
+  * debian/patches/clean_up_docs.patch
+    - removed, merged upstream
+  * debian/control:
+    - removed Build-Depend for scrollkeeper
+    - libappindicator-dev needs to depend on libdbusmenu-glib-dev
+    - bump standards version to 3.8.3
+    - libappindicator-doc doesn't need to depend on libappindicator0
 
- -- Ted Gould <ted@ubuntu.com>  Fri, 11 Dec 2009 10:40:09 -0600
+ -- Ken VanDine <ken.vandine@canonical.com>  Fri, 11 Dec 2009 09:18:58 -0500
 
-indicator-application (0.0.3-0ubuntu1) karmic; urgency=low
+indicator-application (0.0.3-0ubuntu1) lucid; urgency=low
 
   * Upstream release 0.0.3
     * Adding in documentation
@@ -37,6 +49,8 @@ indicator-application (0.0.3-0ubuntu1) karmic; urgency=low
   [Ken VanDine]
   * debian/control
     - set Vcs-Bzr to ~ubuntu-desktop
+    - set libappindicator-doc arch all
+    - make libappindicator-dev depend on libappindicator0
   * debian/libappindicator-doc.install
     - install the developer docs
   * debian/rules
@@ -44,6 +58,8 @@ indicator-application (0.0.3-0ubuntu1) karmic; urgency=low
     - added simple-patchsys.mk
   * debian/patches/clean_up_docs.patch
     - Remove template values and set a proper title
+  * debian/copyright
+    - Include the proper licenses (LGPL-2.1 and LGPL-3)
 
  -- Ted Gould <ted@ubuntu.com>  Thu, 10 Dec 2009 13:34:40 -0600
 
diff --git a/debian/control b/debian/control
index 291294b..a7853bd 100644
--- a/debian/control
+++ b/debian/control
@@ -1,32 +1,51 @@
 Source: indicator-application
 Section: gnome
 Priority: optional
+XS-Python-Version: all
 Maintainer: Ubuntu Core Developers <ubuntu-devel-discuss@lists.ubuntu.com>
 Build-Depends: debhelper (>= 5.0),
                cdbs (>= 0.4.41),
+               python-central (>= 0.6),
                libgtk2.0-dev (>= 2.12.0),
                libdbus-glib-1-dev,
                gnome-doc-utils,
                gtk-doc-tools,
                intltool,
+               python-all-dev,
+               python-gtk2-dev,
                libindicate-dev (>= 0.2.0),
                libindicate-gtk-dev (>= 0.2.0),
                libindicator-dev (>= 0.3.0),
                libdbusmenu-gtk-dev (>= 0.1.8),
-               libdbusmenu-glib-dev (>= 0.1.8),
-               mono-devel,
+               libdbusmenu-glib-dev (>= 0.1.8)
+Build-Depends-Indep: cli-common-dev (>= 0.5.7),
+               mono-devel (>= 2.0.1),
                gtk-sharp2-gapi,
-               libgtk2.0-cil,
-               nunit
-Standards-Version: 3.8.0
+               libmono-dev,
+               libgtk2.0-cil
+Standards-Version: 3.8.3
 Homepage: https://launchpad.net/indicator-application
-Vcs-Bzr: http://bazaar.launchpa.net/~ubuntu-desktop/indicator-application/ubuntu
+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},
+         libappindicator0 (= ${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: 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 
+ A library and indicator to take menus from applications and place them in
  the panel.
 
 Package: libappindicator0
@@ -34,21 +53,23 @@ Section: libs
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends}
+Recommends: indicator-application (= ${binary:Version})
 Description: Application Indicators
- A library and indicator to take menus from applications and place them in 
+ A library and indicator to take menus from applications and place them in
  the panel.
  .
- This package contains shared libraries to be used by applications. 
+ This package contains shared libraries to be used by applications.
 
 Package: libappindicator-dev
 Section: libdevel
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
+         libdbusmenu-glib-dev (>= 0.1.8),
          libdbus-glib-1-dev (>= 0.76),
          libappindicator0 (= ${binary:Version})
 Description: Application Indicators
- A library and indicator to take menus from applications and place them in 
+ A library and indicator to take menus from applications and place them in
  the panel.
  .
  This package contains files that are needed to build applications.
@@ -57,10 +78,37 @@ Package: libappindicator-doc
 Section: doc
 Architecture: all
 Depends: ${shlibs:Depends},
+         ${misc:Depends}
+Description:  Application Indicators
+ A library and indicator to take menus from applications and place them in
+ the panel.
+ .
+ This package contains developer documentation.
+
+Package: libappindicator0-cil
+Section: cli-mono
+Architecture: any
+Depends: ${shlibs:Depends},
          ${misc:Depends},
+         ${cli:Depends},
          libappindicator0 (= ${binary:Version})
-Description:  Application Indicators
+Provides: ${cli:Provides}
+Description: CLI bindings for libappindicator
+ This package provides the appindicator-sharp assembly that allows CLI (.NET)
+ programs to take menus from applications and place them in the panel.
+ .
+ This package contains assemblies to be used by applications.
+
+Package: libappindicator-cil-dev
+Section: libdevel
+Architecture: any
+Depends: ${shlibs:Depends},
+         ${misc:Depends},
+         ${cli:Depends},
+         libappindicator0-cil (= ${binary:Version})
+Description: Application Indicators
  A library and indicator to take menus from applications and place them in
  the panel.
  .
- This package contains development documentation.
+ This package contains files that are needed to build applications.
+
diff --git a/debian/libappindicator-cil-dev.install b/debian/libappindicator-cil-dev.install
new file mode 100644
index 0000000..6185943
--- /dev/null
+++ b/debian/libappindicator-cil-dev.install
@@ -0,0 +1 @@
+debian/tmp/usr/lib/pkgconfig/appindicator-sharp-0.1.pc
diff --git a/debian/libappindicator-dev.install b/debian/libappindicator-dev.install
index 9268631..88e3347 100644
--- a/debian/libappindicator-dev.install
+++ b/debian/libappindicator-dev.install
@@ -1,5 +1,3 @@
 debian/tmp/usr/include/libappindicator-0.1/*
 debian/tmp/usr/lib/libappindicator.so
-debian/tmp/usr/lib/libappindicator.a
-debian/tmp/usr/lib/libappindicator.la
-debian/tmp/usr/lib/pkgconfig/*
+debian/tmp/usr/lib/pkgconfig/appindicator-0.1.pc
diff --git a/debian/libappindicator0-cil.install b/debian/libappindicator0-cil.install
new file mode 100644
index 0000000..17c04e9
--- /dev/null
+++ b/debian/libappindicator0-cil.install
@@ -0,0 +1 @@
+debian/tmp/usr/lib/appindicator-sharp-0.1/*
diff --git a/debian/python-appindicator.install b/debian/python-appindicator.install
new file mode 100644
index 0000000..7a7f049
--- /dev/null
+++ b/debian/python-appindicator.install
@@ -0,0 +1,2 @@
+debian/tmp/usr/lib/python2.6/*
+debian/tmp/usr/share/pygtk/*
diff --git a/debian/rules b/debian/rules
index 30ee9cc..7936902 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,9 +1,76 @@
 #!/usr/bin/make -f
 
+DEB_PYTHON_SYSTEM=pycentral
+PY_VERSIONS = $(shell pyversions --requested debian/control)
+export MONO_SHARED_DIR=$(CURDIR)
+
 include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/gnome.mk
+include /usr/share/cdbs/1/class/autotools-vars.mk
+include /usr/share/cdbs/1/rules/utils.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
 DEB_CONFIGURE_EXTRA_FLAGS += --enable-gtk-doc
-LDFLAGS += -Wl,-z,defs -Wl,--as-needed
+API_VERSION = 0.1
+
+configure-stamp-%:
+	mkdir build-$*
+	cd build-$* && PYTHON=`which $*` \
+		$(DEB_CONFIGURE_SCRIPT) $(DEB_CONFIGURE_NORMAL_ARGS) --srcdir=..
+	touch $@
+
+configure/python-appindicator:: $(addprefix configure-stamp-, $(PY_VERSIONS))
+
+build-stamp-%:
+	make -C build-$*/bindings/python
+	touch $@
+
+build/python-appindicator:: $(addprefix build-stamp-, $(PY_VERSIONS))
+
+install-stamp-%:
+	make -C build-$*/bindings/python install DESTDIR=$(CURDIR)/debian/tmp
+	touch $@
+
+install/python-appindicator:: $(addprefix install-stamp-, $(PY_VERSIONS))
+
+binary-install/python-appindicator::
+	dh_pycentral
+
+configure-stamp:
+	$(DEB_CONFIGURE_SCRIPT) $(DEB_CONFIGURE_NORMAL_ARGS) $(DEB_CONFIGURE_EXTRA_FLAGS)
+	touch $@
+
+configure/indicator-application:: configure-stamp
+
+build-stamp:
+	make
+	touch $@
+
+build/indicator-application:: build-stamp
+
+install-stamp:
+	make install DESTDIR=$(CURDIR)/debian/tmp
+	touch $@
+
+install/indicator-application:: install-stamp
+
+binary-post-install/indicator-application::
+	find debian/indicator-application/usr/lib -name \*.la -exec rm {} \;
+	find debian/indicator-application/usr/lib -name \*.a -exec rm {} \;
+
+binary/libappindicator0-cil:: binary-arch
+binary-arch: 
+	dh_clifixperms -i
+	dh_installdeb -i
+	dh_makeclilibs -m $(API_VERSION)
+	dh_clideps -i -d
+
+
+common-binary-predeb-arch:: list-missing
+
+clean::
+	-rm -rf $(addprefix build-, $(PY_VERSIONS))
+	-rm -rf $(addprefix configure-stamp-, $(PY_VERSIONS))
+	-rm -rf $(addprefix build-stamp-, $(PY_VERSIONS))
+	-rm -rf $(addprefix install-stamp-, $(PY_VERSIONS))
+	rm -rf $(MONO_SHARED_DIR)/.wapi