Merging in Ken's Lucid changes.

3 files changed, 50 insertions, 6 deletions

diff --git a/debian/control b/debian/control
index 039c721..746e569 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,6 @@ Build-Depends: debhelper (>= 5.0),
                libgtk2.0-dev (>= 2.12.0),
                libdbus-glib-1-dev,
                gnome-doc-utils,
-               scrollkeeper,
                gtk-doc-tools,
                intltool,
                libindicate-dev (>= 0.2.0),
@@ -42,7 +41,8 @@ Section: libdevel
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
-         libdbus-glib-1-dev (>= 0.76)
+         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 
  the panel.
@@ -51,7 +51,7 @@ Description: Application Indicators
 
 Package: libappindicator-doc
 Section: doc
-Architecture: any
+Architecture: all
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          libappindicator0 (= ${binary:Version})
diff --git a/debian/copyright b/debian/copyright
index fa3df0d..ba92c05 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,7 +1,7 @@
 This package was debianized by Robert Collins <robert@canonical.com> on
 Thu, 29 Oct 2009 15:44:14 +1100
 
-It was downloaded from <http://launchpad.net/cape-girardeau/>
+It was downloaded from <http://launchpad.net/indicator-application/>
 
 Upstream Author:
 
@@ -13,4 +13,48 @@ Copyright:
 
 License:
 
-  This program has not been released, it may not be used.
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, version 3 of the License.
+
+  This program 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 General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+
+Two files (app-indicator.c and app-indicator.h) are under:
+
+  1) the GNU Lesser General Public License version 3, as published by the
+     Free Software Foundation; and/or
+  2) the GNU Lesser General Public License version 2.1, as published by
+     the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranties of
+  MERCHANTABILITY, SATISFACTORY QUALITY or FITNESS FOR A PARTICULAR
+  PURPOSE.  See the applicable version of the GNU Lesser General Public
+  License for more details.
+
+  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 of the License, or (at your option) any later version.
+
+  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 Street, Fifth Floor,
+  Boston, MA 02110-1301 USA
+
+On Debian/Ubuntu systems, the full text of the LGPL v2.1 can be found in
+`/usr/share/common-licenses/LGPL-2.1', the full text of the LGPL v3 can be found in
+`/usr/share/common-licenses/LGPL-3, and the full text of the GPL v3 can be
+found in `/usr/share/common-licenses/GPL-3'
diff --git a/debian/rules b/debian/rules
index c42359e..30ee9cc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,6 +4,6 @@ include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/gnome.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
-DEB_CONFIGURE_EXTRA_FLAGS += --disable-scrollkeeper --enable-gtk-doc
+DEB_CONFIGURE_EXTRA_FLAGS += --enable-gtk-doc
 LDFLAGS += -Wl,-z,defs -Wl,--as-needed