* Merging in the seperation from indicator-applet

* debian/* Removing all of the indicator-applet stuff

12 files changed, 8 insertions, 148 deletions

diff --git a/debian/changelog b/debian/changelog
index bbb70e4..281b0b7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 libindicator (0.2.0~bzr325-0ubuntu1~ppa1) UNRELEASED; urgency=low
 
-  * Merging in the separation from indicator-applet
+  * Merging in the seperation from indicator-applet
+  * debian/* Removing all of the indicator-applet stuff
 
  -- Ted Gould <ted@ubuntu.com>  Tue, 18 Aug 2009 13:39:35 -0500
 
diff --git a/debian/control b/debian/control
index 86c1447..1c91055 100644
--- a/debian/control
+++ b/debian/control
@@ -1,99 +1,13 @@
-Source: indicator-applet
-Section: gnome
+Source: libindicator
+Section: libs
 Priority: optional
 Maintainer: Ubuntu Core Developers <ubuntu-devel-discuss@lists.ubuntu.com>
 Build-Depends: debhelper (>= 5.0),
                cdbs (>= 0.4.41),
-               libgtk2.0-dev (>= 2.12.0),
-               libpanel-applet2-dev (>= 2.0.0),
-               libdbus-glib-1-dev,
-               gnome-doc-utils,
-               libgnomeui-dev,
-               libtool,
-               intltool,
-               libxml2-dev,
-               gtk-doc-tools
+               libtool
 Standards-Version: 3.8.0
-Homepage: https://launchpad.net/indicator-applet
-Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-core-dev/indicator-applet/ubuntu
-
-Package: indicator-applet
-Architecture: any
-Depends: ${shlibs:Depends},
-         ${misc:Depends},
-         gnome-panel,
-         indicator-messages
-Description: GNOME panel indicator applet
- indicator-applet is an applet to display information from
- various applications consistently in the GNOME panel. 
- .
- Currently this includes support for messaging applications in the
- indicator-messages package.
-
-Package: indicator-applet-sus
-Architecture: any
-Depends: ${shlibs:Depends},
-         ${misc:Depends},
-         gnome-panel,
-         indicator-applet (= ${binary:Version})
-Description: A clone of the GNOME panel indicator applet.
- Indicator-applet is an applet to display information from
- various applications consistently in the GNOME panel. 
- .
- This instance will only load the SUS indicator which provies
- status changing, user choosing and session management.
-
-Package: libindicate2
-Section: libs
-Conflicts: libindicate
-Replaces: libindicate
-Architecture: any
-Depends: ${shlibs:Depends},
-         ${misc:Depends}
-Description: GNOME panel indicator applet - shared library
- indicator-applet is an applet to display information from
- various applications consistently in the GNOME panel. 
- .
- This package contains shared libraries to be used by applications.
-
-Package: libindicate-dev
-Section: libdevel
-Architecture: any
-Depends: ${shlibs:Depends},
-         ${misc:Depends},
-         libindicate2 (= ${binary:Version}),
-         libdbus-glib-1-dev (>= 0.76)
-Description: GNOME panel indicator applet - shared library
- indicator-applet is an applet to display information from
- various applications consistently in the GNOME panel. 
- .
- This package contains files that are needed to build applications.
-
-Package: libindicate-gtk0
-Section: libs
-Architecture: any
-Depends: ${shlibs:Depends},
-         ${misc:Depends}
-Description: GNOME panel indicator applet - shared library
- indicator-applet is an applet to display information from
- various applications consistently in the GNOME panel. 
- .
- This package contains shared libraries to be used by applications.
-
-Package: libindicate-gtk-dev
-Section: libdevel
-Architecture: any
-Depends: ${shlibs:Depends},
-         ${misc:Depends},
-         libindicate-gtk0 (= ${binary:Version}),
-         libindicate-dev (= ${binary:Version}),
-         libdbus-glib-1-dev (>= 0.76),
-         libgtk2.0-dev (>= 2.12.0)
-Description: GNOME panel indicator applet - shared library
- indicator-applet is an applet to display information from
- various applications consistently in the GNOME panel. 
- .
- This package contains files that are needed to build applications.
+Homepage: https://launchpad.net/libindicator
+Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-core-dev/libindicator/ubuntu
 
 Package: libindicator-dev
 Section: libdevel
@@ -107,18 +21,3 @@ Description: GNOME panel indicator applet - shared library
  .
  This package contains files that are needed to build applications.
 
-Package: libindicate-doc
-Section: doc
-Architecture: any
-Depends: ${shlibs:Depends},
-         ${misc:Depends},
-         libindicate2 (= ${binary:Version}),
-         libindicate-gtk0 (= ${binary:Version}),
-         libdbus-glib-1-dev (>= 0.76),
-         libgtk2.0-dev (>= 2.12.0)
-Description: GNOME panel indicator applet - shared library
- indicator-applet is an applet to display information from
- various applications consistently in the GNOME panel.·
- .
- This package contains files that are needed to build applications.
-
diff --git a/debian/copyright b/debian/copyright
index 074097c..ca1ebdd 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -29,25 +29,5 @@ License:
 On Debian systems, the complete text of the GNU General
 Public License can be found in `/usr/share/common-licenses/GPL-3'.
 
-License for libindicate/* (libindicate0 and libindicate-dev packages):
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 or 3 of the License.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-On Debian systems, the complete text of the GNU Lesser General Public License
-can be found in `/usr/share/common-licenses/LGPL-2.1' and
-`/usr/share/common-licenses/LGPL-3'.
-
 The Debian packaging is (C) 2009, Canonical Ltd. and
 is licensed under the GPLv3, see `/usr/share/common-licenses/GPL-3'.
diff --git a/debian/indicator-applet-sus.install b/debian/indicator-applet-sus.install
deleted file mode 100644
index 3a016e0..0000000
--- a/debian/indicator-applet-sus.install
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/tmp/usr/lib/bonobo/servers/GNOME_FastUserSwitchApplet.server
-debian/tmp/usr/lib/indicator-applet/indicator-applet-sus
diff --git a/debian/indicator-applet.install b/debian/indicator-applet.install
deleted file mode 100644
index 772d432..0000000
--- a/debian/indicator-applet.install
+++ /dev/null
@@ -1,4 +0,0 @@
-debian/tmp/usr/lib/bonobo/servers/GNOME_IndicatorApplet.server
-debian/tmp/usr/lib/indicator-applet/indicator-applet
-debian/tmp/usr/lib/indicator-applet/listen-and-print
-debian/tmp/usr/share/icons
diff --git a/debian/libindicate-dev.install b/debian/libindicate-dev.install
deleted file mode 100644
index 81e1396..0000000
--- a/debian/libindicate-dev.install
+++ /dev/null
@@ -1,4 +0,0 @@
-debian/tmp/usr/include/libindicate-0.1/libindicate/*
-debian/tmp/usr/lib/pkgconfig/indicate.pc
-debian/tmp/usr/lib/libindicate.a
-debian/tmp/usr/lib/libindicate.so
diff --git a/debian/libindicate-doc.install b/debian/libindicate-doc.install
deleted file mode 100644
index 55af9eb..0000000
--- a/debian/libindicate-doc.install
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/tmp/usr/share/gtk-doc/html/libindicate/*
-debian/tmp/usr/share/doc/indicator-applet/examples/*
diff --git a/debian/libindicate-gtk-dev.install b/debian/libindicate-gtk-dev.install
deleted file mode 100644
index 5f0e682..0000000
--- a/debian/libindicate-gtk-dev.install
+++ /dev/null
@@ -1,4 +0,0 @@
-debian/tmp/usr/include/libindicate-0.1/libindicate-gtk/*
-debian/tmp/usr/lib/pkgconfig/indicate-gtk.pc
-debian/tmp/usr/lib/libindicate-gtk.a
-debian/tmp/usr/lib/libindicate-gtk.so
diff --git a/debian/libindicate-gtk0.install b/debian/libindicate-gtk0.install
deleted file mode 100644
index fc6b412..0000000
--- a/debian/libindicate-gtk0.install
+++ /dev/null
@@ -1 +0,0 @@
-debian/tmp/usr/lib/libindicate-gtk.so.*
diff --git a/debian/libindicate2.install b/debian/libindicate2.install
deleted file mode 100644
index 0618a58..0000000
--- a/debian/libindicate2.install
+++ /dev/null
@@ -1 +0,0 @@
-debian/tmp/usr/lib/libindicate.so.*
diff --git a/debian/rules b/debian/rules
index 27ff7f1..744b984 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,6 +3,4 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/gnome.mk
 
-DEB_CONFIGURE_EXTRA_FLAGS += --disable-scrollkeeper --disable-gobject-introspection --enable-gtk-doc
 LDFLAGS += -Wl,-z,defs -Wl,--as-needed
-DEB_DH_MAKESHLIBS_ARGS_libindicate0 += -V 'libindicate0 (>= 0.1.2)'
diff --git a/debian/watch b/debian/watch
index e8ab1bd..16f79e0 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,2 @@
 version=3
-http://launchpad.net/indicator-applet/+download .*/indicator-applet-([0-9.]+)\.tar\.gz
+http://launchpad.net/libindicator/+download .*/libindicator-([0-9.]+)\.tar\.gz