Merge lp:~vibhavp/landscape-client/landscape-client-typo.fix into lp:~landscape/landscape-client/trunk

[Vibhav Pant]

Fixes Typo

[Thomas Herve (therve)]

Thanks, the typo has been fixed.

=== added file 'LICENSE'
--- LICENSE	1970-01-01 00:00:00 +0000
+++ LICENSE	2012-04-22 14:14:27 +0000
@@ -0,0 +1,340 @@
+		    GNU GENERAL PUBLIC LICENSE
+		       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+                       59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+

+		    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+

+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+

+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+

+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+			    NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+

+	    How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    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; either version 2 of the License, or
+    (at your option) any later version.
+
+    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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Library General
+Public License instead of this License.

=== renamed file 'LICENSE' => 'LICENSE.moved'
=== added file 'Makefile'
--- Makefile	1970-01-01 00:00:00 +0000
+++ Makefile	2012-04-22 14:14:27 +0000
@@ -0,0 +1,113 @@
+PYDOCTOR ?= pydoctor
+TXT2MAN ?= txt2man 
+PYTHON ?= python
+TRIAL_ARGS ?= 
+TEST_COMMAND = trial $(TRIAL_ARGS) landscape
+
+all: build
+
+build:
+	$(PYTHON) setup.py build_ext -i
+
+check: build
+	@if [ -z "$$DBUS_SESSION_BUS_ADDRESS" ]; then \
+		OUTPUT=`dbus-daemon --print-address=1 --print-pid=1 --session --fork`; \
+		export DBUS_SESSION_BUS_ADDRESS=`echo $$OUTPUT | cut -f1 -d ' '`; \
+		DBUS_PID=`echo $$OUTPUT | cut -f2 -d ' '`; \
+		trap "kill $$DBUS_PID" EXIT; \
+	fi; \
+	if [ -z "$$DISPLAY" ]; then \
+		xvfb-run $(TEST_COMMAND); \
+	else \
+	    $(TEST_COMMAND); \
+	fi
+
+lint:
+	bzr ls-lint
+
+pyflakes:
+	-pyflakes `find landscape -name \*py|grep -v twisted_amp\.py|grep -v configobj\.py|grep -v mocker\.py`
+
+checkcertificate:
+	-echo | openssl s_client -connect landscape.canonical.com:443 -CAfile /etc/ssl/certs/ca-certificates.crt
+
+clean:
+	-find landscape -name \*.pyc -exec rm {} \;
+	-rm tags
+	-rm _trial_temp -rf
+	-rm docs/api -rf;
+	-rm man/\*.1 -rf
+	-rm sdist -rf
+
+doc: docs/api/twisted/pickle
+	mkdir -p docs/api
+	${PYDOCTOR} --make-html --html-output docs/api --add-package landscape --extra-system=docs/api/twisted/pickle:twisted/
+
+docs/api/twisted/pickle:
+	mkdir -p docs/api/twisted
+	-${PYDOCTOR} --make-html --html-output docs/api/twisted --add-package /usr/share/pyshared/twisted -o docs/api/twisted/pickle
+
+manpages:
+	${TXT2MAN} -P Landscape -s 1 -t landscape-client < man/landscape-client.txt > man/landscape-client.1
+	${TXT2MAN} -P Landscape -s 1 -t landscape-config < man/landscape-config.txt > man/landscape-config.1
+	${TXT2MAN} -P Landscape -s 1 -t landscape-message < man/landscape-message.txt > man/landscape-message.1
+
+package: manpages
+	@fakeroot debian/rules binary
+	@echo "\n\nYou remembered to update the changelog, right?\n\n"
+
+SSH_USERNAME=`whoami`
+SSH_HOST=people.ubuntu.com
+PACKAGE_DIR=/home/jkakar/public_html/landscape
+deploy:
+ifneq (${PACKAGE},)
+	@echo "Copying ${PACKAGE} to $(SSH_HOST):$(PACKAGE_DIR)"
+	@scp ${PACKAGE} $(SSH_USERNAME)@$(SSH_HOST):$(PACKAGE_DIR)
+	@echo "\nScanning packages and recreating the Packages file."
+	@ssh -l $(SSH_USERNAME) $(SSH_HOST) \
+		"cd $(PACKAGE_DIR) " \
+		"&& dpkg-scanpackages . /dev/null > Packages " \
+		"&& gzip -f Packages"
+else
+	@echo "You need to specify PACKAGE, as in: make deploy PACKAGE=<name>"
+endif
+
+MESSAGE_DIR = `pwd`/runclient-messages
+LOG_FILE = `pwd`/runclient.log
+
+reinstall:
+	-sudo dpkg -P landscape-client
+	-sudo rm -rf /var/log/landscape /etc/landscape /var/lib/landscape /etc/default/landscape-client
+	-sudo apt-get install landscape-client
+
+freshdata:
+	-sudo rm -rf $(MESSAGE_DIR)
+	-sudo mkdir $(MESSAGE_DIR)
+
+run:
+	-sudo ./landscape-client \
+		-a onward -t "John's PC" \
+		-u http://localhost:8080/message-system \
+		-d $(MESSAGE_DIR) \
+		--urgent-exchange-interval=5 \
+		--log-level=debug \
+		--ping-url=http://localhost:8081/ping \
+
+freshrun: freshdata run
+
+tags:
+	-ctags --languages=python -R .
+
+etags:
+	-etags --languages=python -R .
+
+UPSTREAM_VERSION=$(shell python -c "from landscape import UPSTREAM_VERSION; print UPSTREAM_VERSION")
+sdist:
+	mkdir -p sdist
+	bzr export sdist/landscape-client-$(UPSTREAM_VERSION)
+	rm -rf sdist/landscape-client-$(UPSTREAM_VERSION)/debian
+	cd sdist && tar cfz landscape-client-$(UPSTREAM_VERSION).tar.gz landscape-client-$(UPSTREAM_VERSION)
+	cd sdist && md5sum landscape-client-$(UPSTREAM_VERSION).tar.gz > landscape-client-$(UPSTREAM_VERSION).tar.gz.md5
+	rm -rf sdist/landscape-client-$(UPSTREAM_VERSION)
+
+.PHONY: tags etags

=== renamed file 'Makefile' => 'Makefile.moved'
=== added file 'README'
--- README	1970-01-01 00:00:00 +0000
+++ README	2012-04-22 14:14:27 +0000
@@ -0,0 +1,46 @@
+== Non-root mode ==
+
+The Landscape Client generally runs as a combination of the 'root' and
+'landscape' users.  It is possible to disable the administrative features of
+Landscape and run only the monitoring parts of it without using the 'root'
+user at all.
+
+If you wish to use the Landscape Client in this way, it's recommended that you
+perform these steps immediately after installing the landscape-client package.
+
+Edit /etc/default/landscape-client and add the following lines:
+
+  RUN=1
+  DAEMON_USER=landscape
+
+Edit /etc/landscape/client.conf and add the following line:
+
+  monitor_only = true
+
+Now you can run 'sudo landscape-config' as usual to complete the configuration
+of your client and register with the Landscape service.
+
+
+== Developing ==
+
+To run the full test suite, you must have a dbus session bus
+running. If you don't have one (for example, if you're running the
+tests in an ssh session), run the following command:
+
+export DBUS_SESSION_BUS_ADDRESS=`dbus-daemon --print-address=1 --session --fork`
+
+Then your tests should pass.
+
+When you want to test the landscape client manually without management
+features, you can simply run:
+
+$ ./scripts/landscape-client
+
+This defaults to the 'landscape-client.conf' configuration file.
+
+When you want to test management features manually, you'll need to run as root.
+There's a configuration file 'root-client.conf' which specifies use of the
+system bus.
+
+$ sudo ./scripts/landscape-client -c root-client.conf
+

=== renamed file 'README' => 'README.moved'
=== added directory 'applications'
=== renamed directory 'applications' => 'applications.moved'
=== added file 'applications/landscape-client-settings.desktop.in'
--- applications/landscape-client-settings.desktop.in	1970-01-01 00:00:00 +0000
+++ applications/landscape-client-settings.desktop.in	2012-04-22 14:14:27 +0000
@@ -0,0 +1,17 @@
+[Desktop Entry]
+_Name=Management Service
+_Comment=Management Service Preferences
+Exec=landscape-client-ui-install
+Icon=preferences-management-service
+Terminal=False
+Type=Application
+StartupNotify=true
+Categories=GNOME;GTK;Settings;X-GNOME-SystemSettings;X-GNOME-Settings-Panel;
+OnlyShowIn=GNOME;Unity;
+X-GNOME-Bugzilla-Bugzilla=GNOME
+X-GNOME-Bugzilla-Product=gnome-control-center
+X-GNOME-Bugzilla-Component=sample
+X-GNOME-Bugzilla-Version=1.0.0
+X-GNOME-Settings-Panel=sample
+X-GNOME-Keywords=device;system;information;memory;processor;version;default;application;fallback;preferred;
+X-Ubuntu-Gettext-Domain=landscape-client

=== added directory 'apt-update'
=== renamed directory 'apt-update' => 'apt-update.moved'
=== added file 'apt-update/Makefile'
--- apt-update/Makefile	1970-01-01 00:00:00 +0000
+++ apt-update/Makefile	2012-04-22 14:14:27 +0000
@@ -0,0 +1,7 @@
+NAME = apt-update
+
+$(NAME): $(NAME).c
+	$(CC) $(CFLAGS) -Wall $< -o $@
+
+clean:
+	rm -f $(NAME)

=== added file 'apt-update/apt-update.c'
--- apt-update/apt-update.c	1970-01-01 00:00:00 +0000
+++ apt-update/apt-update.c	2012-04-22 14:14:27 +0000
@@ -0,0 +1,81 @@
+/*
+
+ Copyright (c) 2011 Canonical, Ltd.
+
+*/
+
+#define _GNU_SOURCE
+#include <sys/resource.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <grp.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <string.h>
+#include <errno.h>
+#include <stdio.h>
+#include <pwd.h>
+
+int main(int argc, char *argv[], char *envp[])
+{
+  char *apt_argv[] = {"/usr/bin/apt-get", "-q", "update", NULL};
+  char *apt_envp[] = {"PATH=/bin:/usr/bin", NULL, NULL};
+
+  // Set the HOME environment variable
+  struct passwd *pwd = getpwuid(geteuid());
+  if (!pwd) {
+    fprintf(stderr, "error: Unable to find passwd entry for uid %d (%s)\n",
+            geteuid(), strerror(errno));
+    exit(1);
+  }
+  if (asprintf(&apt_envp[1], "HOME=%s", pwd->pw_dir) == -1) {
+    perror("error: Unable to create HOME environment variable");
+    exit(1);
+  }
+
+  // Drop any supplementary group
+  if (setgroups(0, NULL) == -1) {
+    perror("error: Unable to set supplementary groups IDs");
+    exit(1);
+  }
+
+  // Set real/effective gid and uid
+  if (setregid(pwd->pw_gid, pwd->pw_gid) == -1) {
+    fprintf(stderr, "error: Unable to set real and effective gid (%s)\n",
+            strerror(errno));
+    exit(1);
+  }
+  if (setreuid(pwd->pw_uid, pwd->pw_uid) == -1) {
+    perror("error: Unable to set real and effective uid");
+    exit(1);
+  }
+
+  // Close all file descriptors except the standard ones
+  struct rlimit rlp;
+  if (getrlimit(RLIMIT_NOFILE, &rlp) == -1) {
+    perror("error: Unable to determine file descriptor limits");
+    exit(1);
+  }
+  int file_max;
+  if (rlp.rlim_max == RLIM_INFINITY || rlp.rlim_max > 4096)
+    file_max = 4096;
+  else
+    file_max = rlp.rlim_max;
+  int file;
+  for (file = 3; file < file_max; file++) {
+    close(file);
+  }
+
+  // Set umask to 022
+  umask(S_IWGRP | S_IWOTH);
+
+  if (chdir("/") == -1) {
+    perror("error: Unable to change working directory");
+    exit(1);
+  }
+
+  // Run apt-get update
+  execve(apt_argv[0], apt_argv, apt_envp);
+  perror("error: Unable to execute apt-get");
+  return 1;
+}

=== added directory 'dbus'
=== added directory 'dbus-1'
=== renamed directory 'dbus-1' => 'dbus-1.moved'
=== added file 'dbus-1/com.canonical.LandscapeClientRegistration.conf'
--- dbus-1/com.canonical.LandscapeClientRegistration.conf	1970-01-01 00:00:00 +0000
+++ dbus-1/com.canonical.LandscapeClientRegistration.conf	2012-04-22 14:14:27 +0000
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
+"http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
+<busconfig>
+  <type>system</type>
+  <policy user="root">
+    <allow own="com.canonical.LandscapeClientRegistration"/>
+    <allow send_destination="com.canonical.LandscapeClientRegistration"/>
+    <allow send_interface="com.canonical.LandscapeClientRegistration"/>
+  </policy>
+
+  <policy context="default">
+    <allow send_destination="com.canonical.LandscapeClientRegistration"/>
+    <allow send_interface="com.canonical.LandscapeClientRegistration"/>
+  </policy>
+</busconfig>

=== added file 'dbus-1/com.canonical.LandscapeClientRegistration.service'
--- dbus-1/com.canonical.LandscapeClientRegistration.service	1970-01-01 00:00:00 +0000
+++ dbus-1/com.canonical.LandscapeClientRegistration.service	2012-04-22 14:14:27 +0000
@@ -0,0 +1,4 @@
+[D-BUS Service]
+Name=com.canonical.LandscapeClientRegistration
+Exec=/usr/bin/landscape-client-registration-mechanism
+User=root
\ No newline at end of file

=== added file 'dbus-1/com.canonical.LandscapeClientSettings.conf'
--- dbus-1/com.canonical.LandscapeClientSettings.conf	1970-01-01 00:00:00 +0000
+++ dbus-1/com.canonical.LandscapeClientSettings.conf	2012-04-22 14:14:27 +0000
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
+"http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
+<busconfig>
+  <type>system</type>
+  <policy user="root">
+    <allow own="com.canonical.LandscapeClientSettings"/>
+    <allow send_destination="com.canonical.LandscapeClientSettings"/>
+    <allow send_interface="com.canonical.LandscapeClientSettings"/>
+  </policy>
+
+  <policy context="default">
+    <allow send_destination="com.canonical.LandscapeClientSettings"/>
+    <allow send_interface="com.canonical.LandscapeClientSettings"/>
+  </policy>
+</busconfig>

=== added file 'dbus-1/com.canonical.LandscapeClientSettings.service'
--- dbus-1/com.canonical.LandscapeClientSettings.service	1970-01-01 00:00:00 +0000
+++ dbus-1/com.canonical.LandscapeClientSettings.service	2012-04-22 14:14:27 +0000
@@ -0,0 +1,4 @@
+[D-BUS Service]
+Name=com.canonical.LandscapeClientSettings
+Exec=/usr/bin/landscape-client-settings-mechanism
+User=root
\ No newline at end of file

=== renamed directory 'dbus' => 'dbus.moved'
=== added file 'dbus/landscape.conf'
--- dbus/landscape.conf	1970-01-01 00:00:00 +0000
+++ dbus/landscape.conf	2012-04-22 14:14:27 +0000
@@ -0,0 +1,62 @@
+<!DOCTYPE busconfig PUBLIC
+ "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
+ "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
+<busconfig>
+
+  <policy user="landscape">
+    <allow own="com.canonical.landscape.Broker" />
+    <allow own="com.canonical.landscape.Monitor" />
+
+    <allow send_destination="com.canonical.landscape.Broker" />
+    <allow receive_sender="com.canonical.landscape.Broker" />
+
+    <allow send_destination="com.canonical.landscape.Monitor" />
+    <allow receive_sender="com.canonical.landscape.Monitor" />
+
+    <allow send_destination="com.canonical.landscape.Manager" />
+    <allow receive_sender="com.canonical.landscape.Manager" />
+
+    <allow send_interface="org.freedesktop.Hal.Manager" />
+    <allow send_interface="org.freedesktop.Hal.Device" />
+
+  </policy>
+
+  <!-- this is a horrible hack -->
+  <policy user="haldaemon">
+
+    <allow receive_sender="com.canonical.landscape.Manager" />
+    <allow receive_sender="com.canonical.landscape.Monitor" />
+    <allow receive_sender="com.canonical.landscape.Broker" />
+
+  </policy>
+
+  <policy user="root">
+    <allow own="com.canonical.landscape.Manager" />
+
+    <allow send_destination="com.canonical.landscape.Broker" />
+    <allow receive_sender="com.canonical.landscape.Broker" />
+
+    <allow send_destination="com.canonical.landscape.Monitor" />
+    <allow receive_sender="com.canonical.landscape.Monitor" />
+
+    <allow send_destination="com.canonical.landscape.Manager" />
+    <allow receive_sender="com.canonical.landscape.Manager" />
+  </policy>
+
+  <policy context="default">
+    <deny own="com.canonical.landscape.Broker" />
+    <deny own="com.canonical.landscape.Monitor" />
+    <deny own="com.canonical.landscape.Manager" />
+
+    <deny send_destination="com.canonical.landscape.Broker" />
+    <deny receive_sender="com.canonical.landscape.Broker" />
+
+    <deny send_destination="com.canonical.landscape.Monitor" />
+    <deny receive_sender="com.canonical.landscape.Monitor" />
+
+    <deny send_destination="com.canonical.landscape.Manager" />
+    <deny receive_sender="com.canonical.landscape.Manager" />
+
+  </policy>
+
+</busconfig>

=== added directory 'debian'
=== renamed directory 'debian' => 'debian.moved'
=== added file 'debian/README.source'
--- debian/README.source	1970-01-01 00:00:00 +0000
+++ debian/README.source	2012-04-22 14:14:27 +0000
@@ -0,0 +1,15 @@
+When making a revision to this package, please update the *last* digit in the
+Debian version number. e.g.
+
+  1.0.29-0ubuntu0.9.04.0
+
+should become
+
+  1.0.29-0ubuntu0.9.04.1
+
+In addition, when you build a package for a new client version, it would be
+appreciated if you also updated the UPSTREAM_VERSION variable in
+landscape/__init__.py to include the entire new client version number. This
+helps us keep track of exact version of clients in use. There's no need to
+update the DEBIAN_REVISION variable, as it gets automatically set at build
+time. 

=== added file 'debian/changelog'
--- debian/changelog	1970-01-01 00:00:00 +0000
+++ debian/changelog	2012-04-22 14:14:27 +0000
@@ -0,0 +1,1189 @@
+landscape-client (12.04.3-0ubuntu1) precise; urgency=low
+
+  * Warn on unicode entry into settings UI (LP: #956612).
+  * Sanitise hostname field in settings UI (LP: #954507).
+  * Make it clear that the Landscape service is commercial (LP: #965850)
+  * Further internationalize the settings UI (LP: #962899)
+
+ -- David Britton <[e-mail]>  Wed, 28 Mar 2012 10:59:58 -0600
+
+landscape-client (12.04.2-0ubuntu1) precise; urgency=low
+
+  * Depend on python-aptdaemon.gtk3widgets instead of python-aptdaemon and
+    replace dependency on python-gobject by python-gi (LP: #961894)
+  * Add i18n to the landscape-client-ui-install script. (LP: #961891)
+
+ -- David Britton <[e-mail]>  Thu, 22 Mar 2012 10:10:39 -0600
+
+landscape-client (12.04.1-0ubuntu1) precise; urgency=low
+
+  * Fix default landscape hostname in glib schema.
+  * dpkg test improvements to fix intermittent failures.
+  * If ssl_public_key is supplied, use it also when fetching script
+    attachments. This fixes the case of using script execution with
+    attachments when the Landscape server is using a custom CA,
+    most common in LDS deployments. (LP: #959846)
+  * Make sure we have a PATH variable set before doing package
+    activities, and also set it in the initscript for good measure. If
+    the client was configured and restarted by the new UI configuration
+    tool, PATH wasn't set, triggering an error in dpkg. (LP: #961190)
+  * Make landscape-client-ui depend on landscape-client-ui-install, so
+    that we get an entry in the system settings if just
+    landscape-client-ui is installed. The actual entry comes from
+    landscape-client-ui-install.
+  * Optimization: when adding binaries, don't reload every repo, only the one
+    containing the binaries. (LP: #954822)
+  * Handle the case where the user clicks twice inadvertently on the
+    Landscape icon in system settings and don't start a second copy of
+    itself. (LP: #960211)
+
+ -- Andreas Hasenack <[e-mail]>  Wed, 21 Mar 2012 16:15:49 -0300
+
+landscape-client (12.04-0ubuntu1) precise; urgency=low
+
+  * d/control: Dropping python-central and python-support since
+    they are not used except in backports, and are not in main.
+
+ -- Clint Byrum <[e-mail]>  Mon, 19 Mar 2012 16:05:49 -0700
+
+landscape-client (12.04-0ubuntu0.12.04.0) precise; urgency=low
+
+  * Change package management features to use APT instead of Smart (LP: #856244,
+    #861707, #859615, #861345, #863239, #863259, #865270, #865272, #865285,
+    #865273, #871641, #865299, #873196, #873939, #876493, #881973, #882438,
+    #866014, #881998, #884142, #884151, #884131, #887037, #886208, #887578,
+    #887947, #889067, #889069, #889087, #889099, #865303, #889113, #890605,
+    #890606, #890609, #897416, #891855, #898681, #898683, #897656, #898542,
+    #862212, #903202, #914734, #914735, #914737, #916301, #915280, #914742,
+    #918925, #918175, #919179, #921664, #921699, #922582, #922511, #921712,
+    #928750, #932136, #928941, #937411, #937567, #925543, #947803, #952973,
+    #948142, #953136, #953906, #956590).
+  * Add a GTK interface to configure the client (LP: #911279, #911666, #912163,
+    #911665, #916300, #931937, #931937, #943622, #945025, #911279, #944652,
+    #948464, #948416, #949158, #911671, #950864, #949208, #949147, #953070,
+    #953292, #953463, #953034, #949200, #953026, #954499, #954516, #954285,
+    #953065, #954414, #954332, #954542, #955966, #955139, #956030, #956119).
+  * Add the ability to auto discover the server location on local deployment
+    (LP: #917422, #927620, #917422, #928585, #929087, #932325, #948564) 
+  * Allow the client to accept arbitrary environment variables from the
+    server for script execution (LP: #954999).
+  * Make landscape-config exit non-zero when registration fails and 
+    --ok-no-register is not passed (LP: #271759).
+  * Check for the content of /sys/bus/xen/devices to report a machine as a Xen
+    VM instead of just relying on the existence of /sys/bus/xen (LP: #921970).
+  * Make sure cloud registration succeeds if there is no kernel specified in
+    the meta-data service (LP: #920453).
+  * Report private and public IP adresses from the metadata service at cloud
+    registration time (LP: #918366).
+  * Add support for reporting hardware information using lshw (LP: #899002,
+    #943975, #955734).
+  * Add support for the new attachment service in script execution
+    (LP: #893040).
+  * Adds a new message type, 'register-provisioned-machine', which is meant
+    to register computers using an OTP (LP: #881405).
+  * Add local cloning option for load testing (LP: #872830, #925924).
+  * Add more variables to preseeding (LP: #863204, #867710).
+  * Allow the configuration of the ping interval (LP: #397884).
+  * Add fake package reporters for load testing purposes (LP: #821571,
+    #821570).
+  * Report a package reporter error to the server if no APT sources are
+    configured, to trigger a package reporter alert (LP: #823769).
+
+ -- Andreas Hasenack <[e-mail]>  Mon, 19 Mar 2012 09:33:34 -0300
+
+landscape-client (11.07.1.1-0ubuntu2) precise; urgency=low
+
+  * Remove build dependency on python-central | python-support for demotion.
+
+ -- Matthias Klose <[e-mail]>  Sat, 17 Dec 2011 17:25:00 +0100
+
+landscape-client (11.07.1.1-0ubuntu1.11.10.0) oneiric; urgency=low
+
+  * Included missing files (LP: #814223).
+
+ -- Andreas Hasenack <[e-mail]>  Thu, 21 Jul 2011 15:40:46 -0300
+
+landscape-client (11.07.1.1-0ubuntu0.11.10.0) oneiric; urgency=low
+
+  * Try to load the old persist file if the current one doesn't exist or is
+    empty (LP: #809210).
+  * Fallback to gethostname to get something interesting out of get_fqdn.
+  * Fix wrong ownership and permissions when the reporter is run as a result
+    of applying a repository profile (LP: #804008).
+  * Keep original sources.list ownership (LP: #804548).
+  * Refactored tests (LP: #805746).
+  * Preserve permissions of sources.list (LP: #804548).
+  * Added a broker command line option (--record) that saves exchanges with the
+    server to the filesystem
+  * Detect if running in a vmware guest (LP: #795794).
+  * Report VM type when run in the cloud (LP: #797069).
+  * Report VM type in non-cloud registration (LP: #795752).
+  * Report the package reporter result even in case of success, not just in
+    case of failure (LP: #780406).
+  * Report package reporter errors (LP: #732490).
+  * Fix dependencies for hardy removing references to python 2.4 packages for
+    pycurl and dbus (LP: #759764).
+  * The landscape client now reports whether it is running on a virtual machine
+    or not.
+  * Add a plugin which manages APT sources.list and the associated GPG keys
+    (LP: #758928).
+  * Limit the number of items in a network message to 200, to prevent problems
+    when communication is interrupted with the server and the client
+    accumulates too many network items, thus overloading the server when it's
+    available again (LP: #760486).
+  * Updated version number in __init__.py so that the client reports the
+    correct one in its user-agent string.
+
+ -- Andreas Hasenack <[e-mail]>  Mon, 18 Jul 2011 15:16:18 -0300
+
+landscape-client (11.02-0ubuntu0.11.04.1) natty; urgency=low
+
+  * debian/control, debian/rules: Add quilt
+  * debian/patches/fix-landscape-monitor.patch: Fix landscape
+    monitoring with gir1.0-gudev-1.0 installed. (LP: #747498)
+
+ -- Chuck Short <[e-mail]>  Fri, 08 Apr 2011 09:46:24 -0400
+
+landscape-client (11.02-0ubuntu0.11.04.0) natty; urgency=low
+
+  * New upstream version (LP: #727324)
+
+    - Exit gracefully instead of crashing when the filesystem is
+      read-only (LP: #649997).
+
+    - Drop hal requirement (LP: #708502).
+
+    - Enable HTTP compression in Curl (LP: #297623).
+
+    - Explicitly name log files that need to be rotated (LP: #634236).
+
+    - Assorted test suite fixes
+
+ -- Andreas Hasenack <[e-mail]>  Tue, 01 Mar 2011 15:38:11 -0300
+
+landscape-client (11.01-0ubuntu0.11.04.0) natty; urgency=low
+
+  * New upstream version (LP: #702928)
+
+    - Use a better load check for the sysinfo wrapper, taking into account the
+      number of cores (LP: #643565).
+
+    - Add an option to bootstrap cloud instances using cloud-init
+      (LP: #701972).
+
+    - Fix packaging for Natty (LP: #688115).
+
+    - Force deletion of all the persist data for the monitoring plugins at
+      resynchronization, instead of relying each one of them to do
+      (LP: #688161).
+
+    - Don't send the mount-activity message to the server anymore
+      (LP: #688514).
+
+    - Workaround a new behavior in NetworkManager where getfqdn would report
+      localhost instead of useful hostname (LP: #649142).
+
+ -- Thomas Hervé <[e-mail]>  Fri, 14 Jan 2011 10:11:04 -0600
+
+landscape-client (1.5.5.1-0ubuntu0.10.10.0) maverick; urgency=low
+
+  * The client network plugin would send erroneous data if a network
+    interface was removed (and its kernel module removed as well) and
+    then readded (LP: #641264).
+
+ -- Andreas Hasenack <[e-mail]>  Mon, 20 Sep 2010 13:52:49 -0300
+
+landscape-client (1.5.5-0ubuntu0.10.10.0) maverick; urgency=low
+
+  * New upstream version (LP: #633468)
+
+    - The --help command line option can now be used without being
+      root (LP: #613256).
+
+    - The client Unix sockets and symlinks are now cleaned up at shutdown.
+      Without this cleaning, the client could refuse to start because of a PID
+      collision (LP: #607747).
+
+    - The network traffic plugin didn't use to take into account integer
+      overflows. This would cause the plugin to send negative values
+      sometimes (LP: #615371).
+
+    - If a payload had many user activities in it, only the last one would be
+      carried out (LP: #617624).
+
+    - The Eucalyptus plugin was not enabled by default, which means the Cloud
+      Topology feature of Landscape was not available (LP: #614493).
+
+ -- Andreas Hasenack <[e-mail]>  Wed, 08 Sep 2010 15:34:09 -0400
+
+landscape-client (1.5.4-0ubuntu0.10.10.0) maverick; urgency=low
+
+  * New upstream version (LP: #610744):
+
+    - The Eucalyptus management plugin reports the output of the
+      'euca-describe-availability-zones verbose' command, which includes
+      information about the available instance types and the maximum
+      number of each instance type that the cloud can support (LP: #599338)
+
+    - Check if the package directory exists before trying to check the
+      package changer lock in the dbus-proxy. This fixes a bug when upgrading
+      a dbus-landscape which never registered (LP: #603514).
+
+    - Allow an LDS server to bootstrap new cloud instances with its own CA,
+      which is picked up by the client, written to a file on the instance, and
+      used in subsequent exchanges with the server (LP: #605079).
+
+    - Skip loopback interface when reporting device info (LP: #608314)
+
+    - Disable landscape-sysinfo when load is more than 1 (LP: #608278)
+
+ -- Free Ekanayaka <[e-mail]>  Wed, 28 Jul 2010 08:14:02 +0200
+
+landscape-client (1.5.2.1-0ubuntu0.10.10.0) maverick; urgency=low
+
+  * Include maverick in debian/rules substvars (LP: #596062)
+  * Filter duplicate network interfaces in get_active_interfaces (LP: #597000)
+
+ -- Free Ekanayaka <[e-mail]>  Mon, 28 Jun 2010 18:07:18 +0200
+
+landscape-client (1.5.2-0ubuntu0.10.10.0) maverick; urgency=low
+
+  * New upstream version (LP: #594594):
+    - A new includes information about active network devices and their
+      IP address in sysinfo output (LP: #272344).
+    - A new plugin collects information about network traffic (#LP :284662).
+    - Report information about which packages requested a reboot (LP: #538253).
+    - Fix breakage on Lucid AMIs having no ramdisk (LP: #574810).
+    - Migrate the inter-process communication system from DBus to Twisted AMP.
+
+ -- Free Ekanayaka <[e-mail]>  Wed, 16 Jun 2010 12:03:50 +0200
+
+landscape-client (1.5.0-0ubuntu0.10.04.1) lucid; urgency=low
+
+  * New upstream version
+    - Fix smart-update failing its very first run (LP: 562496)
+    - Depend on pythonX.Y-dbus and pythonX.Y-pycurl (LP: #563063)
+
+ -- Free Ekanayaka <[e-mail]>  Wed, 21 Apr 2010 12:31:28 +0200
+
+landscape-client (1.5.0-0ubuntu0.10.04.0) lucid; urgency=low
+
+  * New upstream version (LP: #557244)
+    - Fix package-changer running before smart-update has completed (LP: #542215)
+    - Report the version of Eucalyptus used to generate topology data (LP: #554007)
+    - Enable the Eucalyptus plugin by default, if supported (LP: #546531)
+    - Use a whitelist of allowed filesystem types to instead of a blacklist (LP: #351927)
+    - Report the update-manager logs to the server (LP: #503384)
+    - Turn off Curl's DNS caching for requests. (LP: #522688)
+
+ -- Free Ekanayaka <[e-mail]>  Wed, 07 Apr 2010 16:27:45 +0200
+
+landscape-client (1.4.4-0ubuntu0.10.04.0) lucid; urgency=low
+
+  * New upstream release (LP: #519200):
+    - Add a message for creating package locks (LP: #514334)
+    - Add support for auto-approved change-packages messages (LP: #517175)
+    - Add support for installing server-generated debian packages (LP: #509752)
+    - Add support for reporting Eucalyptus topology information (LP: #518501)
+    - Fix timeout while inserting large free-space message (LP: #218388)
+    - Fix wrong log path in motd (LP: #517454)
+    - Fix race condition in process excecution (LP: #517453)
+
+ -- Free Ekanayaka <[e-mail]>  Sat, 16 Jan 2010 14:11:32 +0100
+
+landscape-client (1.4.0-0ubuntu0.9.10.0) lucid; urgency=low
+
+  * New upstream release with several bug fixes:
+    - Fix landscape daemons fail to start when too many groups are
+      available (LP: #456124)
+    - Fix landscape programs wake up far too much. (LP: #340843)
+    - Fix Package manager fails with 'no such table: task' (LP #465846)
+    - Fix test suite leaving temporary files around (LP #476418)
+
+  * Add support for Ubuntu release upgrades:
+    - Add helper function to fetch many files at once (LP: #450629)
+    - Handle release-upgrade messages in the packagemanager
+      plugin (LP: #455217)
+    - Add a release-upgrader task handler (LP: #462543)
+    - Support upgrade-tool environment variables (LP: #463321)
+
+  * Add initial support for Smart package locking:
+    - Detect and report changes about Smart package locks (#488108)
+
+ -- Free Ekanayaka <[e-mail]>  Tue, 01 Dec 2009 09:16:26 +0100
+
+landscape-client (1.3.2.4-0ubuntu0.9.10.0) karmic; urgency=low
+
+  * New upstream release:
+    - Catch import errors in the landscape-sysinfo script to prevent
+      errors when landscape-sysinfo is run to update the motd during
+      upgrade (LP: #349996)
+    - Fix a long-standing bug in the client which causes resynchronisations
+      on the server (LP: #144475)
+    - When downloading hash-id stores, pass possible custom SSL certificates
+      to the fetch fuction (LP: #435887)
+    - Handle unicode username in custom graphs, and also report missing user
+      to the server properly (LP: #406388)
+    - Handle a SQlite bug when creating package store database, by making an
+      extra query to flush the table cache (LP: #416629)
+
+ -- Free Ekanayaka <[e-mail]>  Fri, 09 Oct 2009 18:21:24 +0200
+
+landscape-client (1.3.2.3-0ubuntu0.9.10.0) karmic; urgency=low
+
+  * New upstream release:
+    - Don't clear the hash_id_requests table upon resynchronize (LP #417122)
+
+ -- Free Ekanayaka <[e-mail]>  Wed, 26 Aug 2009 15:16:59 +0200
+
+landscape-client (1.3.2.2-0ubuntu0.9.10.3) karmic; urgency=low
+
+  * Drop unsed dependency on libcurl3 and explicitly depend on
+    libcurl3-gnutls (>= 7.15.1-1ubuntu3) on dapper (LP: #406885)
+  * Add missing debian/landscape-common.config (LP: #410378)
+
+ -- Free Ekanayaka <[e-mail]>  Thu, 30 Jul 2009 15:16:07 +0200
+
+landscape-client (1.3.2.2-0ubuntu0.9.10.2) karmic; urgency=low
+
+  * debian/control: dropping python-pysqlite2 dependency, since this
+    package is in universe, and python now has built-in sqlite support,
+    LP: #406641
+
+ -- Dustin Kirkland <[e-mail]>  Wed, 29 Jul 2009 17:33:47 -0500
+
+landscape-client (1.3.2.2-0ubuntu0.9.10.1) karmic; urgency=low
+
+  [ Free Ekanayaka ]
+  * New upstream release:
+    - Include the README file in landscape-client (LP: #396260)
+    - Fix client capturing stderr from run_command when constructing
+      hash-id-databases url (LP: #397480)
+    - Use substvars to conditionally depend on update-motd or
+      libpam-modules (LP: #393454)
+    - Fix reporting wrong version to the server (LP: #391225)
+    - The init script does not wait for the network to be available
+      before checking for EC2 user data (LP: #383336)
+    - When the broker is restarted by the watchdog, the state of the client
+      is inconsistent (LP: #380633)
+    - Package stays unknown forever in the client with hash-id-databases
+      support (LP: #381356)
+    - Standard error not captured when calling smart-update (LP: #387441)
+    - Changer calls reporter without switching groups, just user (LP: #388092)
+    - Run smart update in the package-reporter instead of having a cronjob (LP: #362355)
+    - Package changer does not inherit proxy settings (LP: #381241)
+    - The ./test script doesn't work in landscape-client (LP: #381613)
+    - The source package should build on all supported releases (LP: #385098)
+    - Strip smart update's output (LP: #387331)
+    - The fetch() timeout isn't based on activity (#389224)
+    - Client can use a UUID of "None" when fetching the hash-id-database (LP: #381291)
+    - Registration should use the fqdn rather than just the hostname (LP: #385730)
+
+ -- Mathias Gug <[e-mail]>  Wed, 22 Jul 2009 14:54:50 -0400
+
+landscape-client (1.0.29.1-0ubuntu0.9.04.1) karmic; urgency=low
+
+  * debian/control: depend on libpam-modules, rather than update-motd
+
+ -- Dustin Kirkland <[e-mail]>  Thu, 16 Jul 2009 11:36:27 -0500
+
+landscape-client (1.0.29.1-0ubuntu0.9.04.0) jaunty; urgency=low
+
+  * Apply a fix for segfault bug involving curl timeouts. (LP: #360510)
+
+ -- Christopher Armstrong <[e-mail]>  Mon, 13 Apr 2009 14:33:31 -0400
+
+landscape-client (1.0.29-0ubuntu0.9.04.0) jaunty; urgency=low
+
+  * New upstream bugfix release (LP: #358744)
+    - Add a timeout to HTTP operations to avoid hanging (LP: #349737)
+    - Clean up environment variables on startup to avoid propagating
+      variables that will corrupt package installation (LP: #348681)
+    - Clean up FDs on startup for the same reason (LP: #352458)
+    - Catch and handle certain errors from smart (such as invalid package
+      data) to avoid "stuck" Landscape activities (LP: #268745)
+    - Don't print warnings meant for developers to the console (LP: #336669)
+
+ -- Christopher Armstrong <[e-mail]>  Thu, 09 Apr 2009 17:09:50 -0400
+
+landscape-client (1.0.28-0ubuntu1.9.04.0) jaunty; urgency=low
+
+  * Fix minor packaging issues in last release (LP: #343954)
+    - Version number in landscape.VERSION is now correct
+    - Fixed package version number to maintain convention
+  * The following changes are in the 1.0.28 release:
+    - Invalidate package cache when server UUID changes (LP: #339948)
+    - Improve the "cloud mode" introduced in 1.0.26 to send more
+      disambiguation data (LP: #343942) and allow the EC2 user data to specify
+      the exchange and ping URLs (LP: #343947)
+    - Allow importing of initial configurations (along with public SSL
+      certificates) when running landscape-config (LP: #341705)
+    - Support a non-root mode which allows running the client without the
+      management functionality (LP: #82159)
+    - Automatic cloud registration when there's no user-data to specify an OTP
+      now works (LP: #344323)
+
+ -- Christopher Armstrong <[e-mail]>  Thu, 19 Mar 2009 09:52:03 -0400
+
+landscape-client (1.0.28-0ubuntu1) jaunty; urgency=low
+
+  * New upstream release. (LP: #343954)
+
+ -- Martin Pitt <[e-mail]>  Wed, 18 Mar 2009 20:42:05 +0100
+
+landscape-client (1.0.26.1-0ubuntu0.9.04) jaunty; urgency=low
+
+  * Build for python2.6, include the symlinks in the package.
+
+ -- Matthias Klose <[e-mail]>  Wed, 25 Feb 2009 12:03:23 +0000
+
+landscape-client (1.0.26-0ubuntu0.9.04) jaunty; urgency=low
+
+  * New upstream release (LP: #328151)
+
+ -- Christopher Armstrong <[e-mail]>  Wed, 11 Feb 2009 17:00:54 +0000
+
+landscape-client (1.0.25-0ubuntu0.9.04) jaunty; urgency=low
+
+  * New upstream release supporting custom graphs (LP: #306360)
+    - Multiple custom graphs can be used at the same time (LP: #307314)
+    - PATH is now set for scripts in script execution (LP: #257018)
+  * debian/landscape-common.postinst: Only chown parts of /var/lib/landscape
+    because we now store files in it that should maintain their ownership
+    (LP: #307321).
+  * debian/landscape-client.postinst: Work around chfn/system user problem
+    by not specifying a --gecos (LP: #238755)
+  * debian/landscape-client.logrotate: logrotate no longer reports spurious
+    errors when the client isn't running (LP: #271767)
+
+ -- Christopher Armstrong <[e-mail]>  Thu, 11 Dec 2008 17:11:08 -0800
+
+landscape-client (1.0.23-0ubuntu0.8.10.1) intrepid; urgency=low
+
+  * debian/control: Update Replaces to < 1.0.23-0ubuntu0.8.10 to correctly
+    replace newer unsplit versions of the landscape package (LP: #285030).
+
+ -- Christopher Armstrong <[e-mail]>  Fri, 17 Oct 2008 12:42:23 -0400
+
+landscape-client (1.0.23-0ubuntu0.8.10) intrepid; urgency=low
+
+  * New upstream release. (LP: #277658):
+    Changes since 1.0.21.1:
+    - Don't print duplicate warnings when / is nearing capacity in sysinfo
+      (LP: #260230).
+    - Slight change to link text in landscape-sysinfo.
+    - Don't crash badly when programs are run as the incorrect user
+      (LP: #268879).
+  * debian/changelog: New debian-version scheme including Ubuntu version. The
+    same upstream version is available for all supported releases.
+    (LP: #277682).
+  * debian/landscape-client.postrm: Delete log and data files upon purge
+    (LP: #121182).
+  * debian/landscape-common.postrm: Delete the sysinfo logs upon purge.
+
+ -- Christopher Armstrong <[e-mail]>  Thu, 09 Oct 2008 11:40:51 -0400
+
+landscape-client (1.0.21.1-0ubuntu2) intrepid; urgency=low
+
+  * debian/control: fix bzr url
+  * debian/landscape-sysinfo.wrapper: print a timestamp before the sysinfo
+    data to ensure appropriate context (LP: #270862)
+
+ -- Dustin Kirkland <[e-mail]>  Tue, 30 Sep 2008 17:13:18 -0500
+
+landscape-client (1.0.21.1-0ubuntu1) intrepid; urgency=low
+
+  * New upstream version: 
+    * Add ok-no-register option to landscape-config script to not fail if
+      dbus isn't started or landscape-client isn't running.
+    * lower timeout related to package management in landscape.
+  * debian/control: Depend on cron. 
+  * debian/landscape-client.postinst: use ok-no-register option so that the
+    postinst script doesn't fail when run from the installer. (LP: #274573).
+
+ -- Mathias Gug <[e-mail]>  Thu, 25 Sep 2008 17:54:00 -0400
+
+landscape-client (1.0.21-0ubuntu2) intrepid; urgency=low
+
+  * debian/rules: Install an hourly cron job to update smart package data.
+    Thanks to Christopher Armstrong (LP: #268765).
+  * debian/control:
+    - Move ${misc:Depends} to Depends.
+    - Add VCS-* headers.
+  * debian/landscape-client.postrm:
+    - remove /etc/default/landscape-client when the package is purged.
+
+ -- Mathias Gug <[e-mail]>  Tue, 23 Sep 2008 18:19:26 -0400
+
+landscape-client (1.0.21-0ubuntu1) intrepid; urgency=low
+
+  [ Christopher Armstrong ]
+  * New upstream release (LP: #271886):
+    - Bug fix release:
+    - Avoid the PotentialZombieWarning on landscape-client startup.
+     (LP: #257346)
+    - When run as root, read sysinfo configuration from /etc and and write
+      logs to /var/log instead of /root. (LP: #268560)
+    - Avoid ZeroDivisionErrors when /home is an autofs. (LP: #269634)
+    - Don't corrupt a pid file when trying to start the client when it's
+      already running. (LP: #269634)
+    - Remove the pid file when shutting down the client. (LP: #257081)
+
+  [ Mathias Gug ]
+  * debian/landscape-client.init: specify the pid file and use --startas
+    instead of --exec when starting landscape-client so that the init script
+    doesn't fail if landscape-client is already running.
+
+ -- Mathias Gug <[e-mail]>  Fri, 19 Sep 2008 17:28:08 -0400
+
+landscape-client (1.0.18-0ubuntu4) intrepid; urgency=low
+
+  [ Christopher Armstrong ]
+  * debian/landscape-common.postinst: Don't blow up when the landscape-sysinfo
+    symlinks already exist (LP: #270131)
+
+  [ Mathias Gug ]
+  * debian/landscape-common.postinst, debian/landscape-common.prerm: don't
+    call update-motd init script as it's no longer available in the
+    update-motd package. Call directly /usr/sbin/update-motd instead. 
+    (LP: #271854)
+
+ -- Mathias Gug <[e-mail]>  Thu, 18 Sep 2008 16:47:08 -0400
+
+landscape-client (1.0.18-0ubuntu3) intrepid; urgency=low
+
+  * debian/control: Add Replaces for landscape-common since
+    landscape-sysinfo has been moved from -client to -common.
+
+ -- Mathias Gug <[e-mail]>  Tue, 16 Sep 2008 17:16:50 -0400
+
+landscape-client (1.0.18-0ubuntu2) intrepid; urgency=low
+
+  [ Mathias Gug ]
+  * Split the package into two packages:
+    - landscape-common: has the python libraries and the landscape-sysinfo
+      command. A landscape account is not required to use this package.
+    - landscape-client: has all the binaries required to run the
+      landscape-client. Requires a landscape account.
+    - debian/control: 
+      + move some dependencies to landscape-client so that
+        landscape-common doesn't install unecessary packages in the 
+        default -server install.
+      + move python-gobject to a Pre-Depends so that landscape-config can
+        register the system during the postinst (LP: #268838).
+  * debian/control:
+    - depend on python-smartpm instead of smartpm-core.
+  * debian/landscape-client.postrm: delete /etc/landscape/client.conf when 
+    the package is purged.
+  * debian/landscape-client.postinst: remove sysinfo_in_motd debconf question
+    as it wasn't used.
+
+  [ Christopher Armstrong ]
+  * Fixes for (LP: #268352).
+    - scripts/landscape-sysinfo.wrapper: New script to run landscape-sysinfo
+      with leading whitespace.
+    - debian/rules: Install wrapper into /usr/share/landscape.
+    - debian/landscape-client.postinst: Link wrapper into place.
+
+ -- Mathias Gug <[e-mail]>  Mon, 15 Sep 2008 17:21:53 -0400
+
+landscape-client (1.0.18-0ubuntu1) intrepid; urgency=low
+
+  * New upstream release 
+
+ -- Rick Clark <[e-mail]>  Mon, 08 Sep 2008 16:35:57 -0500
+
+landscape-client (1.0.17-0ubuntu1) intrepid; urgency=low
+
+  [ Dustin Kirkland and Rick Clark ]
+  * debian/compat: updated to 6.
+  * debian/config: initial debconf config.
+  * debian/control: reformatted depends and changed smartpm-core version;
+    changed Standards-Version to 3.8.0; added adduser to depends as needed by
+    postinst and postrm; updates smartpm-core dep to >1.0; moved most build
+    deps to Build-Depends-Indep; add po-debconf build dependency; added
+    debconf hooks for installing landscape-sysinfo as an update-motd or
+    profile.d script.
+  * debian/copyright: updated copyright date; removed incorrect symlink to
+    GPL-3; added Dustin and Rick to the packaging credits.
+  * debian/landscape-client.init: removed S from stop; rewritten to be more
+    lsb/Debian compliant; added status action; fixed whitespacing
+    inconsistency; use $NAME whenever possible; comment why we're not using
+    status_of_proc().
+  * debian/landscape-client.lintian-overrides: added with two overrides
+  * debian/landscape-client.overrides: removed.
+  * debian/landscape-client.prerm: initial creation, remove landscape-sysinfo
+    update-motd or profile.d script, if any exists.
+  * debian/landscape-client.postinst: fixed deprecated chmod call; changed
+    home dir of landscape user; removed uneeded update-rc.d; added code to
+    handle debconf; created a function for retrieving values from ini config;
+    /usr/share/debconf/comfmodule to top of postinst; add db_stop back in.
+  * debian/landscape-client.postrm: added debhelper tag.
+  * debian/rules: added po debconf bits for translation; depend on update-motd.
+  * debian/pycompat: initial creation.
+  * debian/po/POTFILES.in, debian/po/templates.pot: initial creation.
+  * man/txt2man, man/*.txt: removed; manpages should *really* be in native
+    format.
+  * man/landscape-client.1, man/landscape-config.1, man/landscape-message.1:
+    manpages in roff format, initially created by txt2man, some minor tweaks
+    to the title and such.
+
+  [ Gustavo Niemeyer ]
+  * New Upstream release
+  * Fix copyright dates in debian/copyright
+  * fix the chown call to use a colon
+  * Fixed missing $PACKAGES variable in postinst
+  * Implemented support for configuration the computer title via debconf
+
+  [ Kees Cook ]
+  * removed unused debian/autoppa-switch.
+  * fixed debian/landscape-client.init to run log_end_msg in the right place.
+  * debian/landscape-client.postrm: rewrote to allow debhelper to do its
+    job, fixed deluser call.
+  * debian/landscape-client.postinst: rewrote to allow debhelper to do its
+    job, fixed use of adduser.
+  * debian/rules: use "install" instead of "cp", dropped lintian overrides.
+  * debian/changelog: drop redundant changelog entries.
+
+  [ Rick Clark ]
+  * removed .override file
+  * removed .autoppa files
+
+ -- Dustin Kirkland <[e-mail]>  Thu, 04 Sep 2008 13:28:14 -0500
+
+landscape-client (1.0.16-intrepid1-landscape1) intrepid; urgency=low
+
+  * landscape-config can now be run in a non-interactive mode
+
+ -- Andreas Hasenack <[e-mail]>  Fri, 8 Aug 2008 14:34:43 +0000
+
+landscape-client (1.0.15-intrepid1-landscape1) intrepid; urgency=low
+
+  * introduce a basic landscape-sysinfo tool
+  * properly report a script execution error if its exit status is not
+    zero
+
+ -- Andreas Hasenack <[e-mail]>  Thu, 7 Aug 2008 18:33:41 +0000
+
+landscape-client (1.0.14-intrepid1-landscape1) intrepid; urgency=low
+
+  * fixed some dbus errors in some of the supported distributions
+  * added restart/shutdown plugin
+  * scripts can now have accented characters in them
+
+ -- Andreas Hasenack <[e-mail]>  Thu, 24 Jul 2008 13:06:34 +0000
+
+landscape-client (1.0.13-hardy1-landscape1) hardy; urgency=low
+
+  * the timestamp in the error message from processkiller.py is now
+    formatted properly
+  * the process list sent to the server was only being updated for new
+    processes, and not when existing processes changed
+  * in script execution, a timeout error is now reported with a proper
+    error message instead of just a generic failure in the script
+
+ -- Andreas Hasenack <[e-mail]>  Thu, 10 Jul 2008 14:24:15 +0000
+
+landscape-client (1.0.12-hardy1-landscape1) hardy; urgency=low
+
+  * the sleep average value of a process is no longer provided by recent
+    kernels. The client now computes and sends the CPU usage instead.
+  * initial directory for script execution is now the target user's home
+    directory and, if that is unavailable, /. Previously it was /root.
+  * new user creation was ignoring some extra fields such as Location and
+    phone numbers
+  * the machine uptime was incorrectly reported after a logrotate run and if
+    there was no reboot afterwards. This affected the process listing page in
+    the web interface, where processes would show up as having been started
+    around 1970.
+
+ -- Andreas Hasenack <[e-mail]>  Thu, 26 Jun 2008 16:17:59 +0000
+
+landscape-client (1.0.11-hardy1-landscape1) hardy; urgency=low
+
+  * fixed a regression where an important fix was missing from the
+    new staging branch
+
+ -- Andreas Hasenack <[e-mail]>  Fri, 13 Jun 2008 14:45:08 +0000
+
+landscape-client (1.0.10-hardy1-landscape1) hardy; urgency=low
+
+  * Change the utilisation of the csv module to be compatible with 
+    python 2.4 as used in Dapper.
+
+ -- Andreas Hasenack <[e-mail]>  Thu, 12 Jun 2008 17:58:05 +0000
+
+landscape-client (1.0.9-hardy1-landscape1) hardy; urgency=low
+
+  * restrict users and groups list to local ones only, i.e., /etc/passwd
+    and /etc/group
+  * fixed some tests that were failing in locales other than english
+
+ -- Andreas Hasenack <[e-mail]>  Wed, 11 Jun 2008 15:16:12 +0000
+
+landscape-client (1.0.4-hardy1-landscape1) hardy; urgency=low
+
+  * fixed permissions and ownership of some files and directories which could
+    prevent package data from being uploaded to the Landscape server
+  * fixed a problem where the root user password could not be changed
+  * the watchdog.log log file is now also rotated
+
+ -- Andreas Hasenack <[e-mail]>  Wed, 16 Apr 2008 17:21:20 +0000
+
+landscape-client (1.0-hardy1-landscape4) hardy; urgency=low
+
+  * Memory consumption has is improved.  The client's functionality is
+    now broken up into a number of sub-processes.  Functionality that
+    would previously use or leak memory, such as package management,
+    run in independent processes that exit when they complete so the
+    OS can reclaim the memory.
+  * Security is improved with this design.  Monitoring plugins run as
+    the unpriviledged landscape user while management functions run as
+    root.
+  * Secure inter-process communication occurs over DBUS.
+
+ -- Michel Pelletier <[e-mail]>  Wed, 27 Feb 2008 22:57:21 +0000
+
+landscape-client (0.17.0-hardy1-landscape1) hardy; urgency=low
+
+  * The client now reports the primary group for users.  I can also
+    modify it when requested by the server (#122212).
+
+ -- Jamshed Kakar <[e-mail]>  Wed, 21 Nov 2007 19:14:29 +0000
+
+landscape-client (0.16.0-hardy1-landscape1) hardy; urgency=low
+
+  * The client no longer schedules an urgent exchange if it detects
+    that the server has not processed any messages in its most recent
+    exchange (#138135).
+  * The total number of pending messages are sent to the server to
+    make it possible to generate backlog statistics (#162733).
+
+ -- Jamshed Kakar <[e-mail]>  Wed, 14 Nov 2007 23:09:58 +0000
+
+landscape-client (0.15.0-gutsy1-landscape1) gutsy; urgency=low
+
+  * Support for http_proxy and https_proxy variables in the
+    configuration file and in the interactive setup, as well as
+    --http-proxy and --https-proxy parameters is available (#151690).
+  * The client gracefully fails when unknown request-ids for
+    package-related operations are received (#151085).
+  * Child devices that have been removed are not reported when one of
+    their ancestors is also reported for deletion by the hardware
+    inventory plugin (#136497).
+
+ -- Jamshed Kakar <[e-mail]>  Fri, 26 Oct 2007 23:23:20 +0000
+
+landscape-client (0.14.0-gutsy1-landscape1) gutsy; urgency=low
+
+  * Failures that would occur is a user wasn't in the shadow file are
+    fixed (#102071).
+  * Whitespace surrounding process command-line names is removed
+    before they are reported to the server (#149112).
+  * Test failures, some related to DBUS on gutsy, are fixed.
+
+ -- Jamshed Kakar <[e-mail]>  Thu, 25 Oct 2007 00:03:06 +0000
+
+landscape-client (0.13.0-gutsy1-landscape1) gutsy; urgency=low
+
+  * When unknown package IDs are sent by the server message handling
+    is postponed until the client is aware of the unknown IDs
+    (#128796).
+
+ -- Jamshed Kakar <[e-mail]>  Wed, 17 Oct 2007 17:36:11 +0000
+
+landscape-client (0.12.2-gutsy1-landscape1) gutsy; urgency=low
+
+  * The client now reports it's version correctly.
+
+ -- Jamshed Kakar <[e-mail]>  Thu, 11 Oct 2007 21:32:24 +0000
+
+landscape-client (0.12.1-gutsy1-landscape1) gutsy; urgency=low
+
+  * A critical bug that would break configure-landscape is fixed.
+
+ -- Jamshed Kakar <[e-mail]>  Tue, 9 Oct 2007 21:10:02 +0000
+
+landscape-client (0.12.0-gutsy1-landscape7) gutsy; urgency=low
+
+  * Fixed typo in version string.
+
+ -- Jamshed Kakar <[e-mail]>  Sat, 6 Oct 2007 00:49:10 +0000
+
+landscape-client (0.12.0-gutsy1-landscape6) gutsy; urgency=low
+
+  * Updated Depends to require new smartpm-core 0.52 packages.
+
+ -- Jamshed Kakar <[e-mail]>  Fri, 5 Oct 2007 23:23:17 +0000
+
+landscape-client (0.12.0-gutsy1-landscape5) gutsy; urgency=low
+
+  * No upstream changes.  New package build.
+
+ -- Jamshed Kakar <[e-mail]>  Thu, 4 Oct 2007 22:35:50 +0000
+
+landscape-client (0.12.0-gutsy1-landscape4) gutsy; urgency=low
+
+  * Updated package requires current version of smartpm-core.
+
+ -- Jamshed Kakar <[e-mail]>  Tue, 2 Oct 2007 21:37:56 +0000
+
+landscape-client (0.11.0-gutsy1-landscape1) gutsy; urgency=low
+
+  * The full command name for a process, where retrievable, is
+    reported to the server instead of just the first 16 characters
+    (#131878).
+  * The historic process plugin, unused for months, has been removed
+    (#134122).
+  * A new landscape-message command-line program is available.  It
+    allows administrators to send messages from a console that end up
+    in the account history (#125083).
+  * The landscape-client.log file is now logrotated regularly
+    (#78494).
+
+ -- Jamshed Kakar <[e-mail]>  Thu, 13 Sep 2007 00:05:43 +0000
+
+landscape-client (0.10.15-gutsy1-landscape1) gutsy; urgency=low
+
+  * THIS IS A TEST BUILD!
+  * The full command name, where retrievable, is reported to the
+    server instead of just the first 16 characters (#131878).
+  * The historic process plugin, unused for months, has been removed
+    (#134122).
+  * A new landscape-message command-line program is available.  It
+    allows administrators to send messages from a console that end up
+    in the account history (#125083).
+  * The landscape-client.log file is now logrotated regularly
+    (#78494).
+
+ -- Jamshed Kakar <[e-mail]>  Wed, 12 Sep 2007 22:48:19 +0000
+
+landscape-client (0.10.12-1ubuntu1) feisty; urgency=low
+
+  * New upstream release.
+  * Package Depends updated to use new smartpm-0.51-landscape4
+    package.  This makes the package installable on Ubuntu systems
+    with only the main repository enabled.
+
+ -- Landscape Team <[e-mail]>  Tue, 7 Aug 2007 16:08:00 -0700
+
+landscape-client (0.10.11-1ubuntu1) feisty; urgency=low
+
+  * New upstream release.
+  * A bug related to package dependency reporting that would cause two
+    approvals for and upgrade package request has been fixed.
+  * Errors with the ping server are logged clearly now.
+  * A crashing postinit-related bug is fixed.
+
+ -- Landscape Team <[e-mail]>  Fri, 3 Aug 2007 19:15:00 -0700
+
+landscape-client (0.10.10-1ubuntu1) feisty; urgency=low
+
+  * New upstream release.
+  * CA certificates are no longer hard-coded.  The default set of CAs
+    in the system are used instead.
+  * The client connects to the server immediately when it detects
+    changes in packages and users.  This dramatically reduces the
+    turn-around time of some operations.
+  * The new user and group change detection reports detailed
+    information to the server about changes made external to the
+    client, such as by local users.
+  * The client reports detailed information about the outcome of user
+    and group operations.
+  * The client has support for a new synchronization system.  If
+    either the server or client detect inconsistencies in the data
+    they have they can request a synchronization to get back in sync.
+  * The client has support to calculate and report package upgrades.
+  * The hostname is reported when clients first register with the
+    server.
+  * A new configure-landscape script eases registration including
+    automated and interactive registration modes.
+  * The client includes VM size and sleep average in active process
+    data.
+
+ -- Landscape Team <[e-mail]>  Thu, 28 Jun 2007 16:19:00 -0700
+
+landscape-client (0.10.9-1ubuntu1) feisty; urgency=low
+
+  * New upstream release.
+  * Package depends on python-gdbm to install correctly on systems
+    without it.
+
+ -- Landscape Team <[e-mail]>  Fri, 8 Jun 2007 11:02:00 -0700
+
+landscape-client (0.10.8-1ubuntu1) feisty; urgency=low
+
+  * New upstream release.
+  * The changes that included the new configure-landscape helper
+    script have been removed.  They were not quite ready for release.
+  * Added python-twisted-web to Debian package Depends to satisfy
+    dependencies introduced by the new ping plugin.
+
+ -- Landscape Team <[e-mail]>  Thu, 7 Jun 2007 11:03:00 -0700
+
+landscape-client (0.10.7-1ubuntu1) feisty; urgency=low
+
+  * New upstream release.
+  * Package depends on new smartpm-core package which installs
+    correctly on dapper.
+
+ -- Landscape Team <[e-mail]>  Wed, 6 Jun 2007 10:37:00 -0700
+
+landscape-client (0.10.6-1ubuntu1) feisty; urgency=low
+
+  * New upstream release.
+  * Mispelled smartpm-core version is fixed.
+
+ -- Landscape Team <[e-mail]>  Mon, 1 Jun 2007 10:48:00 -0700
+
+landscape-client (0.10.5-1ubuntu1) feisty; urgency=low
+
+  * New upstream release.
+  * Mismatched operation status codes are fixed.
+
+ -- Landscape Team <[e-mail]>  Thu, 31 May 2007 15:36:00 -0700
+
+landscape-client (0.10.4-1ubuntu1) feisty; urgency=low
+
+  * New upstream release.
+  * Links to a new version of smart with a fixed crontab entry.
+
+ -- Landscape Team <[e-mail]>  Tue, 22 May 2007 23:29:00 -0700
+
+landscape-client (0.10.3-1ubuntu1) feisty; urgency=low
+
+  * New upstream release.
+  * A bug related to bpickle conversions with float-point values is
+    fixed (#114829).
+
+ -- Landscape Team <[e-mail]>  Mon, 15 May 2007 16:31:00 -0700
+	
+landscape-client (0.10.2-1ubuntu1) feisty; urgency=low
+
+  * New upstream release.
+  * New package includes previously missing package management plugin.
+
+ -- Landscape Team <[e-mail]>  Fri, 11 May 2007 10:20:00 -0700
+
+landscape-client (0.10.1-1ubuntu1) feisty; urgency=low
+
+  * New upstream release.
+  * Minor fix in package management plugin timings.
+
+ -- Landscape Team <[e-mail]>  Thu, 10 May 2007 10:00:00 -0700
+	
+landscape-client (0.10.0-1ubuntu1) feisty; urgency=low
+
+  * New upstream release.
+  * Basic package management operations are now supported.  The client
+    reports package information to the server and can install and/or
+    remove packages.
+  * The client uses the new operations system.  Support for the now
+    unused action info system is gone.
+  * A minor bpickle bug was fixed.
+	
+ -- Jamshed Kakar <[e-mail]>  Mon, 7 May 2007 20:16:00 -0700
+	
+landscape-client (0.9.6-1ubuntu1) feisty; urgency=low
+
+  * New upstream release.
+  * Bugs related to the handling of DBus types are fixed on feisty.
+
+ -- Jamshed Kakar <[e-mail]>  Fri, 13 Apr 2007 18:06:10 -0700
+
+landscape-client (0.9.5-1ubuntu1) feisty; urgency=low
+
+  * New upstream release.
+  * Old-school and oddly formatted GECOS fields are handled correctly.
+
+ -- Jamshed Kakar <[e-mail]>  Thu, 30 Mar 2007 16:50:49 -0400
+
+landscape-client (0.9.4-1ubuntu1) feisty; urgency=low
+
+  * New upstream release.
+  * Change architecture to all.
+
+ -- Jamshed Kakar <[e-mail]>  Thu, 30 Mar 2007 12:46:23 -0400
+
+landscape-client (0.9.3-1ubuntu1) feisty; urgency=low
+
+  * New upstream release.
+  * Add override file.
+  * Bump application and package versions.
+
+ -- Jamshed Kakar <[e-mail]>  Thu, 29 Mar 2007 17:21:50 -0400
+
+landscape-client (0.9.2-1ubuntu1) feisty; urgency=low
+
+  * Bump debhelper version.
+  * Build-Depend on python-dev, lsb-release.
+  * Pre-Depend on debconf | debconf-2.0.
+  * Move ${python:Depends} to Depends.
+  * Make the packaging compatible with dapper and newer distro releases.
+
+ -- Matthias Klose <[e-mail]>  Wed, 28 Mar 2007 21:21:20 +0200
+
+landscape-client (0.9.2-1) unstable; urgency=low
+
+  * New upstream release.
+  * Really fixed package.
+
+ -- Jamshed Kakar <[e-mail]>  Tue, 21 Mar 2007 09:57:00 -0400
+
+landscape-client (0.9.1-3) unstable; urgency=low
+
+  * Really fixed package.
+
+ -- Jamshed Kakar <[e-mail]>  Tue, 20 Mar 2007 16:35:00 -0400
+
+landscape-client (0.9.1-2) unstable; urgency=low
+
+  * Fixed package.
+
+ -- Jamshed Kakar <[e-mail]>  Tue, 20 Mar 2007 16:25:00 -0400
+
+landscape-client (0.9.1-1) unstable; urgency=low
+
+  * New upstream release.
+  * bpickle encoding format has changed in a non-backwards compatible
+    way to fix float encoding-related problems.
+  * API version updated to 2.0.
+
+ -- Jamshed Kakar <[e-mail]>  Tue, 20 Mar 2007 15:06:17 -0400
+
+landscape-client (0.9.0-1) unstable; urgency=low
+
+  * New upstream release.
+  * Group-management related tasks such as add/remove member and
+    create group are now supported.
+  * Client reports hardware inventory information to the server.
+  * Unicode handling with regards to the passwd file is improved.
+
+ -- Jamshed Kakar <[e-mail]>  Fri, 9 Mar 2007 16:04:51 -0800
+
+landscape-client (0.8.1-1) unstable; urgency=low
+
+  * New upstream release.
+  * Account registration log message no longer exposes account
+    password.
+	
+ -- Jamshed Kakar <[e-mail]>  Thu, 18 Jan 2007 23:07:00 -0800
+
+landscape-client (0.8.0-1) unstable; urgency=low
+
+  * New upstream release.
+  * Process monitoring logic stops trying to restart the client if too
+    many restarts occur during a short period of time.
+  * Client includes an SSL certificate to verify the server with.
+  * Package depends on python2.4-pycurl, which is necessary for the
+    new SSL support.
+	
+ -- Jamshed Kakar <[e-mail]>  Thu, 18 Jan 2007 10:48:00 -0800
+
+landscape-client (0.7.0-1) unstable; urgency=low
+
+  * New upstream release.
+  * Client can daemonize itself and perform basic process monitoring.
+  * Client writes a useful log now.  Command-line options have been
+    added to control log verbosity.
+  * Package depends on perl-modules, which is necessary for bare-bones
+    server installs.
+	
+ -- Jamshed Kakar <[e-mail]>  Tue, 2 Jan 2007 12:54:00 -0800
+
+landscape-client (0.6.1-1) unstable; urgency=low
+
+  * User management plugin handles extra Ubuntu user fields.
+
+ -- Jamshed Kakar <[e-mail]>  Thu, 15 Dec 2006 10:22:00 -0800
+
+landscape-client (0.6.0-2) unstable; urgency=low
+
+  * Reverted to deprecated build rule to fix package breakage on
+    dapper.
+
+ -- Jamshed Kakar <[e-mail]>  Thu, 7 Dec 2006 10:54:00 -0800
+
+landscape-client (0.6.0-1) unstable; urgency=low
+
+  * New upstream release.
+  * The active-process-info plugin provides server-controllable
+    end/kill actions.
+  * Messages are no longer delivered twice if a broken message gets
+    into the message store.
+
+ -- Jamshed Kakar <[e-mail]>  Wed, 6 Dec 2006 14:47:00 -0800
+
+landscape-client (0.5.0-1) unstable; urgency=low
+
+  * New upstream release.
+  * Client-to-server exchanges now happen in a thread to avoid
+    blocking monitoring plugins.
+  * Problems that caused slow client registration have been fixed.
+  * The computer-info plugin now reports information about the
+    distribution installed on a machine.
+
+ -- Jamshed Kakar <[e-mail]>  Fri, 10 Nov 2006 12:47:00 -0800
+
+landscape-client (0.4.0-1) unstable; urgency=low
+
+  * New upstream release.
+  * Disk, load, memory/swap and temperature data is now reported at
+    300s-aligned intervals.
+  * Improvements to registration system.
+  * Improvements to plugin infrastructure.
+
+ -- Jamshed Kakar <[e-mail]>  Fri, 13 Oct 2006 09:25:00 -0300
+
+landscape-client (0.3.0-1) unstable; urgency=low
+
+  * New upstream release.
+  * Major reorganization of client code.
+
+ -- Christopher Armstrong <[e-mail]>  Tue, 22 Aug 2006 09:56:00 -0400
+
+landscape-client (0.2.5-1) unstable; urgency=low
+
+  * New upstream release.
+  * Fix a bug in the newly introduced client upgrade machinery.
+
+ -- Christopher Armstrong <[e-mail]>  Wed, 4 Aug 2006 10:45:00 -0500
+
+landscape-client (0.2.4-1) unstable; urgency=low
+
+  * New upstream release.
+  * User management should now be working.
+
+ -- Christopher Armstrong <[e-mail]>  Wed, 3 Aug 2006 15:12:00 -0500
+
+landscape-client (0.2.3-1) unstable; urgency=low
+
+  * New upstream release.
+  * Fixed a bug in the init script preventing landscape-client from
+    starting after reboots.
+
+ -- Christopher Armstrong <[e-mail]>  Wed, 26 Jul 2006 15:47:00 -0500
+
+landscape-client (0.2.2-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Christopher Armstrong <[e-mail]>  Thu, 6 Jul 2006 18:38:00 -0500
+
+landscape-client (0.2.1-1) unstable; urgency=low
+
+  * Added support for debconf.
+
+ -- Gustavo Niemeyer <[e-mail]>  Wed, 5 Jul 2006 14:13:25 -0300
+
+landscape-client (0.2.0-1) unstable; urgency=low
+
+  * Initial (internal) release.
+
+ -- Christopher Armstrong <[e-mail]>  Wed, 28 Jun 2006 14:32:30 -0500
+
+landscape-client (0.1) dapper; urgency=low
+
+  * Empty placeholder package
+
+ -- Matt Zimmerman <[e-mail]>  Fri, 26 May 2006 06:37:55 -0700

=== added file 'debian/cloud-default.conf'
--- debian/cloud-default.conf	1970-01-01 00:00:00 +0000
+++ debian/cloud-default.conf	2012-04-22 14:14:27 +0000
@@ -0,0 +1,7 @@
+[client]
+cloud = True
+url = https://landscape.canonical.com/message-system
+data_path = /var/lib/landscape/client
+ping_url = http://landscape.canonical.com/ping
+include_manager_plugins = ScriptExecution
+script_users = ALL

=== added file 'debian/compat'
--- debian/compat	1970-01-01 00:00:00 +0000
+++ debian/compat	2012-04-22 14:14:27 +0000
@@ -0,0 +1,1 @@
+5

=== added file 'debian/control'
--- debian/control	1970-01-01 00:00:00 +0000
+++ debian/control	2012-04-22 14:14:27 +0000
@@ -0,0 +1,76 @@
+Source: landscape-client
+Section: admin
+Priority: optional
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Landscape Team <[e-mail]>
+Build-Depends: debhelper (>= 5), po-debconf, python-dev, lsb-release, gawk, python-twisted-core, python-distutils-extra
+Standards-Version: 3.8.0
+XS-Python-Version: >= 2.4, << 2.8
+
+Package: landscape-common
+Architecture: any
+Depends: ${python:Depends}, ${misc:Depends}, ${extra:Depends},
+         python-gnupginterface,
+         python-twisted-core,
+         python-apt,
+         ca-certificates,
+         python-gdbm,
+         lsb-release,
+         lsb-base,
+         adduser,
+         bc,
+         lshw
+Suggests: ${extra:Suggests}
+Replaces: landscape-client (<= 1.0.23-0ubuntu0.8.10)
+Description: The Landscape administration system client - Common files
+ Landscape is a web-based tool for managing Ubuntu systems. This
+ package is necessary if you want your machine to be managed in a
+ Landscape account.
+ .
+ This package provides the core libraries.
+XB-Python-Version: ${python:Versions}
+
+Package: landscape-client
+Architecture: any
+Depends: ${python:Depends}, ${misc:Depends}, ${extra:Depends},
+         python-twisted-web,
+         python-twisted-names,
+         landscape-common (>= ${Source-Version})
+Suggests: ${extra:Suggests}
+Description: The Landscape administration system client
+ Landscape is a web-based tool for managing Ubuntu systems. This
+ package is necessary if you want your machine to be managed in a
+ Landscape account.
+ .
+ This package provides the Landscape client and requires a Landscape account.
+XB-Python-Version: ${python:Versions}
+
+Package: landscape-client-ui
+Architecture: any
+Depends: ${python:Depends}, ${misc:Depends},
+         landscape-client (>= ${Source-Version}),
+         landscape-client-ui-install (>= ${Source-Version}),
+         python-gi,
+         python-dbus,
+         policykit-1,
+         gir1.2-notify-0.7,
+         gir1.2-gtk-3.0
+Description: The Landscape administration system client - UI configuration
+ Landscape is a web-based tool for managing Ubuntu systems.
+ .
+ This package provides the Landscape client configuration UI.
+XB-Python-Version: ${python:Versions}
+
+Package: landscape-client-ui-install
+Architecture: any
+Depends: ${python:Depends}, ${misc:Depends},
+         python-gi,
+         python-dbus,
+         policykit-1,
+         gir1.2-gtk-3.0,
+         python-aptdaemon.gtk3widgets
+Description: The Landscape administration system client - UI installer
+ Landscape is a web-based tool for managing Ubuntu systems.
+ .
+ This package provides an automatic installer for landscape-client-ui.
+XB-Python-Version: ${python:Versions}

=== added file 'debian/copyright'
--- debian/copyright	1970-01-01 00:00:00 +0000
+++ debian/copyright	2012-04-22 14:14:27 +0000
@@ -0,0 +1,36 @@
+This package was debianized by
+ * Jamshed Kakar <[e-mail]> on Wed, 28 Jun 2006
+ * Rick Clark <[e-mail]> in Aug 2008
+ * Dustin Kirkland <[e-mail]> in Aug 2008
+
+   Copyright (C) 2006-2008 Canonical Ltd.
+
+License:
+
+Upstream source is located at: https://code.launchpad.net/landscape-client
+
+
+Copyright:
+
+The packaging of this software and the programs in this package are distributed
+under the terms of the GNU General Public License, version 2 as distributed by
+the Free Software Foundation.
+
+License:
+    Copyright (C) 2006-2008 Canonical Ltd.
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License version 2,
+    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 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, see <http://www.gnu.org/licenses/>.
+
+On Debian systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL-2'.
+

=== added file 'debian/landscape-client-ui-install.install'
--- debian/landscape-client-ui-install.install	1970-01-01 00:00:00 +0000
+++ debian/landscape-client-ui-install.install	2012-04-22 14:14:27 +0000
@@ -0,0 +1,4 @@
+usr/bin/landscape-client-ui-install
+usr/share/applications/landscape-client-settings.desktop
+usr/share/icons/hicolor/scalable/apps/preferences-management-service.svg
+usr/share/locale

=== added file 'debian/landscape-client-ui.install'
--- debian/landscape-client-ui.install	1970-01-01 00:00:00 +0000
+++ debian/landscape-client-ui.install	2012-04-22 14:14:27 +0000
@@ -0,0 +1,9 @@
+usr/bin/landscape-client-settings-mechanism
+usr/bin/landscape-client-registration-mechanism
+usr/bin/landscape-client-settings-ui
+usr/share/dbus-1/system-services/com.canonical.LandscapeClientSettings.service
+usr/share/dbus-1/system-services/com.canonical.LandscapeClientRegistration.service
+usr/share/polkit-1/actions/com.canonical.LandscapeClientSettings.policy
+etc/dbus-1/system.d/com.canonical.LandscapeClientSettings.conf
+etc/dbus-1/system.d/com.canonical.LandscapeClientRegistration.conf
+usr/share/glib-2.0/schemas/com.canonical.landscape-client-settings.gschema.xml

=== added file 'debian/landscape-client.config'
--- debian/landscape-client.config	1970-01-01 00:00:00 +0000
+++ debian/landscape-client.config	2012-04-22 14:14:27 +0000
@@ -0,0 +1,64 @@
+#!/bin/sh
+
+PACKAGE=landscape-client
+
+CONFIGFILE=/etc/landscape/client.conf
+set -e
+. /usr/share/debconf/confmodule
+
+var_in_file() {
+    var="$1"
+    file="$2"
+    line=$(grep "^$var\s*=\s*" "$file" 2>/dev/null || true)
+    echo "$line"
+}
+
+get_var_from_file() {
+    var="$1"
+    file="$2"
+    val=$(grep "^$var\s*=\s*" "$file" 2>/dev/null | tail -n1 | sed "s/^.*=\s*//")
+    echo "$val"
+}
+
+update_var() {
+    var="$1"
+    file="$2"
+    line=$(var_in_file $var $file)
+    if [ -n "$line" ]; then
+        val=$(get_var_from_file $var $file)
+        # Store value from config file in debconf.
+        db_set $PACKAGE/$var $val
+    fi
+}
+
+# Load config file, if it exists.
+if [ -e $CONFIGFILE ]; then
+    # Config file is "ini" type, not shell, so we cannot source it
+    # If a setting is defined in the config file, update it in debconf
+    # db.
+    update_var "computer_title" "$CONFIGFILE"
+    update_var "account_name" "$CONFIGFILE"
+    update_var "registration_password" "$CONFIGFILE"
+    update_var "url" "$CONFIGFILE"
+    update_var "exchange_interval" "$CONFIGFILE"
+    update_var "urgent_exchange_interval" "$CONFIGFILE"
+    update_var "ping_url" "$CONFIGFILE"
+    update_var "ping_interval" "$CONFIGFILE"
+    update_var "http_proxy" "$CONFIGFILE"
+    update_var "https_proxy" "$CONFIGFILE"
+    update_var "tags" "$CONFIGFILE"
+fi
+
+# Ask questions.
+# Do debconf configuration
+db_get $PACKAGE/register_system
+if [ "$RET" = true ]; then
+    priority=high
+else
+    priority=medium
+fi
+db_input "$priority" $PACKAGE/computer_title || true
+db_input "$priority" $PACKAGE/account_name || true
+db_input "$priority" $PACKAGE/registration_password || true
+
+db_go || true

=== added file 'debian/landscape-client.docs'
--- debian/landscape-client.docs	1970-01-01 00:00:00 +0000
+++ debian/landscape-client.docs	2012-04-22 14:14:27 +0000
@@ -0,0 +1,1 @@
+README

=== added file 'debian/landscape-client.init'
--- debian/landscape-client.init	1970-01-01 00:00:00 +0000
+++ debian/landscape-client.init	2012-04-22 14:14:27 +0000
@@ -0,0 +1,112 @@
+#!/bin/sh
+
+### BEGIN INIT INFO
+# Provides: landscape-client
+# Required-Start: $local_fs $remote_fs
+# Required-Stop: $local_fs $remote_fs
+# Default-Start: 2 3 4 5
+# Default-Stop: 0 1 6
+# Short-Description: Landscape client daemons
+# Description: The Landscape client daemons are needed so the
+#              Landscape server can manage a computer.
+### END INIT INFO
+
+LANDSCAPE_DEFAULTS=/etc/default/landscape-client
+NAME=landscape-client
+DAEMON=/usr/bin/$NAME
+PIDDIR=/var/run/landscape
+SOCKETDIR=/var/lib/landscape/client/sockets
+PIDFILE=$PIDDIR/$NAME.pid
+RUN=0 # overridden in /etc/default/landscape-client
+CLOUD=0 # overridden in /etc/default/landscape-client
+DAEMON_GROUP=landscape
+export PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
+
+[ -f $DAEMON ] || exit 0
+
+. /lib/lsb/init-functions
+[ -f $LANDSCAPE_DEFAULTS ] && . $LANDSCAPE_DEFAULTS
+
+check_config () {
+    # This $RUN check should match the semantics of
+    # l.sysvconfig.SysVConfig.is_configured_to_run.
+    if [ $RUN -eq 0 ]; then
+	    if [ $CLOUD -eq 1 ]; then
+		    if landscape-is-cloud-managed; then
+			    # Install the cloud default configuration file
+			    cp /usr/share/landscape/cloud-default.conf /etc/landscape/client.conf
+			    # Override default file for not going in this conditional again at
+			    # next startup
+			    sed -i "s/^RUN=.*/RUN=1/" $LANDSCAPE_DEFAULTS
+			    if ! grep -q "^RUN=" $LANDSCAPE_DEFAULTS; then
+				    echo "RUN=1" >> $LANDSCAPE_DEFAULTS
+			    fi
+		    else
+			    echo "$NAME is not configured, please run landscape-config."
+			    exit 0
+		    fi
+	    else
+		    echo "$NAME is not configured, please run landscape-config."
+		    exit 0
+	    fi
+    fi
+}
+
+case "$1" in
+	start)
+		check_config
+		log_daemon_msg "Starting the $NAME daemon"
+		if [ ! -e $PIDDIR ]; then
+			mkdir $PIDDIR
+			chown landscape $PIDDIR
+		fi
+		# Cleanup leftover sockets if there's no other landscape process
+		# running. This shouldn't be usually necessary, but it can
+		# happen in case the client crashed badly and the socket points
+		# to a process with the same PID.
+                if [ -d "${SOCKETDIR:?}" ]; then
+			if ! pidofproc -p "$PIDFILE" "$DAEMON" > /dev/null; then
+				find "${SOCKETDIR:?}" -maxdepth 1 -type s -print0 | xargs -r0 rm -f
+				find "${SOCKETDIR:?}" -maxdepth 1 -type l -print0 | xargs -r0 rm -f
+			fi
+		fi
+
+		FULL_COMMAND="start-stop-daemon --start --quiet --oknodo --startas $DAEMON --pidfile $PIDFILE -g $DAEMON_GROUP -- --daemon --pid-file $PIDFILE"
+		if [ x"$DAEMON_USER" != x ]; then
+			sudo -u $DAEMON_USER $FULL_COMMAND
+		else
+			$FULL_COMMAND
+		fi
+		log_end_msg $?
+		;;
+
+	stop)
+		log_daemon_msg "Stopping $NAME daemon"
+		start-stop-daemon --retry 30 --stop --quiet --pidfile $PIDFILE
+		log_end_msg $?
+		;;
+
+	status)
+		# We want to maintain backward compatibility with Dapper,
+		# so we're not going to use status_of_proc()
+		pidofproc -p $PIDFILE $DAEMON >/dev/null
+		status=$?
+		if [ $status -eq 0 ]; then
+			log_success_msg "$NAME is running"
+		else
+			log_failure_msg "$NAME is not running"
+		fi
+		exit $status
+		;;
+
+	restart|force-reload)
+		$0 stop && $0 start
+		;;
+
+	*)
+		echo "Usage: $0 {start|stop|status|restart|force-reload}"
+		exit 1
+		;;
+esac
+
+exit 0

=== added file 'debian/landscape-client.install'
--- debian/landscape-client.install	1970-01-01 00:00:00 +0000
+++ debian/landscape-client.install	2012-04-22 14:14:27 +0000
@@ -0,0 +1,14 @@
+usr/bin/landscape-broker
+usr/bin/landscape-client
+usr/bin/landscape-config
+usr/bin/landscape-manager
+usr/bin/landscape-message
+usr/bin/landscape-monitor
+usr/bin/landscape-package-changer
+usr/bin/landscape-package-reporter
+usr/bin/landscape-release-upgrader
+usr/bin/landscape-is-cloud-managed
+usr/bin/landscape-dbus-proxy
+usr/share/landscape/cloud-default.conf
+etc/dbus-1/system.d/landscape.conf
+usr/lib/landscape

=== added file 'debian/landscape-client.logrotate'
--- debian/landscape-client.logrotate	1970-01-01 00:00:00 +0000
+++ debian/landscape-client.logrotate	2012-04-22 14:14:27 +0000
@@ -0,0 +1,20 @@
+/var/log/landscape/watchdog.log /var/log/landscape/monitor.log /var/log/landscape/broker.log /var/log/landscape/manager.log {
+    weekly
+    rotate 4
+    missingok
+    notifempty
+    compress
+    nocreate
+    postrotate
+        [ -f /var/run/landscape/landscape-client.pid ] && kill -s USR1 `cat /var/run/landscape/landscape-client.pid` > /dev/null 2>&1 || :
+    endscript
+}
+
+/var/log/landscape/package-changer.log /var/log/landscape/package-reporter.log /var/log/landscape/sysinfo.log /var/log/landscape/release-upgrader.log {
+    weekly
+    rotate 4
+    missingok
+    notifempty
+    compress
+    nocreate
+}

=== added file 'debian/landscape-client.postinst'
--- debian/landscape-client.postinst	1970-01-01 00:00:00 +0000
+++ debian/landscape-client.postinst	2012-04-22 14:14:27 +0000
@@ -0,0 +1,150 @@
+#!/bin/sh
+set -e
+
+# summary of how this script can be called:
+#        * <postinst> `configure' <most-recently-configured-version>
+#        * <old-postinst> `abort-upgrade' <new version>
+#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
+#          <new-version>
+#        * <postinst> `abort-remove'
+#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
+#          <failed-install-package> <version> `removing'
+#          <conflicting-package> <version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+. /usr/share/debconf/confmodule
+trap "db_stop || true" EXIT HUP INT QUIT TERM
+
+PACKAGE=landscape-client
+
+# Use the default installed Python.  Running just "python" might run
+# something from /usr/local/bin, which doesn't necessarily support
+# running the landscape client.
+PYTHON=/usr/bin/python
+
+case "$1" in
+    configure)
+
+        CONFIG_FILE=/etc/landscape/client.conf
+        if [ ! -f $CONFIG_FILE ]; then
+            # Create new configuration, with private mode
+            TEMPFILE=$(mktemp -p /etc/landscape)
+            cat > $TEMPFILE <<END
+[client]
+log_level = info
+url = https://landscape.canonical.com/message-system
+ping_url = http://landscape.canonical.com/ping
+data_path = /var/lib/landscape/client
+END
+            chown landscape $TEMPFILE
+            mv $TEMPFILE $CONFIG_FILE
+
+            # Get configuration values from debconf
+            db_get $PACKAGE/computer_title
+            COMPUTER_TITLE="${RET}"
+            db_get $PACKAGE/account_name
+            ACCOUNT_NAME="${RET}"
+            db_get $PACKAGE/registration_password
+            REGISTRATION_PASSWORD="${RET}"
+            db_get $PACKAGE/url
+            URL="${RET}"
+            db_get $PACKAGE/exchange_interval
+            EXCHANGE_INTERVAL="${RET}"
+            db_get $PACKAGE/urgent_exchange_interval
+            URGENT_EXCHANGE_INTERVAL="${RET}"
+            db_get $PACKAGE/ping_url
+            PING_URL="${RET}"
+            db_get $PACKAGE/ping_interval
+            PING_INTERVAL="${RET}"
+            db_get $PACKAGE/http_proxy
+            HTTP_PROXY="${RET}"
+            db_get $PACKAGE/https_proxy
+            HTTPS_PROXY="${RET}"
+            db_get $PACKAGE/tags
+            TAGS="${RET}"
+
+            # If we got the needed information, actually do the registration.
+            if [ -n "$ACCOUNT_NAME" -a -n "$COMPUTER_TITLE" ]; then
+                landscape-config --silent --ok-no-register \
+                    --computer-title "$COMPUTER_TITLE" \
+                    --account-name "$ACCOUNT_NAME" \
+                    --registration-password "$REGISTRATION_PASSWORD" \
+                    --url "$URL" \
+                    --exchange-interval "$EXCHANGE_INTERVAL" \
+                    --urgent-exchange-interval "$URGENT_EXCHANGE_INTERVAL" \
+                    --ping-url "$PING_URL" \
+                    --ping-interval "$PING_INTERVAL" \
+                    --http-proxy "$HTTP_PROXY" \
+                    --https-proxy "$HTTPS_PROXY" \
+                    --tags "$TAGS"
+            fi
+        else
+            # Fix non-private permissions
+            chmod 0600 $CONFIG_FILE
+        fi
+
+        # old monolithic clients have a single persist data file and a single
+        # package hash db.  This data should be migrated to the new format
+        # where each service has a persist and the package data is kept in a
+        # sqlite database.
+
+        DATA_BPICKLE=$DATA_DIR/client/data.bpickle
+        BROKER_BPICKLE=$DATA_DIR/client/broker.bpickle
+
+        if [ -f $DATA_BPICKLE -a ! -f $BROKER_BPICKLE ]; then
+            $PYTHON -c "from landscape.upgraders import legacy; legacy.migrate_data_file('$DATA_DIR/client')"
+            mv $DATA_BPICKLE $DATA_BPICKLE.migrated
+            echo "Old monolithic client data file migrated to new format."
+        fi
+
+        # Remove statoverride for smart-update, if there's one
+        smart_update=/usr/lib/landscape/smart-update
+        if dpkg-statoverride --list $smart_update >/dev/null 2>&1; then
+            dpkg-statoverride --remove $smart_update
+        fi
+
+        # Add the setuid flag to apt-update, and make it be executable by
+        # users in the landscape group (that normally means landscape itself)
+        apt_update=/usr/lib/landscape/apt-update
+        if ! dpkg-statoverride --list $apt_update >/dev/null 2>&1; then
+            dpkg-statoverride --update --add root landscape 4754 $apt_update
+        fi
+
+        # Remove old cron jobs
+        old_cron_job=/etc/cron.hourly/landscape-client
+        if [ -e $old_cron_job ]; then
+            rm $old_cron_job
+        fi
+        very_old_cron_job=/etc/cron.hourly/smartpm-core
+        if [ -e $very_old_cron_job ]; then
+            rm $very_old_cron_job
+        fi
+
+        # Check if we're upgrading from a D-Bus version
+        if ! [ -z $2 ]; then
+            if dpkg --compare-versions $2 lt 1.5.1; then
+                # Launch a proxy service that will forward requests over DBus
+                # from the old package-changer to the new AMP-based broker. This
+                # is a one-off only needed for the DBus->AMP upgrade
+                start-stop-daemon -x /usr/bin/landscape-dbus-proxy -b -c landscape -u landscape -S
+            fi
+         fi
+
+    ;;
+
+    abort-upgrade|abort-remove|abort-deconfigure)
+    ;;
+
+    *)
+        echo "postinst called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0

=== added file 'debian/landscape-client.postrm'
--- debian/landscape-client.postrm	1970-01-01 00:00:00 +0000
+++ debian/landscape-client.postrm	2012-04-22 14:14:27 +0000
@@ -0,0 +1,50 @@
+#!/bin/sh
+set -e
+
+# summary of how this script can be called:
+#        * <postrm> `remove'
+#        * <postrm> `purge'
+#        * <old-postrm> `upgrade' <new-version>
+#        * <new-postrm> `failed-upgrade' <old-version>
+#        * <new-postrm> `abort-install'
+#        * <new-postrm> `abort-install' <old-version>
+#        * <new-postrm> `abort-upgrade' <old-version>
+#        * <disappearer's-postrm> `disappear' <overwriter>
+#          <overwriter-version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+case "$1" in
+    purge)
+    LOG_DIR=/var/log/landscape
+    DATA_DIR=/var/lib/landscape
+
+    rm -f "/etc/default/landscape-client"
+
+    rm -f "${LOG_DIR}/manager.log"*
+    rm -f "${LOG_DIR}/monitor.log"*
+    rm -f "${LOG_DIR}/broker.log"*
+    rm -f "${LOG_DIR}/watchdog.log"*
+    rm -f "${LOG_DIR}/package-reporter.log"*
+    rm -f "${LOG_DIR}/package-changer.log"*
+
+    rm -rf "${DATA_DIR}/client"
+    rm -rf "${DATA_DIR}/.gnupg"
+
+    ;;
+
+    remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
+    ;;
+
+    *)
+        echo "postrm called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0

=== added file 'debian/landscape-client.prerm'
--- debian/landscape-client.prerm	1970-01-01 00:00:00 +0000
+++ debian/landscape-client.prerm	2012-04-22 14:14:27 +0000
@@ -0,0 +1,45 @@
+#!/bin/sh
+# prerm script for landscape-client
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <prerm> `remove'
+#        * <old-prerm> `upgrade' <new-version>
+#        * <new-prerm> `failed-upgrade' <old-version>
+#        * <conflictor's-prerm> `remove' `in-favour' <package> <new-version>
+#        * <deconfigured's-prerm> `deconfigure' `in-favour'
+#          <package-being-installed> <version> `removing'
+#          <conflicting-package> <version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+
+case "$1" in
+    remove|upgrade|deconfigure)
+
+        # Remove statoverride for apt-update
+        apt_update=/usr/lib/landscape/apt-update
+        if dpkg-statoverride --list $apt_update >/dev/null 2>&1; then
+            dpkg-statoverride --remove $apt_update
+        fi
+
+    ;;
+
+    failed-upgrade)
+    ;;
+
+    *)
+        echo "prerm called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0

=== added file 'debian/landscape-client.templates'
--- debian/landscape-client.templates	1970-01-01 00:00:00 +0000
+++ debian/landscape-client.templates	2012-04-22 14:14:27 +0000
@@ -0,0 +1,77 @@
+Template: landscape-client/computer_title
+Type: string
+_Description: Computer Title:
+ Descriptive text to identify this computer uniquely in the
+ Landscape user interface.
+
+Template: landscape-client/account_name
+Type: string
+_Description: Account Name:
+ Short lowercase identifier of the Landscape account this computer
+ will be assigned.
+
+Template: landscape-client/registration_password
+Type: password
+_Description: Registration Password:
+ Client registration password for the given Landscape account.  Only
+ needed if the given account is requesting a client registration
+ password.
+
+Template: landscape-client/url
+Type: string
+Default: https://landscape.canonical.com/message-system
+_Description: Landscape Server URL:
+ The server URL to connect to.
+
+Template: landscape-client/exchange_interval
+Type: string
+Default: 900
+_Description: Message Exchange Interval:
+ Interval, in seconds, between normal message exchanges with the Landscape
+ server.
+
+Template: landscape-client/urgent_exchange_interval
+Type: string
+Default: 60
+_Description: Urgent Message Exchange Interval:
+ Interval, in seconds, between urgent message exchanges with the Landscape
+ server.
+
+Template: landscape-client/ping_url
+Type: string
+Default: http://landscape.canonical.com/ping
+_Description: Landscape PingServer URL:
+ The URL to perform lightweight exchange initiation with.
+
+Template: landscape-client/ping_interval
+Type: string
+Default: 30
+_Description: Ping Interval:
+ Interval, in seconds, between client ping exchanges with the Landscape server.
+
+Template: landscape-client/http_proxy
+Type: string
+Default:
+_Description: HTTP proxy (blank for none):
+ The URL of the HTTP proxy, if one is needed.
+
+Template: landscape-client/https_proxy
+Type: string
+Default:
+_Description: HTTPS proxy (blank for none):
+ The URL of the HTTPS proxy, if one is needed.
+
+Template: landscape-client/tags
+Type: string
+Default:
+_Description: Initial tags for first registration
+ Comma separated list of tags which will be assigned to this computer on its
+ first registration.  Once the machine is registered, these tags can only be
+ changed using the Landscape server.
+
+Template: landscape-client/register_system
+Type: boolean
+Default: false
+_Description: Register this system with the Landscape server?
+ Register this system with a preexisting Landscape account.  Please
+ go to http://landscape.canonical.com if you need a Landscape account.

=== added file 'debian/landscape-common.config'
--- debian/landscape-common.config	1970-01-01 00:00:00 +0000
+++ debian/landscape-common.config	2012-04-22 14:14:27 +0000
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+PACKAGE=landscape-common
+
+set -e
+. /usr/share/debconf/confmodule
+
+# Ask questions.
+db_input medium $PACKAGE/sysinfo || true
+db_go

=== added file 'debian/landscape-common.dirs'
--- debian/landscape-common.dirs	1970-01-01 00:00:00 +0000
+++ debian/landscape-common.dirs	2012-04-22 14:14:27 +0000
@@ -0,0 +1,1 @@
+etc/update-motd.d

=== added file 'debian/landscape-common.install'
--- debian/landscape-common.install	1970-01-01 00:00:00 +0000
+++ debian/landscape-common.install	2012-04-22 14:14:27 +0000
@@ -0,0 +1,3 @@
+usr/lib/python*
+usr/bin/landscape-sysinfo
+usr/share/landscape/landscape-sysinfo.wrapper

=== added file 'debian/landscape-common.postinst'
--- debian/landscape-common.postinst	1970-01-01 00:00:00 +0000
+++ debian/landscape-common.postinst	2012-04-22 14:14:27 +0000
@@ -0,0 +1,107 @@
+#!/bin/sh
+set -e
+
+# summary of how this script can be called:
+#        * <postinst> `configure' <most-recently-configured-version>
+#        * <old-postinst> `abort-upgrade' <new version>
+#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
+#          <new-version>
+#        * <postinst> `abort-remove'
+#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
+#          <failed-install-package> <version> `removing'
+#          <conflicting-package> <version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+. /usr/share/debconf/confmodule
+trap "db_stop || true" EXIT HUP INT QUIT TERM
+
+PACKAGE=landscape-common
+
+# Use the default installed Python.  Running just "python" might run
+# something from /usr/local/bin, which doesn't necessarily support
+# running the landscape client.
+PYTHON=/usr/bin/python
+
+case "$1" in
+    configure)
+
+       db_get $PACKAGE/sysinfo
+       # Choices:
+       #  * Do not display sysinfo on login
+       #  * Cache sysinfo in /etc/motd
+       #  * Run sysinfo on every login
+       SYSINFO="${RET:-Cache sysinfo in /etc/motd}"
+       WRAPPER=/usr/share/landscape/landscape-sysinfo.wrapper
+       PROFILE_LOCATION=/etc/profile.d/50-landscape-sysinfo.sh
+       UPDATE_MOTD_LOCATION=/etc/update-motd.d/50-landscape-sysinfo
+       if [ "$RET" = "Cache sysinfo in /etc/motd" ]; then
+           rm -f $PROFILE_LOCATION 2>/dev/null || true
+           ln -sf $WRAPPER $UPDATE_MOTD_LOCATION
+           /usr/sbin/update-motd 2>/dev/null || true
+       elif [ "$RET" = "Run sysinfo on every login" ]; then
+           rm -f $UPDATE_MOTD_LOCATION 2>/dev/null || true
+           /usr/sbin/update-motd 2>/dev/null || true
+           ln -sf $WRAPPER $PROFILE_LOCATION
+       else
+           rm -f $UPDATE_MOTD_LOCATION 2>/dev/null || true
+           /usr/sbin/update-motd 2>/dev/null || true
+           rm -f $PROFILE_LOCATION || true
+       fi
+
+        # 0.9.1 introduces non-backwards compatible changes.  This detects
+        # whether or not the data is in the current format.  If not, all
+        # existing data is removed.
+        DATA_DIR=/var/lib/landscape
+
+        if [ -d $DATA_DIR/data ]; then
+            rm -rf $DATA_DIR/*
+        elif [ -f $DATA_DIR/client/data.bpickle ]; then
+            LAST_BYTE=`sed -n '$,$s/.*\(.\)/\1/p' $DATA_DIR/client/data.bpickle`
+            if [ "$LAST_BYTE" = e ]; then
+                rm -rf $DATA_DIR/*
+            fi
+        fi
+
+        # Create landscape system user
+        if ! getent passwd landscape >/dev/null; then
+            adduser --quiet --system --group --disabled-password \
+                --home /var/lib/landscape --no-create-home landscape
+        fi
+
+        # Create landscape system group (for <= 1.0.29.1-0ubuntu0.9.04.0)
+        if ! getent group landscape >/dev/null; then
+            addgroup --quiet --system landscape
+        fi
+
+        # Ensure primary group is landscape (for <= 1.0.29.1-0ubuntu0.9.04.0)
+        if ! usermod -g landscape landscape > /dev/null 2>&1; then
+          echo "ERROR: usermod -g landscape landscape failed."
+        fi
+
+        # Fix prior ownerships, we exclude the custom-graph-scripts directory
+        # because there might script-generated files that we want to preserve
+        # the ownership of.
+        if [ -d /var/lib/landscape/client ]; then
+            find /var/lib/landscape/client/ -wholename /var/lib/landscape/client/custom-graph-scripts -prune -or -exec chown landscape {} \; > /dev/null 2>&1
+        fi
+        [ -d /var/lib/landscape/.gnupg ] && chown -R landscape /var/lib/landscape/.gnupg || :
+        chown -R landscape /var/log/landscape
+
+    ;;
+
+    abort-upgrade|abort-remove|abort-deconfigure)
+    ;;
+
+    *)
+        echo "postinst called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0

=== added file 'debian/landscape-common.postrm'
--- debian/landscape-common.postrm	1970-01-01 00:00:00 +0000
+++ debian/landscape-common.postrm	2012-04-22 14:14:27 +0000
@@ -0,0 +1,40 @@
+#!/bin/sh
+set -e
+
+# summary of how this script can be called:
+#        * <postrm> `remove'
+#        * <postrm> `purge'
+#        * <old-postrm> `upgrade' <new-version>
+#        * <new-postrm> `failed-upgrade' <old-version>
+#        * <new-postrm> `abort-install'
+#        * <new-postrm> `abort-install' <old-version>
+#        * <new-postrm> `abort-upgrade' <old-version>
+#        * <disappearer's-postrm> `disappear' <overwriter>
+#          <overwriter-version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+case "$1" in
+    purge)
+        LOG_DIR=/var/log/landscape
+        CONFIG_FILE=/etc/landscape/client.conf
+        deluser --quiet --system landscape >/dev/null || true
+        rm -f "${LOG_DIR}/sysinfo.log"*
+        rm -f "${CONFIG_FILE}"
+    ;;
+
+    remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
+    ;;
+
+    *)
+        echo "postrm called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0

=== added file 'debian/landscape-common.prerm'
--- debian/landscape-common.prerm	1970-01-01 00:00:00 +0000
+++ debian/landscape-common.prerm	2012-04-22 14:14:27 +0000
@@ -0,0 +1,41 @@
+#!/bin/sh
+# prerm script for landscape-common
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <prerm> `remove'
+#        * <old-prerm> `upgrade' <new-version>
+#        * <new-prerm> `failed-upgrade' <old-version>
+#        * <conflictor's-prerm> `remove' `in-favour' <package> <new-version>
+#        * <deconfigured's-prerm> `deconfigure' `in-favour'
+#          <package-being-installed> <version> `removing'
+#          <conflicting-package> <version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+
+case "$1" in
+    remove|upgrade|deconfigure)
+       rm -f /etc/update-motd.d/50-landscape-sysinfo 2>/dev/null || true
+       /usr/sbin/update-motd 2>/dev/null || true
+       rm -f /etc/profile.d/landscape-sysinfo.sh 2>/dev/null || true
+    ;;
+
+    failed-upgrade)
+    ;;
+
+    *)
+        echo "prerm called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0

=== added file 'debian/landscape-common.templates'
--- debian/landscape-common.templates	1970-01-01 00:00:00 +0000
+++ debian/landscape-common.templates	2012-04-22 14:14:27 +0000
@@ -0,0 +1,20 @@
+Template: landscape-common/sysinfo
+Type: select
+# Translators beware! the following three strings form a single
+# Choices menu. - Every one of these strings has to fit in a standard
+# 80 characters console, as the fancy screen setup takes up some space
+# try to keep below ~71 characters.
+# DO NOT USE commas (,) in Choices translations otherwise
+# this will break the choices shown to users
+_Choices: Do not display sysinfo on login, Cache sysinfo in /etc/motd, Run sysinfo on every login
+Default: Cache sysinfo in /etc/motd
+_Description: landscape-sysinfo configuration:
+ Landscape includes a tool and a set of modules that can display
+ system status, information, and statistics on login.
+ .
+ This information can be gathered periodically (every 10 minutes)
+ and automatically written to /etc/motd.  The data could be a few
+ minutes out-of-date.
+ .
+ Or, this information can be gathered at login.  The data will be
+ more current, but might introduce a small delay at login.

=== added file 'debian/landscape-sysinfo.wrapper'
--- debian/landscape-sysinfo.wrapper	1970-01-01 00:00:00 +0000
+++ debian/landscape-sysinfo.wrapper	2012-04-22 14:14:27 +0000
@@ -0,0 +1,14 @@
+#!/bin/sh
+cores=$(grep -c ^processor /proc/cpuinfo 2>/dev/null)
+[ "$cores" -eq "0" ] && cores=1
+threshold="${cores:-1}.0"
+if [ $(echo "`cut -f1 -d ' ' /proc/loadavg` < $threshold" | bc) -eq 1 ]; then
+    echo
+    echo -n "  System information as of "
+    /bin/date
+    echo
+    /usr/bin/landscape-sysinfo
+else
+    echo
+    echo " System information disabled due to load higher than $threshold"
+fi

=== added directory 'debian/po'
=== added file 'debian/po/POTFILES.in'
--- debian/po/POTFILES.in	1970-01-01 00:00:00 +0000
+++ debian/po/POTFILES.in	2012-04-22 14:14:27 +0000
@@ -0,0 +1,2 @@
+[type: gettext/rfc822deb] landscape-client.templates
+[type: gettext/rfc822deb] landscape-common.templates

=== added file 'debian/po/templates.pot'
--- debian/po/templates.pot	1970-01-01 00:00:00 +0000
+++ debian/po/templates.pot	2012-04-22 14:14:27 +0000
@@ -0,0 +1,224 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: [e-mail]\n"
+"POT-Creation-Date: 2012-03-07 17:07+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <[e-mail]>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: string
+#. Description
+#: ../landscape-client.templates:1001
+msgid "Computer Title:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../landscape-client.templates:1001
+msgid ""
+"Descriptive text to identify this computer uniquely in the Landscape user "
+"interface."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../landscape-client.templates:2001
+msgid "Account Name:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../landscape-client.templates:2001
+msgid ""
+"Short lowercase identifier of the Landscape account this computer will be "
+"assigned."
+msgstr ""
+
+#. Type: password
+#. Description
+#: ../landscape-client.templates:3001
+msgid "Registration Password:"
+msgstr ""
+
+#. Type: password
+#. Description
+#: ../landscape-client.templates:3001
+msgid ""
+"Client registration password for the given Landscape account.  Only needed "
+"if the given account is requesting a client registration password."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../landscape-client.templates:4001
+msgid "Landscape Server URL:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../landscape-client.templates:4001
+msgid "The server URL to connect to."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../landscape-client.templates:5001
+msgid "Message Exchange Interval:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../landscape-client.templates:5001
+msgid ""
+"Interval, in seconds, between normal message exchanges with the Landscape "
+"server."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../landscape-client.templates:6001
+msgid "Urgent Message Exchange Interval:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../landscape-client.templates:6001
+msgid ""
+"Interval, in seconds, between urgent message exchanges with the Landscape "
+"server."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../landscape-client.templates:7001
+msgid "Landscape PingServer URL:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../landscape-client.templates:7001
+msgid "The URL to perform lightweight exchange initiation with."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../landscape-client.templates:8001
+msgid "Ping Interval:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../landscape-client.templates:8001
+msgid ""
+"Interval, in seconds, between client ping exchanges with the Landscape "
+"server."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../landscape-client.templates:9001
+msgid "HTTP proxy (blank for none):"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../landscape-client.templates:9001
+msgid "The URL of the HTTP proxy, if one is needed."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../landscape-client.templates:10001
+msgid "HTTPS proxy (blank for none):"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../landscape-client.templates:10001
+msgid "The URL of the HTTPS proxy, if one is needed."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../landscape-client.templates:11001
+msgid "Initial tags for first registration"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../landscape-client.templates:11001
+msgid ""
+"Comma separated list of tags which will be assigned to this computer on its "
+"first registration.  Once the machine is registered, these tags can only be "
+"changed using the Landscape server."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../landscape-client.templates:12001
+msgid "Register this system with the Landscape server?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../landscape-client.templates:12001
+msgid ""
+"Register this system with a preexisting Landscape account.  Please go to "
+"http://landscape.canonical.com if you need a Landscape account."
+msgstr ""
+
+#. Type: select
+#. Choices
+#. Translators beware! the following three strings form a single
+#. Choices menu. - Every one of these strings has to fit in a standard
+#. 80 characters console, as the fancy screen setup takes up some space
+#. try to keep below ~71 characters.
+#. DO NOT USE commas (,) in Choices translations otherwise
+#. this will break the choices shown to users
+#: ../landscape-common.templates:1001
+msgid ""
+"Do not display sysinfo on login, Cache sysinfo in /etc/motd, Run sysinfo on "
+"every login"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../landscape-common.templates:1002
+msgid "landscape-sysinfo configuration:"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../landscape-common.templates:1002
+msgid ""
+"Landscape includes a tool and a set of modules that can display system "
+"status, information, and statistics on login."
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../landscape-common.templates:1002
+msgid ""
+"This information can be gathered periodically (every 10 minutes) and "
+"automatically written to /etc/motd.  The data could be a few minutes out-of-"
+"date."
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../landscape-common.templates:1002
+msgid ""
+"Or, this information can be gathered at login.  The data will be more "
+"current, but might introduce a small delay at login."
+msgstr ""

=== added file 'debian/pycompat'
--- debian/pycompat	1970-01-01 00:00:00 +0000
+++ debian/pycompat	2012-04-22 14:14:27 +0000
@@ -0,0 +1,1 @@
+2

=== added file 'debian/rules'
--- debian/rules	1970-01-01 00:00:00 +0000
+++ debian/rules	2012-04-22 14:14:27 +0000
@@ -0,0 +1,128 @@
+#!/usr/bin/make -f
+
+dist_release := $(shell lsb_release -cs)
+ifneq ($(dist_release),dapper)
+	use_pycentral = yes
+endif
+ifeq (,$(filter $(dist_release), hardy lucid))
+	use_dhpython2 = yes
+endif
+
+dh_extra_flags = -plandscape-common -plandscape-client
+ifneq (,$(filter $(dist_release),precise))
+	# We want landscape-client-ui only from precise onward
+	dh_extra_flags += -plandscape-client-ui -plandscape-client-ui-install
+endif
+
+-include /usr/share/python/python.mk
+ifeq (,$(py_sitename))
+	py_sitename = site-packages
+	py_libdir = /usr/lib/python$(subst python,,$(1))/site-packages
+	py_sitename_sh = $(py_sitename)
+	py_libdir_sh = $(py_libdir)
+endif
+
+package = landscape-client
+root_dir = debian/tmp/
+
+revision = $(shell dpkg-parsechangelog | grep ^Version | cut -f 2 -d " "| cut -f 2 -d "-")
+
+landscape_common_substvars = debian/landscape-common.substvars
+landscape_client_substvars = debian/landscape-client.substvars
+
+build: build-stamp
+build-stamp:
+	dh_testdir
+	sed -i -e "s/^DEBIAN_REVISION = \"\"/DEBIAN_REVISION = \"-$(revision)\"/g" landscape/__init__.py
+	python setup.py build
+	make -C apt-update
+	touch build-stamp
+
+clean:
+	dh_testdir
+	dh_testroot
+	rm -f build-stamp
+	rm -rf build
+	make -C apt-update clean
+	dh_clean
+	debconf-updatepo
+	sed -i -e "s/^DEBIAN_REVISION = .*/DEBIAN_REVISION = \"\"/g" landscape/__init__.py
+
+install: build
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_installdirs \
+		etc/landscape \
+		var/lib/landscape \
+		var/log/landscape \
+		usr/share/landscape
+
+	python setup.py install --root $(root_dir) $(py_setup_install_args)
+
+	install -D -o root -g root -m 755 debian/landscape-sysinfo.wrapper $(root_dir)/usr/share/landscape/landscape-sysinfo.wrapper
+	install -D -o root -g root -m 644 debian/cloud-default.conf $(root_dir)/usr/share/landscape/cloud-default.conf
+	install -D -o root -g root -m 755 apt-update/apt-update $(root_dir)/usr/lib/landscape/apt-update
+	install -D -o root -g root -m 644 dbus/landscape.conf $(root_dir)/etc/dbus-1/system.d/landscape.conf
+
+binary-indep:
+# do nothing
+#
+binary-arch: build install
+	# That's not present in Ubuntu releases we still support, so
+	# we're just installing the lintian overrides file by hand
+	# for now.
+	#dh_lintian
+	dh_testdir
+	dh_testroot
+	dh_installdocs
+	dh_installman -p landscape-client man/landscape-client.1 man/landscape-config.1 man/landscape-message.1
+	dh_installchangelogs
+	dh_install --sourcedir debian/tmp/
+	dh_installinit -- start 45 2 3 4 5 . stop 15 0 1 6 .
+	dh_installlogrotate
+	dh_installdebconf
+	dh_compress
+	dh_fixperms
+
+ifneq (,$(findstring $(dist_release),hardy))
+	# We depend on bug-fixed versions of python-dbus and pycurl on hardy
+	echo "extra:Depends=python-dbus" >> $(landscape_common_substvars)
+	echo "extra:Depends=python-pycurl, hal" >> $(landscape_client_substvars)
+	# The python-image-store-proxy package is needed for the eucalyptus plugin
+	echo "extra:Suggests=python-image-store-proxy" >> $(landscape_common_substvars)
+endif
+ifneq (,$(filter $(dist_release),lucid))
+	# We want libpam-modules in lucid
+	echo "extra:Depends=libpam-modules (>= 1.0.1-9ubuntu3), python-dbus" >> $(landscape_common_substvars)
+	echo "extra:Depends=python-pycurl, hal" >> $(landscape_client_substvars)
+endif
+ifeq (,$(filter $(dist_release),hardy lucid))
+	# Starting natty, no more hal or dbus
+	echo "extra:Depends=libpam-modules (>= 1.0.1-9ubuntu3)" >> $(landscape_common_substvars)
+	echo "extra:Depends=python-pycurl, gir1.2-gudev-1.0 (>= 165-0ubuntu2)" >> $(landscape_client_substvars)
+	echo "extra:Suggests=python-dbus, hal" >> $(landscape_client_substvars)
+endif
+
+ifeq ($(use_dhpython2),yes)
+	dh_python2 --no-guessing-versions
+else
+    ifeq ($(use_pycentral),yes)
+        ifneq (,$(py_setup_install_args))
+			DH_PYCENTRAL=include-links dh_pycentral
+        else
+			DH_PYCENTRAL=nomove dh_pycentral
+        endif
+    else
+		dh_python
+    endif
+endif
+	dh_installdeb $(dh_extra_flags)
+	dh_gencontrol $(dh_extra_flags)
+	dh_md5sums $(dh_extra_flags)
+	dh_builddeb $(dh_extra_flags)
+
+
+binary: binary-arch binary-indep
+
+.PHONY: binary binary-arch binary-indep clean

=== added directory 'dev'
=== renamed directory 'dev' => 'dev.moved'
=== added file 'dev/dns-server'
--- dev/dns-server	1970-01-01 00:00:00 +0000
+++ dev/dns-server	2012-04-22 14:14:27 +0000
@@ -0,0 +1,99 @@
+#!/usr/bin/env python
+"""
+This script creates a DNS server that has enough functionality to test
+the server autodiscovery feature of landscape client.
+
+Landscape client uses /etc/resolv.conf to find the location of name servers.
+To have landscape client use this server, make sure that:
+
+nameserver 127.0.0.1
+
+is the first nameserver in /etc/resolv.conf.  Linux name lookups only support
+port 53, so this program must run on port 53 in order to work.  Be aware that
+NetworkManager overwrites this file any time your network configuration
+changes.
+
+This program does not return enough information for a tool like dig to complete
+successfully.  If this is needed, use Bind 9, detailed at
+https://wiki.canonical.com/Landscape/SpecRegistry/0082
+"""
+
+import argparse
+import sys
+from twisted.internet import reactor, defer
+from twisted.names import dns, common
+from twisted.names.server import DNSServerFactory
+
+
+PORT = 5553
+SRV_RESPONSE = 'lds1.mylandscapehost.com'
+A_RESPONSE = '127.0.0.1'
+
+
+class SimpleResolver(common.ResolverBase):
+    def _lookup(self, name, cls, typ, timeout):
+        """
+        Respond to DNS requests.  See documentation for
+        L{twisted.names.common.ResolverBase}.
+        """
+        # This nameserver returns the same result all the time, regardless
+        # of what name the client asks for.
+        results = []
+        ttl = 60
+        if typ == dns.SRV:
+            record = dns.Record_SRV(0, 1, 80, SRV_RESPONSE, ttl)
+            owner = '_landscape._tcp.mylandscapehost.com'
+            results.append(dns.RRHeader(owner, record.TYPE, dns.IN, ttl,
+                                        record, auth=True))
+        elif typ == dns.A:
+            record = dns.Record_A(A_RESPONSE)
+            owner = 'landscape.localdomain'
+            results.append(dns.RRHeader(owner, record.TYPE, dns.IN, ttl,
+                                        record, auth=True))
+
+        authority = []
+        return defer.succeed((results, authority, []))
+
+
+def parse_command_line(args):
+    global SRV_RESPONSE, A_RESPONSE, PORT
+    description = """
+    This test tool responds to DNS queries for SRV and A records.  It always
+    responds with the same result regardless of the query string sent by the
+    client.
+
+    To test this tool, try the following commands:
+    dig -p 5553 @127.0.0.1 SRV _landscape._tcp.mylandscapehost.com
+
+    dig -p 5553 @127.0.0.1 localhost.localdomain
+    """
+    parser = argparse.ArgumentParser(description=description)
+    parser.add_argument("--srv-response", type=str, default=SRV_RESPONSE,
+                        help="Give this reply to SRV queries (eg: localhost)")
+    parser.add_argument("--a-response", type=str, default=A_RESPONSE,
+                        help="Give this reply to A queries (eg: 127.0.0.1)")
+    parser.add_argument("--port", type=int, default=PORT,
+                        help="Listen on this port (default 5553).  DNS "
+                        "normally runs on port 53")
+
+    args = vars(parser.parse_args())
+    SRV_RESPONSE = args["srv_response"]
+    A_RESPONSE = args["a_response"]
+    PORT = args["port"]
+
+
+def main():
+    parse_command_line(sys.argv)
+
+    simple_resolver = SimpleResolver()
+    factory = DNSServerFactory(authorities=[simple_resolver], verbose=1)
+    protocol = dns.DNSDatagramProtocol(factory)
+    print "starting reactor on port %s.." % PORT
+    reactor.listenTCP(PORT, factory)
+    reactor.listenUDP(PORT, protocol)
+    reactor.run()
+    print "reactor stopped..."
+
+
+if __name__ == "__main__":
+    main()

=== added file 'dev/landscape-client-vm'
--- dev/landscape-client-vm	1970-01-01 00:00:00 +0000
+++ dev/landscape-client-vm	2012-04-22 14:14:27 +0000
@@ -0,0 +1,178 @@
+#!/bin/sh -e
+
+help () {
+    cat <<EOF
+$0 [OPTION] ... <release>: build a landscape-client VM
+for the specified release. Available options:
+
+  -m, --mirror <mirror>      The Ubuntu mirror to use to build the VM, and
+                             for the APT sources inside the VM itself.
+                             If you want to use apt-proxy, you have to
+                             modify the apt-proxy-v2.conf file to make
+                             apt-proxy listen to your actual network
+                             interface address, instead of the loopback one.
+                             For example:
+                                 ;; Server IP to listen on
+                                 address = 192.168.1.162
+  -s, --server <host>        The hostname of the Landscape server the client
+                             should connect to.
+  -a, --account <account>    The name of the Landscape account to use.
+  -p, --password <password>  The password for the Landscape account.
+  -P, --profile <profile>    Package profile to use, can be server or
+                             desktop.
+  -k, --ssl-key <key>        Specify an SSL key to be used in the client
+                             config.
+  -r, --repository <ppa>     Specify the PPA holding the client packages.
+  -b, --build <yes|no>       If yes, the landscape-client packages from this
+                             branch will be built and installed inside the
+                             VM, otherwise they will be pulled from the APT
+                             repositories.
+
+For example, this script can be invoked like this:
+
+./dev/landscape-client-vm --password <LANDSCAPE_DEVEL_ACCOUNT_PW> intrepid
+
+where <LANDSCAPE_DEVEL_ACCOUNT_PW> is the account password of the
+landscape-devel account on the Landscape staging server (or you can specify
+another account with the --account parameter).
+
+The built VM will be stored under ./build/intrepid along with some other
+files. To launch the VM, cd to ./build/intrepid and issue: 
+$ ./run
+Once it's booted you can log into it with:
+$ ./ssh
+EOF
+}
+
+OPTS=$(getopt -o hm:s:a:p:P:k:r:b: --long help,mirror:,server:,account:,password:,profile:,ssl-key:,repository:,build: -- "$@")
+
+if [ $? != 0 ]; then
+    exit 1
+fi
+
+eval set -- "$OPTS"
+
+MIRROR=http://archive.ubuntu.com/ubuntu
+SERVER=staging.landscape.canonical.com
+ACCOUNT=landscape-devel
+PASSWORD=
+PROFILE=server
+SSL_KEY=
+PPA=landscape/trunk
+BUILD=yes
+
+while true ; do
+    case "$1" in
+	-h|--help) help; exit 1; shift ;;
+	-m|--mirror) MIRROR=$2; shift 2 ;;
+	-s|--server) SERVER=$2; shift 2;;
+	-a|--account) ACCOUNT=$2; shift 2;;
+	-p|--password) PASSWORD=$2; shift 2;;
+	-P|--profile) PROFILE=$2; shift 2;;
+	-S|--ssl-key) SSL_KEY=$2; shift 2;;
+	-r|--repository) PPA=$2; shift 2;;
+        -b|--build) BUILD=$2; shift 2;;
+	--) shift ; break ;;
+	*) echo "Internal error!" ; exit 1 ;;
+    esac
+done
+
+if [ "$1" = "" ]; then
+    help
+    exit
+fi
+
+RELEASE=$1
+TOPDIR=$(pwd)/build/${RELEASE}-${PROFILE}
+SSH_KEY=$TOPDIR/ssh_key
+SSH_PORT=3322
+ROOTSIZE=8192
+
+rm -fR $TOPDIR
+mkdir -p $TOPDIR
+ssh-keygen -N '' -f $SSH_KEY
+
+cd $TOPDIR
+
+cat > config <<EOF
+[client]
+url = https://${SERVER}/message-system
+computer_title = ${RELEASE} test VM $$
+data_path = /var/lib/landscape/client
+script_users = ALL
+ping_url = http://${SERVER}/ping
+include_manager_plugins = ScriptExecution
+account_name = ${ACCOUNT}
+registration_password = ${PASSWORD}
+#log_level = debug
+EOF
+
+if ! [ "$WITH_SSL" = "" ]; then
+    echo ssl_public_key = $SSL_KEY >> config
+fi
+
+cat > script-wrapper <<EOF
+#!/bin/sh -e
+chroot \$1 /root/script
+EOF
+chmod 755 script-wrapper
+
+cat> ppa-key <<EOF
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: SKS 1.0.10
+
+mI0ESXN/egEEAOgRYISU9dnQm4BB5ZEEwKT+NKUDNd/DhMYdtBMw9Yk7S5cyoqpbtwoPJVzK
+AXxq+ng5e3yYypSv98pLMr5UF09FGaeyGlD4s1uaVFWkFCO4jsTg7pWIY6qzO/jMxB5+Yu/G
+0GjWQMNKxFk0oHMa0PhNBZtdPacVz65mOVmCsh/lABEBAAG0G0xhdW5jaHBhZCBQUEEgZm9y
+IExhbmRzY2FwZYi2BBMBAgAgBQJJc396AhsDBgsJCAcDAgQVAggDBBYCAwECHgECF4AACgkQ
+boWobkZStOb+rwP+ONKUWeX+MTIPqGWkknBPV7jm8nyyIUojC4IhS+9YR6GYnn0hMABSkEHm
+IV73feKmrT2GESYI1UdYeKiOkWsPN/JyBk+eTvKet0qsw5TluqiHSW+LEi/+zUyrS3dDMX3o
+yaLgYa+UkjIyxnaKLkQuCiS+D+fYwnJulIkhaKObtdE=
+=UwRd
+-----END PGP PUBLIC KEY BLOCK-----
+EOF
+
+cat > script <<EOF
+#!/bin/sh -e
+chown landscape /etc/landscape/client.conf
+chmod 600 /etc/landscape/client.conf
+apt-key add /root/ppa-key
+echo "RUN=1" > /etc/default/landscape-client
+EOF
+chmod 755 script
+
+cat > manifest <<EOF
+ppa-key /root
+script /root/script
+config /etc/landscape/client.conf
+EOF
+
+if [ "$WITH_SSL" = "yes" ]; then
+    echo /etc/landscape/certs/sample_ca.crt /etc/landscape/client.conf.ssl_public_key >> manifest
+fi
+
+cat > ssh <<EOF
+#!/bin/sh
+exec ssh -p $SSH_PORT -i $SSH_KEY -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@localhost
+EOF
+chmod 755 ssh
+
+cat > run <<EOF
+#!/bin/sh
+exec kvm --redir tcp:$SSH_PORT::22 -m 1280 -smp 1 -drive file=$TOPDIR/ubuntu-kvm/disk0.qcow2 "$@"
+EOF
+chmod 755 run
+
+ADDPKGS="--addpkg=landscape-client --addpkg=openssh-server"
+
+if [ "$PROFILE" = "server" ]; then
+    ADDPKGS="$ADDPKGS --addpkg apache2-mpm-prefork --addpkg postgresql --addpkg postfix"
+else
+    ADDPKGS="$ADDPKGS --addpkg ubuntu-desktop"
+fi
+
+if [ -n "$TMPDIR" ]; then
+    TEMP_DIR_OPT="-t $TMPDIR"
+fi
+
+sudo ubuntu-vm-builder kvm "$RELEASE" --rootsize=$ROOTSIZE --mirror="$MIRROR" --ppa="$PPA" $ADDPKGS --execscript=./script-wrapper --copy=manifest --ssh-key=$SSH_KEY.pub $TEMP_DIR_OPT

=== added file 'dev/run-piuparts'
--- dev/run-piuparts	1970-01-01 00:00:00 +0000
+++ dev/run-piuparts	2012-04-22 14:14:27 +0000
@@ -0,0 +1,154 @@
+#!/bin/sh -e
+
+help () {
+    cat <<EOF
+$0 [OPTION]: run piuparts against landscape-client packages built from a branch
+
+The script checks if packaging changes (i.e. modifications to debian/ files) have
+been introduced in the latest commit of the branch, and if so builds fresh
+packages and run piuparts against them.
+
+The first time it's run, this script automatically creates a pbuilder chroot
+for the same Ubuntu release the system is running. The chroot will be saved
+under /var/cache/pbuilder and re-used in subsequent runs.
+
+The piuparts output will be available under build/piuparts/output.log.
+
+Available options:
+
+  -m, --mirror <mirror>   The Ubuntu mirror to use to build the pbuilder used
+                          by piuparts chroot.
+  -f, --force             Force running the tests, even if the debian/ directory
+                          hasn't been changed in the last bzr commit.
+EOF
+}
+
+#
+# Check if X is running, if not abort because we would make X crash (D-Bus!)
+#
+if pidof X > /dev/null; then
+    cat <<EOF
+It appears you're running an X session. This script would kill your session
+due to landscape-client reloading dbus in its postinst script. Quitting now.
+EOF
+    exit 1
+fi
+
+#
+# Check we have piuparts >= 0.36
+#
+PIUPARTS_VERSION=$(sudo piuparts --version 2>/dev/null| cut -f 2 -d " ")
+if ! dpkg --compare-versions $PIUPARTS_VERSION ge 0.36; then
+    cat <<EOF
+You need piuparts 0.36 or higher
+EOF
+    exit 1
+fi
+
+#
+# Parse command line arguments
+#
+OPTS=$(getopt -o hm:f --long help,mirror:,force -- "$@")
+if [ $? != 0 ]; then
+    exit 1
+fi
+eval set -- "$OPTS"
+
+MIRROR=http://archive.ubuntu.com/ubuntu
+FORCE=no
+
+while true ; do
+    case "$1" in
+	-h|--help) help; exit 1; shift ;;
+	-m|--mirror) MIRROR=$2; shift 2 ;;
+	-f|--force) FORCE=yes; shift 1 ;;
+	--) shift ; break ;;
+	*) echo "Internal error!" ; exit 1 ;;
+    esac
+done
+
+#
+# Check bzr changes under debian/
+#
+if [ "${FORCE}" = "no" ]; then
+    if ! bzr diff -r revno:-1|diffstat -l|grep -q "^debian/.*"; then
+        echo "No packaging changes, skipping piuparts tests."
+        exit 0
+    fi
+fi
+
+#
+# Export the sources
+#
+TOPDIR=$(pwd)/build/piuparts
+RELEASE=$(lsb_release -cs)
+SOURCE=$(dpkg-parsechangelog |grep "^Source:" | cut -f 2 -d " ")
+VERSION=$(dpkg-parsechangelog |grep "^Version:" | cut -f 2 -d " ")
+ARCH=$(dpkg --print-architecture)
+rm -rf $TOPDIR
+mkdir -p $TOPDIR
+bzr export $TOPDIR/$SOURCE-$VERSION
+
+#
+# Build the package
+#
+cd $TOPDIR/$SOURCE-$VERSION
+dpkg-buildpackage -rfakeroot -b -uc -us
+cd $TOPDIR
+
+BASETGZ=/var/cache/pbuilder/${SOURCE}-${RELEASE}-${ARCH}.tgz
+if ! [ -e "$BASETGZ" ]; then
+    # Create the pbuilder chroot
+    COMPONENTS="main universe multiverse restricted"
+    OTHERMIRROR="deb ${MIRROR} ${RELEASE}-updates ${COMPONENTS}"
+
+    if [ "${RELEASE}" = "hardy" ] || [ "${RELEASE}" = "dapper" ]; then
+        LANDSCAPE_REPO="deb http://landscape.canonical.com/packages/${RELEASE} ./"
+        OTHERMIRROR="${OTHERMIRROR} | ${LANDSCAPE_REPO}"
+    fi
+
+    sudo pbuilder \
+        --create \
+        --distribution ${RELEASE} \
+        --mirror ${MIRROR} \
+        --components "${COMPONENTS}" \
+        --othermirror "${OTHERMIRROR}" \
+        --basetgz ${BASETGZ}
+else
+    # Update the pbuilder chroot
+    sudo pbuilder \
+        --update \
+        --basetgz ${BASETGZ}
+fi
+
+#
+# Run piuparts
+#
+
+# Workaround a bug in policykit not purging correctly
+mkdir -p ${TOPDIR}/scripts/
+cat > ${TOPDIR}/scripts/post_purge_policy_kit <<EOF
+#!/bin/sh
+rm -rf /var/lib/PolicyKit/user-haldaemon.auths
+EOF
+chmod 755 ${TOPDIR}/scripts/post_purge_policy_kit
+
+sudo piuparts \
+    --scriptsdir=${TOPDIR}/scripts/ \
+    --keep-sources-list \
+    --skip-minimize \
+    --no-symlinks \
+    -i /var/lib/PolicyKit \
+    -i /etc/ssl \
+    -I "/etc/udev.*" \
+    -I "/lib/udev/.*" \
+    -I "/var/lib/.*" \
+    -I "/usr/lib/python2.6/dist-packages/twisted.*" \
+    -i /etc/X11 \
+    -i /etc/dbus-1 \
+    -i /etc/dbus-1/system.d \
+    -I "/usr/lib/python2.4/site-packages/apt.*" \
+    -I "/usr/lib/python2.4/site-packages/dbus.*" \
+    -I "/usr/lib/python2.5/site-packages/twisted.*" \
+    -b ${BASETGZ} \
+    ${SOURCE}_${VERSION}_${ARCH}.changes

=== added file 'dev/upload-to-ppa'
--- dev/upload-to-ppa	1970-01-01 00:00:00 +0000
+++ dev/upload-to-ppa	2012-04-22 14:14:27 +0000
@@ -0,0 +1,123 @@
+#!/bin/sh -e
+
+help () {
+    cat <<EOF
+Invoke this script from a $package bzr branch to build source packages for
+all target distributions and upload them to a PPA.
+
+Options:
+
+  -p=<PPA>|--ppa=<PPA>  The PPA to upload to. This gets passed to dput, please
+                        make sure you have a matching stanza in your ~/.dput.cf
+
+  -k=<KEY>|--key=<KEY>  The GPG key used to sign the packages
+
+  -s|--snapshot         Tweak the Debian revision by including the current bzr
+                        revision number in it (e.g. 1.4.0~bzr178-0ubuntu0.8.04)
+
+  -h|--help             Print this help and exit
+
+EOF
+    exit
+}
+
+#
+# Check if we are in a bzr branch
+#
+if ! [ -d .bzr ] || ! [ -f debian/changelog ]; then
+    echo "Error: not in a package bzr branch"
+    echo
+    help
+fi
+
+#
+# Set defaults and parse command line arguments
+#
+ppa=landscape
+key=[e-mail]
+snapshot=no
+package=$(dpkg-parsechangelog |grep ^Source|cut -f 2 -d " ")
+version=$(dpkg-parsechangelog |grep ^Version|cut -f 2 -d " ")
+upstream=$(echo $version | cut -f 1 -d "-")
+
+for i in $*; do
+    case $i in
+        -p=*|--ppa=*)
+                ppa=`echo $i | sed 's/[-a-zA-Z0-9]*=//'`
+                ;;
+        -k=*|--key=*)
+                key=`echo $i | sed 's/[-a-zA-Z0-9]*=//'`
+                ;;
+        -s|--snapshot)
+                snapshot=yes
+                ;;
+        -h|--help)
+                help
+                ;;
+        *)
+                echo "Error: unknown option $i"
+                echo
+                help
+                ;;
+    esac
+done
+
+if [ "$snapshot" = "yes" ]; then
+    bzr_rev=$(bzr log -l 1|grep ^revno|cut -f 2 -d " ")
+    upstream="$upstream~bzr$bzr_rev"
+fi
+
+#
+# Clean up from possible previous runs
+#
+rm -fR ../${package}-*
+rm -f ../${package}_*
+
+#
+# Export the sources
+#
+bzr export ../${package}-${upstream}
+cd ..
+cp -a ${package}-${upstream} ${package}-${upstream}.orig
+rm -R ${package}-${upstream}.orig/debian
+cd ${package}-${upstream}
+
+#
+# Build source packages and upload them
+#
+releases="hardy_8.04 karmic_9.10 lucid_10.04 maverick_10.10 natty_11.04 oneiric_11.10"
+
+if [ "$snapshot" = "yes" ]; then
+    # Snapshot, we'll add a dummy changelog entry like for all releases
+    source_opt="-sa"
+    releases="$releases natty_11.04"
+else
+    # Actual release, use the latest changelog entry and upload now
+    dpkg-buildpackage -S -sa -k$key
+    dput $ppa ../${package}_${version}_source.changes
+    source_opt="-sd"
+fi
+
+for release in $releases; do
+
+   codename=$(echo $release|cut -f 1 -d _)
+   revision=0ubuntu0.$(echo $release|cut -f 2 -d _)
+   if ! [ "$snapshot" = "yes" ]; then
+       revision=${revision}.0~landscape1
+   fi
+   version=$upstream-$revision
+
+   if [ "$snapshot" = "yes" ]; then
+       message="Snapshot build for $codename"
+   else
+       message="Built for $codename, no source changes"
+   fi
+   cp debian/changelog ../   
+   dch --force-distribution -b -v $version -D $codename -m $message
+   dpkg-buildpackage -S $source_opt -k$key
+   dput $ppa ../${package}_${version}_source.changes
+   mv ../changelog debian
+
+   source_opt="-sd"
+
+done

=== added directory 'glib-2.0'
=== renamed directory 'glib-2.0' => 'glib-2.0.moved'
=== added directory 'glib-2.0/schemas'
=== added file 'glib-2.0/schemas/com.canonical.landscape-client-settings.gschema.xml'
--- glib-2.0/schemas/com.canonical.landscape-client-settings.gschema.xml	1970-01-01 00:00:00 +0000
+++ glib-2.0/schemas/com.canonical.landscape-client-settings.gschema.xml	2012-04-22 14:14:27 +0000
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<schemalist>
+  <schema id="com.canonical.landscape-client-settings" path="/com/canonical/landscape-client-settings/">
+    <key type="s" name="management-type">
+      <default>"not"</default>
+      <summary>Whether the client settings UI currently set to a hosted client configuration, an LDS instance or no management service.</summary>
+    </key>
+    <key type="s" name="computer-title">
+      <default>""</default>
+      <summary>The title to register the machine with.</summary>
+    </key>
+    <key type="s" name="hosted-landscape-host">
+      <default>"landscape.canonical.com"</default>
+      <summary>The hostname of the Canonical hosted landscape system.</summary>
+    </key>
+    <key type="s" name="hosted-account-name">
+      <default>""</default>
+      <summary>An account name for use with the Canonical hosted landscape system.</summary>
+    </key>
+    <key type="s" name="hosted-password">
+      <default>""</default>
+      <summary>A password for use with the Canonical hosted landscape system</summary>
+    </key>
+    <key type="s" name="local-landscape-host">
+      <default>""</default>
+      <summary>The hostname of the local landscape system.</summary>
+    </key>
+    <key type="s" name="local-account-name">
+      <default>""</default>
+      <summary>An account name for use with the local landscape system.</summary>
+    </key>
+    <key type="s" name="local-password">
+      <default>""</default>
+      <summary>A password for use with the local landscape system</summary>
+    </key>
+  </schema>
+</schemalist>

=== added directory 'icons'
=== renamed directory 'icons' => 'icons.moved'
=== added file 'icons/preferences-management-service.svg'
--- icons/preferences-management-service.svg	1970-01-01 00:00:00 +0000
+++ icons/preferences-management-service.svg	2012-04-22 14:14:27 +0000
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In  -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   x="0px"
+   y="0px"
+   width="32"
+   height="32"
+   viewBox="-0.787 -0.867 32 32"
+   enable-background="new -0.787 -0.867 285 285"
+   xml:space="preserve"
+   id="svg2"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="canonical_aubergine_hex.svg"><metadata
+   id="metadata12"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="697"
+   inkscape:window-height="480"
+   id="namedview10"
+   showgrid="false"
+   fit-margin-top="0"
+   fit-margin-left="0"
+   fit-margin-right="0"
+   fit-margin-bottom="0"
+   inkscape:zoom="7.38"
+   inkscape:cx="15.9035"
+   inkscape:cy="16.176"
+   inkscape:window-x="449"
+   inkscape:window-y="100"
+   inkscape:window-maximized="0"
+   inkscape:current-layer="svg2" />
+<defs
+   id="defs4">
+</defs>
+<path
+   d="m 15.21339,25.32101 c -5.62692,0 -10.18809,-4.55982 -10.18809,-10.18812 0,-5.62706 4.56117,-10.18768 10.18809,-10.18768 5.62705,0 10.18798,4.56062 10.18798,10.18768 0,5.6283 -4.56082,10.18812 -10.18798,10.18812 z"
+   id="path6"
+   inkscape:connector-curvature="0"
+   style="fill:#772953" />
+<path
+   d="M 31.213,15.13334 C 31.213,23.96956 24.04959,31.133 15.21294,31.133 6.37607,31.133 -0.787,23.96945 -0.787,15.13334 -0.787,6.29621 6.37607,-0.867 15.21306,-0.867 24.04959,-0.867 31.213,6.29621 31.213,15.13334 z M 15.21306,3.025 c -6.68751,0 -12.10774,5.42115 -12.10774,12.10823 0,6.68809 5.42023,12.10755 12.10774,12.10755 6.68773,0 12.10796,-5.41946 12.10796,-12.10755 C 27.32102,8.44615 21.90079,3.025 15.21306,3.025 z"
+   id="path8"
+   inkscape:connector-curvature="0"
+   style="fill:#772953" />
+</svg>
\ No newline at end of file

=== added directory 'landscape'
=== added file 'landscape-client.conf'
--- landscape-client.conf	1970-01-01 00:00:00 +0000
+++ landscape-client.conf	2012-04-22 14:14:27 +0000
@@ -0,0 +1,12 @@
+[client]
+bus = session
+computer_title = John's PC
+account_name = onward
+registration_password =
+url = http://localhost:8080/message-system
+data_path = /tmp/landscape/
+log_dir = /tmp/landscape/
+log_level = debug
+pid_file = /tmp/landscape/landscape-client.pid
+ping_url = http://localhost:8081/ping
+

=== renamed file 'landscape-client.conf' => 'landscape-client.conf.moved'
=== renamed directory 'landscape' => 'landscape.moved'
=== added file 'landscape/__init__.py'
--- landscape/__init__.py	1970-01-01 00:00:00 +0000
+++ landscape/__init__.py	2012-04-22 14:14:27 +0000
@@ -0,0 +1,57 @@
+import sys
+
+DEBIAN_REVISION = ""
+UPSTREAM_VERSION = "12.04.2"
+VERSION = "%s%s" % (UPSTREAM_VERSION, DEBIAN_REVISION)
+
+# The "server-api" field of outgoing messages will be set to this value, and
+# used by the server message system to lookup the correct MessageAPI adapter
+# for handling the messages sent by the client. Bump it when the schema of any
+# of the messages sent by the client changes in a backward-incompatible way.
+#
+# Changelog:
+#
+# 3.2:
+#  * Add new "eucalyptus-info" and "eucalyptus-info-error" messages.
+#
+SERVER_API = "3.2"
+
+# XXX This is needed for backward compatibility in the server code importing
+# the API variable. We should eventually replace it in the server code.
+API = SERVER_API
+
+# The "client-api" field of outgoing messages will be set to this value, and
+# used by the server to know which schema do the message types accepted by the
+# client support. Bump it when the schema of an accepted message type changes
+# and update the changelog below as needed.
+#
+# Changelog:
+#
+# 3.3:
+#  * Add "binaries" field to "change-packages"
+#  * Add "policy" field to "change-packages"
+#  * Add new "change-package-locks" client accepted message type.
+#
+CLIENT_API = "3.3"
+
+from twisted.python import util
+
+
+def initgroups(uid, gid):
+    """Initializes the group access list.
+
+    It replaces the default implementation of Twisted which iterates other all
+    groups, using the system call C{initgroups} instead. This wrapper just
+    translates the numeric C{uid} to a user name understood by C{initgroups}.
+    """
+    import pwd
+    from landscape.lib.initgroups import initgroups as cinitgroups
+    return cinitgroups(pwd.getpwuid(uid).pw_name, gid)
+
+
+if "twisted.python._initgroups" not in sys.modules:
+    # Patch twisted initgroups implementation, which can result in very long
+    # calls to grp.getrlall(). See http://twistedmatrix.com/trac/ticket/3226
+    # We can remove that bit when Lucid is our oldest supported version
+    # (May 2013).
+    util.initgroups = initgroups

=== added file 'landscape/accumulate.py'
--- landscape/accumulate.py	1970-01-01 00:00:00 +0000
+++ landscape/accumulate.py	2012-04-22 14:14:27 +0000
@@ -0,0 +1,112 @@
+"""
+The accumulation logic generates data points for times that are a
+multiple of a step size.  In other words, if the step size is 300
+seconds, any data reported by the accumulation code will always be for
+a timestamp that is a multiple of 300.  The purpose of this behaviour
+is to (a) limit the amount of data that is sent to the server and (b)
+provide data in a predictable format to make server-side handling of
+the data straight-forward.  A nice side-effect of providing data at a
+known step-interval is that the server can detect blackholes in the
+data simply by testing for the absence of data points at step
+intervals.
+
+Limiting the amount of data sent to the server and making the data
+format predictable are both desirable attributes, but we need to
+ensure the data reported is accurate.  We can't rely on plugins to
+report data exactly at step boundaries and even if we could we
+wouldn't necessarily end up with data points that are representative
+of the resource being monitored.  We need a way to calculate a
+representative data point from the set of data points that a plugin
+provided during a step period.
+
+Suppose we want to calculate data points for timestamps 300 and 600.
+Assume a plugin runs at an interval less than 300 seconds to get
+values to provide to the accumulator.  Each value received by the
+accumulator is used to update a data point that will be sent to the
+server when we cross the step boundary.  The algorithm, based on
+derivatives, is:
+
+  (current time - previous time) * value + last accumulated value
+
+If the 'last accumulated value' isn't available, it defaults to 0.
+For example, consider these timestamp/load average measurements:
+300/2.0, 375/3.0, 550/3.5 and 650/0.5.  Also assume we have no data
+prior to 300/2.0.  This data would be processed as follows:
+
+  Input       Calculation                   Accumulated Value
+  -----       -----------                   -----------------
+  300/2.0     (300 - 300) * 2.0 + 0         0.0
+
+  375/3.0     (375 - 300) * 3.0 + 0.0       225.0
+
+  550/3.5     (550 - 375) * 3.5 + 225.0     837.5
+
+  650/0.5     (600 - 550) * 0.5 + 837.5     862.5
+
+Notice that the last value crosses a step boundary; the calculation
+for this value is:
+
+  (step boundary time - previous time) * value + last accumulated value
+
+This yields the final accumulated value for the step period we've just
+traversed.  The data point sent to the server is generated using the
+following calculation:
+
+  accumulated value / step interval size
+
+The data point sent to the server in our example would be:
+
+  862.5 / 300 = 2.875
+
+This value is representative of the activity that actually occurred
+and is returned to the plugin to queue for delivery to the server.
+The accumulated value for the next interval is calculated using the
+portion of time that crossed into the new step period:
+
+  Input       Calculation                   Accumulated Value
+  -----       -----------                   -----------------
+  650/0.5     (650 - 600) * 0.5 + 0         25
+
+And so the logic goes, continuing in a similar fashion, yielding
+representative data at each step boundary.
+"""
+
+class Accumulator(object):
+
+    def __init__(self, persist, step_size):
+        self._persist = persist
+        self._step_size = step_size
+
+    def __call__(self, new_timestamp, new_free_space, key):
+        previous_timestamp, accumulated_value = self._persist.get(key, (0, 0))
+        accumulated_value, step_data = \
+            accumulate(previous_timestamp, accumulated_value,
+                       new_timestamp, new_free_space, self._step_size)
+        self._persist.set(key, (new_timestamp, accumulated_value))
+        return step_data
+
+
+def accumulate(previous_timestamp, accumulated_value,
+               new_timestamp, new_value,
+               step_size):
+    previous_step = previous_timestamp // step_size
+    new_step = new_timestamp // step_size
+    step_boundary = new_step * step_size
+    step_diff = new_step - previous_step
+    step_data = None
+
+    if step_diff == 0:
+        diff = new_timestamp - previous_timestamp
+        accumulated_value += diff * new_value
+    elif step_diff == 1:
+        diff = step_boundary - previous_timestamp
+        accumulated_value += diff * new_value
+        step_value = float(accumulated_value) / step_size
+        step_data = (step_boundary, step_value)
+        diff = new_timestamp - step_boundary
+        accumulated_value = diff * new_value
+    else:
+        diff = new_timestamp - step_boundary
+        accumulated_value = diff * new_value
+
+    return accumulated_value, step_data

=== added file 'landscape/amp.py'
--- landscape/amp.py	1970-01-01 00:00:00 +0000
+++ landscape/amp.py	2012-04-22 14:14:27 +0000
@@ -0,0 +1,107 @@
+import os
+import logging
+
+from landscape.lib.amp import (
+    MethodCallProtocol, MethodCallFactory, RemoteObjectConnector)
+
+
+class ComponentProtocol(MethodCallProtocol):
+    """Communication protocol between the various Landscape components.
+
+    It can be used both as server-side protocol for exposing the methods of a
+    certain Landscape component, or as client-side protocol for connecting to
+    another Landscape component we want to call the methods of.
+    """
+    methods = ["ping", "exit"]
+    timeout = 60
+
+
+class ComponentProtocolFactory(MethodCallFactory):
+
+    protocol = ComponentProtocol
+    initialDelay = 0.05
+
+
+class RemoteComponentConnector(RemoteObjectConnector):
+    """Utility superclass for creating connections with a Landscape component.
+
+    @cvar component: The class of the component to connect to, it is expected
+        to define a C{name} class attribute, which will be used to find out
+        the socket to use. It must be defined by sub-classes.
+
+    @param reactor: A L{TwistedReactor} object.
+    @param config: A L{LandscapeConfiguration}.
+    @param args: Positional arguments for protocol factory constructor.
+    @param kwargs: Keyword arguments for protocol factory constructor.
+
+    @see: L{MethodCallClientFactory}.
+    """
+
+    factory = ComponentProtocolFactory
+
+    def __init__(self, reactor, config, *args, **kwargs):
+        self._twisted_reactor = reactor
+        socket = os.path.join(config.sockets_path,
+                              self.component.name + ".sock")
+        super(RemoteComponentConnector, self).__init__(
+            self._twisted_reactor._reactor, socket, *args, **kwargs)
+
+    def connect(self, max_retries=None, factor=None, quiet=False):
+        """Connect to the remote Landscape component.
+
+        If the connection is lost after having been established, and then
+        it is established again by the reconnect mechanism, an event will
+        be fired.
+
+        @param max_retries: If given, the connector will keep trying to connect
+            up to that number of times, if the first connection attempt fails.
+        @param factor: Optionally a float indicating by which factor the
+            delay between subsequent retries should increase. Smaller values
+            result in a faster reconnection attempts pace.
+        @param quiet: A boolean indicating whether to log errors.
+        """
+
+        def fire_reconnect(remote):
+            self._twisted_reactor.fire("%s-reconnect" %
+                                       self.component.name)
+
+        def connected(remote):
+            self._factory.add_notifier(fire_reconnect)
+            return remote
+
+        def log_error(failure):
+            logging.error("Error while connecting to %s", self.component.name)
+            return failure
+
+        result = super(RemoteComponentConnector, self).connect(
+            max_retries=max_retries, factor=factor)
+        if not quiet:
+            result.addErrback(log_error)
+        result.addCallback(connected)
+        return result
+
+
+class RemoteComponentsRegistry(object):
+    """
+    A global registry for looking up Landscape component connectors by name.
+    """
+
+    _by_name = {}
+
+    @classmethod
+    def get(cls, name):
+        """Get the connector class for the given Landscape component.
+
+        @param name: Name of the Landscape component we want to connect to, for
+           instance C{monitor} or C{manager}.
+        """
+        return cls._by_name[name]
+
+    @classmethod
+    def register(cls, connector_class):
+        """Register a connector for a Landscape component.
+
+        @param connector_class: A sub-class of L{RemoteComponentConnector}
+            that can be used to connect to a certain component.
+        """
+        cls._by_name[connector_class.component.name] = connector_class

=== added directory 'landscape/broker'
=== added file 'landscape/broker/__init__.py'
--- landscape/broker/__init__.py	1970-01-01 00:00:00 +0000
+++ landscape/broker/__init__.py	2012-04-22 14:14:27 +0000
@@ -0,0 +1,3 @@
+"""
+The broker mediates communication with client components to the server.
+"""

=== added file 'landscape/broker/amp.py'
--- landscape/broker/amp.py	1970-01-01 00:00:00 +0000
+++ landscape/broker/amp.py	2012-04-22 14:14:27 +0000
@@ -0,0 +1,142 @@
+from twisted.internet.defer import maybeDeferred, execute, succeed
+
+from landscape.lib.amp import RemoteObject
+from landscape.amp import (
+    ComponentProtocol, ComponentProtocolFactory, RemoteComponentConnector,
+    RemoteComponentsRegistry)
+from landscape.broker.server import BrokerServer
+from landscape.broker.client import BrokerClient
+from landscape.monitor.monitor import Monitor
+from landscape.manager.manager import Manager
+
+
+class BrokerServerProtocol(ComponentProtocol):
+    """
+    Communication protocol between the broker server and its clients.
+    """
+    methods = (ComponentProtocol.methods +
+               ["fire_event",
+                "get_accepted_message_types",
+                "get_server_uuid",
+                "is_message_pending",
+                "register",
+                "register_client",
+                "register_client_accepted_message_type",
+                "reload_configuration",
+                "send_message",
+                "stop_clients",
+                "listen_events"])
+
+
+class BrokerServerProtocolFactory(ComponentProtocolFactory):
+
+    protocol = BrokerServerProtocol
+
+
+class RemoteBroker(RemoteObject):
+
+    def call_if_accepted(self, type, callable, *args):
+        """Call C{callable} if C{type} is an accepted message type."""
+        deferred_types = self.get_accepted_message_types()
+
+        def got_accepted_types(result):
+            if type in result:
+                return callable(*args)
+        deferred_types.addCallback(got_accepted_types)
+        return deferred_types
+
+    def call_on_event(self, handlers):
+        """Call a given handler as soon as a certain event occurs.
+
+        @param handlers: A dictionary mapping event types to callables, where
+            an event type is string (the name of the event). When the first of
+            the given event types occurs in the broker reactor, the associated
+            callable will be fired.
+        """
+        result = self.listen_events(handlers.keys())
+        return result.addCallback(lambda event_type: handlers[event_type]())
+
+
+class FakeRemoteBroker(object):
+    """Looks like L{RemoteBroker}, but actually talks to local objects."""
+
+    def __init__(self, exchanger, message_store):
+        self.exchanger = exchanger
+        self.message_store = message_store
+        self.protocol = BrokerServerProtocol()
+
+    def ping(self):
+        return succeed(True)
+
+    def call_if_accepted(self, type, callable, *args):
+        if type in self.message_store.get_accepted_types():
+            return maybeDeferred(callable, *args)
+        return succeed(None)
+
+    def send_message(self, message, urgent=False):
+        """Send to the previously given L{MessageExchange} object."""
+
+        # Check that the message to be sent is serializable over AMP
+        from landscape.lib.amp import MethodCallArgument
+        assert(MethodCallArgument.check(message))
+
+        return execute(self.exchanger.send, message, urgent=urgent)
+
+    def register_client_accepted_message_type(self, type):
+        return execute(self.exchanger.register_client_accepted_message_type,
+                       type)
+
+    def get_accepted_message_types(self):
+        """
+        Return a deferred resulting in the list of message types accepted
+        by the Landscape server.
+        """
+        return execute(self.message_store.get_accepted_types)
+
+
+class BrokerClientProtocol(ComponentProtocol):
+    """Communication protocol between a client and the broker."""
+
+    methods = (ComponentProtocol.methods + ["fire_event", "message"])
+
+
+class BrokerClientProtocolFactory(ComponentProtocolFactory):
+
+    protocol = BrokerClientProtocol
+
+
+class RemoteClient(RemoteObject):
+    """A remote L{BrokerClient} connected to a L{BrokerServer}."""
+
+
+class RemoteBrokerConnector(RemoteComponentConnector):
+    """Helper to create connections with the L{BrokerServer}."""
+
+    factory = BrokerClientProtocolFactory
+    remote = RemoteBroker
+    component = BrokerServer
+
+
+class RemoteClientConnector(RemoteComponentConnector):
+    """Helper to create connections with the L{BrokerServer}."""
+
+    factory = BrokerServerProtocolFactory
+    remote = RemoteClient
+    component = BrokerClient
+
+
+class RemoteMonitorConnector(RemoteClientConnector):
+    """Helper to create connections with the L{Monitor}."""
+
+    component = Monitor
+
+
+class RemoteManagerConnector(RemoteClientConnector):
+    """Helper for creating connections with the L{Monitor}."""
+
+    component = Manager
+
+RemoteComponentsRegistry.register(RemoteBrokerConnector)
+RemoteComponentsRegistry.register(RemoteClientConnector)
+RemoteComponentsRegistry.register(RemoteMonitorConnector)
+RemoteComponentsRegistry.register(RemoteManagerConnector)

=== added file 'landscape/broker/client.py'
--- landscape/broker/client.py	1970-01-01 00:00:00 +0000
+++ landscape/broker/client.py	2012-04-22 14:14:27 +0000
@@ -0,0 +1,200 @@
+from logging import info, exception
+
+from twisted.internet.defer import maybeDeferred
+
+from landscape.log import format_object
+from landscape.lib.twisted_util import gather_results
+
+
+class HandlerNotFoundError(Exception):
+    """A handler for the given message type was not found."""
+
+
+class BrokerClientPlugin(object):
+    """A convenience for writing L{BrokerClient} plugins.
+
+    This provides a register method which will set up a bunch of
+    reactor handlers in the idiomatic way.
+
+    If C{run} is defined on subclasses, it will be called every C{run_interval}
+    seconds after being registered.
+
+    @cvar run_interval: The interval, in seconds, to execute the C{run} method.
+        If set to C{None}, then C{run} will not be scheduled.
+    @cvar run_immediately: If C{True} the plugin will be run immediately after
+        it is registered.
+    """
+
+    run_interval = 5
+    run_immediately = False
+
+    def register(self, client):
+        self.client = client
+        if getattr(self, "run", None) is not None:
+            if self.run_immediately:
+                self.run()
+            if self.run_interval is not None:
+                self.client.reactor.call_every(self.run_interval, self.run)
+
+    @property
+    def registry(self):
+        """An alias for the C{client} attribute."""
+        return self.client
+
+    def call_on_accepted(self, type, callable, *args, **kwargs):
+        """
+        Register a callback fired upon a C{message-type-acceptance-changed}.
+        """
+
+        def acceptance_changed(acceptance):
+            if acceptance:
+                return callable(*args, **kwargs)
+
+        self.client.reactor.call_on(("message-type-acceptance-changed", type),
+                                    acceptance_changed)
+
+
+class BrokerClient(object):
+    """Basic plugin registry for clients that have to deal with the broker.
+
+    This knows about the needs of a client when dealing with the Landscape
+    broker, including interest in messages of a particular type delivered
+    by the broker to the client.
+
+    @cvar name: The name used when registering to the broker, it must be
+        defined by sub-classes.
+    @ivar broker: A reference to a connected L{RemoteBroker}, it must be set
+        by the connecting machinery at service startup.
+
+    @param reactor: A L{TwistedReactor}.
+    """
+    name = "client"
+
+    def __init__(self, reactor):
+        super(BrokerClient, self).__init__()
+        self.reactor = reactor
+        self.broker = None
+        self._registered_messages = {}
+        self._plugins = []
+        self._plugin_names = {}
+
+        # Register event handlers
+        self.reactor.call_on("impending-exchange", self.notify_exchange)
+        self.reactor.call_on("broker-reconnect", self.handle_reconnect)
+
+    def ping(self):
+        """Return C{True}"""
+        return True
+
+    def add(self, plugin):
+        """Add a plugin.
+
+        The plugin's C{register} method will be called with this broker client
+        as its argument.
+
+        If the plugin has a C{plugin_name} attribute, it will be possible to
+        look up the plugin later with L{get_plugin}.
+        """
+        info("Registering plugin %s.", format_object(plugin))
+        self._plugins.append(plugin)
+        if hasattr(plugin, 'plugin_name'):
+            self._plugin_names[plugin.plugin_name] = plugin
+        plugin.register(self)
+
+    def get_plugins(self):
+        """Get the list of plugins."""
+        return self._plugins[:]
+
+    def get_plugin(self, name):
+        """Get a particular plugin by name."""
+        return self._plugin_names[name]
+
+    def register_message(self, type, handler):
+        """
+        Register interest in a particular type of Landscape server->client
+        message.
+
+        @param type: The type of message to register C{handler} for.
+        @param handler: A callable taking a message as a parameter, called
+            when messages of C{type} are received.
+        @return: A C{Deferred} that will fire when registration completes.
+        """
+        self._registered_messages[type] = handler
+        return self.broker.register_client_accepted_message_type(type)
+
+    def dispatch_message(self, message):
+        """Run the handler registered for the type of the given message.
+
+        @return: The return value of the handler, if found.
+        @raises: HandlerNotFoundError if the handler was not found
+        """
+        type = message["type"]
+        handler = self._registered_messages.get(type)
+        if handler is None:
+            raise HandlerNotFoundError(type)
+        try:
+            return handler(message)
+        except:
+            exception("Error running message handler for type %r: %r"
+                      % (type, handler))
+
+    def message(self, message):
+        """Call C{dispatch_message} for the given C{message}.
+
+        @return: A boolean indicating if a handler for the message was found.
+        """
+        try:
+            self.dispatch_message(message)
+            return True
+        except HandlerNotFoundError:
+            return False
+
+    def exchange(self):
+        """Call C{exchange} on all plugins."""
+        for plugin in self.get_plugins():
+            if hasattr(plugin, "exchange"):
+                try:
+                    plugin.exchange()
+                except:
+                    exception("Error during plugin exchange")
+
+    def notify_exchange(self):
+        """Notify all plugins about an impending exchange."""
+        info("Got notification of impending exchange. Notifying all plugins.")
+        self.exchange()
+
+    def fire_event(self, event_type, *args, **kwargs):
+        """Fire an event of a given type.
+
+        @return: A L{Deferred} resulting in a list of returns values of
+            the fired event handlers, in the order they were fired.
+        """
+        if event_type == "message-type-acceptance-changed":
+            message_type = args[0]
+            acceptance = args[1]
+            results = self.reactor.fire((event_type, message_type), acceptance)
+        else:
+            results = self.reactor.fire(event_type, *args, **kwargs)
+        return gather_results([
+            maybeDeferred(lambda x: x, result) for result in results])
+
+    def handle_reconnect(self):
+        """Called when the connection with the broker is established again.
+
+        The following needs to be done:
+
+          - Re-register any previously registered message types, so the broker
+            knows we have interest on them.
+
+          - Re-register ourselves as client, so the broker knows we exist and
+            will talk to us firing events and dispatching messages.
+        """
+        for type in self._registered_messages:
+            self.broker.register_client_accepted_message_type(type)
+        self.broker.register_client(self.name)
+
+    def exit(self):
+        """Stop the reactor and exit the process."""
+        # Stop with a short delay to give a chance to reply to the
+        # caller over AMP.
+        self.reactor.call_later(0.1, self.reactor.stop)

=== added file 'landscape/broker/config.py'
--- landscape/broker/config.py	1970-01-01 00:00:00 +0000
+++ landscape/broker/config.py	2012-04-22 14:14:27 +0000
@@ -0,0 +1,98 @@
+"""Configuration class for the broker."""
+
+import os
+
+from landscape.deployment import Configuration
+
+
+class BrokerConfiguration(Configuration):
+    """Specialized configuration for the Landscape Broker.
+
+    @cvar required_options: C{["url"]}
+    """
+
+    def __init__(self):
+        super(BrokerConfiguration, self).__init__()
+        self._original_http_proxy = os.environ.get("http_proxy")
+        self._original_https_proxy = os.environ.get("https_proxy")
+
+    @property
+    def exchange_store_path(self):
+        return os.path.join(self.data_path, "exchange.database")
+
+    def make_parser(self):
+        """Parser factory for broker-specific options.
+
+        @return: An L{OptionParser} preset for all the options
+            from L{Configuration.make_parser} plus:
+              - C{account_name}
+              - C{registration_password}
+              - C{computer_title}
+              - C{exchange_interval} (C{15*60})
+              - C{urgent_exchange_interval} (C{1*60})
+              - C{http_proxy}
+              - C{https_proxy}
+              - C{cloud}
+              - C{otp}
+              - C{provisioning_otp}
+        """
+        parser = super(BrokerConfiguration, self).make_parser()
+
+        parser.add_option("-a", "--account-name", metavar="NAME",
+                          help="The account this computer belongs to.")
+        parser.add_option("-p", "--registration-password", metavar="PASSWORD",
+                          help="The account-wide password used for "
+                               "registering clients.")
+        parser.add_option("-t", "--computer-title", metavar="TITLE",
+                          help="The title of this computer")
+        parser.add_option("--exchange-interval", default=15 * 60, type="int",
+                          metavar="INTERVAL",
+                          help="The number of seconds between server "
+                               "exchanges.")
+        parser.add_option("--urgent-exchange-interval", default=1 * 60,
+                          type="int", metavar="INTERVAL",
+                          help="The number of seconds between urgent server "
+                               "exchanges.")
+        parser.add_option("--ping-interval", default=30, type="int",
+                          metavar="INTERVAL",
+                          help="The number of seconds between pings.")
+        parser.add_option("--http-proxy", metavar="URL",
+                          help="The URL of the HTTP proxy, if one is needed.")
+        parser.add_option("--https-proxy", metavar="URL",
+                          help="The URL of the HTTPS proxy, if one is needed.")
+        parser.add_option("--cloud", action="store_true",
+                          help="Set this if your computer is in an EC2 cloud.")
+        parser.add_option("--otp", default="",
+                          help="The OTP to use in cloud configuration.")
+        parser.add_option("--tags",
+                          help="Comma separated list of tag names to be sent "
+                               "to the server.")
+        parser.add_option("--provisioning-otp", default="",
+                          help="The OTP to use for a provisioned machine.")
+
+        return parser
+
+    @property
+    def message_store_path(self):
+        """Get the path to the message store."""
+        return os.path.join(self.data_path, "messages")
+
+    def load(self, args, accept_nonexistent_config=False):
+        """
+        Load options from command line arguments and a config file.
+
+        Load the configuration with L{Configuration.load}, and then set
+        C{http_proxy} and C{https_proxy} environment variables based on
+        that config data.
+        """
+        super(BrokerConfiguration, self).load(
+            args, accept_nonexistent_config=accept_nonexistent_config)
+        if self.http_proxy:
+            os.environ["http_proxy"] = self.http_proxy
+        elif self._original_http_proxy:
+            os.environ["http_proxy"] = self._original_http_proxy
+
+        if self.https_proxy:
+            os.environ["https_proxy"] = self.https_proxy
+        elif self._original_https_proxy:
+            os.environ["https_proxy"] = self._original_https_proxy

=== added file 'landscape/broker/exchange.py'
--- landscape/broker/exchange.py	1970-01-01 00:00:00 +0000
+++ landscape/broker/exchange.py	2012-04-22 14:14:27 +0000
@@ -0,0 +1,436 @@
+"""The part of the broker which deals with communications with the server."""
+import time
+import logging
+from landscape.lib.hashlib import md5
+
+from twisted.internet.defer import succeed
+
+from landscape.lib.message import got_next_expected, ANCIENT
+from landscape.log import format_delta
+from landscape import SERVER_API, CLIENT_API
+
+
+class MessageExchange(object):
+    """
+    The Message Exchange is the place where messages are sent to go
+    out to the Landscape server.
+
+    The Message Exchange will accumulate messages in its message store
+    and periodically deliver them to the server.
+    """
+
+    plugin_name = "message-exchange"
+
+    def __init__(self, reactor, store, transport, registration_info,
+                 exchange_store,
+                 config,
+                 monitor_interval=None,
+                 max_messages=100,
+                 create_time=time.time):
+        """
+        @param reactor: A L{TwistedReactor} used to fire events in response
+            to messages received by the server.
+        @param store: A L{MessageStore} used to queue outgoing messages.
+        @param transport: A L{HTTPTransport} used to deliver messages.
+        @param exchange_interval: time interval between subsequent
+            exchanges of non-urgent messages.
+        @param urgent_exchange_interval: time interval between subsequent
+            exchanges of urgent messages.
+        """
+        self._reactor = reactor
+        self._message_store = store
+        self._create_time = create_time
+        self._transport = transport
+        self._registration_info = registration_info
+        self._config = config
+        self._exchange_interval = config.exchange_interval
+        self._urgent_exchange_interval = config.urgent_exchange_interval
+        self._max_messages = max_messages
+        self._notification_id = None
+        self._exchange_id = None
+        self._exchanging = False
+        self._urgent_exchange = False
+        self._client_accepted_types = set()
+        self._client_accepted_types_hash = None
+        self._message_handlers = {}
+        self._exchange_store = exchange_store
+
+        self.register_message("accepted-types", self._handle_accepted_types)
+        self.register_message("resynchronize", self._handle_resynchronize)
+        self.register_message("set-intervals", self._handle_set_intervals)
+        reactor.call_on("resynchronize-clients", self._resynchronize)
+        reactor.call_on("pre-exit", self.stop)
+
+    def get_exchange_intervals(self):
+        """Return a binary tuple with urgent and normal exchange intervals."""
+        return (self._urgent_exchange_interval, self._exchange_interval)
+
+    def _message_is_obsolete(self, message):
+        """Returns C{True} if message is obsolete.
+
+        A message is considered obsolete if the secure ID changed since it was
+        received.
+        """
+        if 'operation-id' not in message:
+            return False
+
+        operation_id = message['operation-id']
+        context = self._exchange_store.get_message_context(operation_id)
+        if context is None:
+            logging.warning(
+                "No message context for message with operation-id: %s"
+                % operation_id)
+            return False
+
+        # Compare the current secure ID with the one that was in effect when
+        # the request message was received.
+        result = self._registration_info.secure_id != context.secure_id
+        context.remove()
+
+        return result
+
+    def send(self, message, urgent=False):
+        """Include a message to be sent in an exchange.
+
+        If urgent is True, an exchange with the server will be
+        scheduled urgently.
+
+        @param message: Same as in L{MessageStore.add}.
+        """
+        if self._message_is_obsolete(message):
+            logging.info(
+                "Response message with operation-id %s was discarded "
+                "because the client's secure ID has changed in the meantime"
+                % message.get('operation-id'))
+            return None
+
+        if "timestamp" not in message:
+            message["timestamp"] = int(self._reactor.time())
+        message_id = self._message_store.add(message)
+        if urgent:
+            self.schedule_exchange(urgent=True)
+        return message_id
+
+    def start(self):
+        """Start scheduling exchanges. The first one will be urgent."""
+        self.schedule_exchange(urgent=True)
+
+    def stop(self):
+        if self._exchange_id is not None:
+            self._reactor.cancel_call(self._exchange_id)
+            self._exchange_id = None
+        if self._notification_id is not None:
+            self._reactor.cancel_call(self._notification_id)
+            self._notification_id = None
+
+    def _handle_accepted_types(self, message):
+        """
+        When the server updates us about the types of message it
+        accepts, update our message store.
+
+        If this makes existing held messages available for sending,
+        urgently exchange messages.
+
+        If new types are made available or old types are dropped a
+        C{("message-type-acceptance-changed", type, bool)} reactor
+        event will be fired.
+        """
+        old_types = set(self._message_store.get_accepted_types())
+        new_types = set(message["types"])
+        diff = get_accepted_types_diff(old_types, new_types)
+        self._message_store.set_accepted_types(new_types)
+        logging.info("Accepted types changed: %s", diff)