Merge lp:amahi/amahi-ubuntu into lp:amahi

[Cale Cunningham]

Introduces elementary support for Ubuntu

[lp:amahi/amahi-ubuntu]

679. By Cale Cunningham on 2010-07-16

More merges.

680. By Cale Cunningham on 2010-08-08

Merged all latest git updates.

681. By Cale Cunningham on 2010-08-08

Typo fixes

682. By Cale Cunningham on 2010-08-08

Lotsa merge fixes. Includes new OS detection routine and library.

683. By Cale Cunningham on 2010-08-08

Removed merge junk from hdactl file.

Unmerged revisions

683. By Cale Cunningham on 2010-08-08

Removed merge junk from hdactl file.

682. By Cale Cunningham on 2010-08-08

Lotsa merge fixes. Includes new OS detection routine and library.

681. By Cale Cunningham on 2010-08-08

Typo fixes

680. By Cale Cunningham on 2010-08-08

Merged all latest git updates.

679. By Cale Cunningham on 2010-07-16

More merges.

678. By Cale Cunningham on 2010-07-10

More merges: added WOL (cpg)

677. By Cale Cunningham on 2010-07-10

More Debian Packaging Fixes

676. By Cale Cunningham on 2010-07-06

Merged most recent upstream commit.

675. By Cale Cunningham on 2010-07-06

Missing amahi-installer.debian file. Oops.

674. By Cale Cunningham on 2010-07-06

Massive merge changes!

=== added directory 'apps/amahitunes5/debian'
=== added file 'apps/amahitunes5/debian/README.Debian'
--- apps/amahitunes5/debian/README.Debian	1970-01-01 00:00:00 +0000
+++ apps/amahitunes5/debian/README.Debian	2010-08-08 06:35:52 +0000
@@ -0,0 +1,15 @@
+amahitunes for Debian
+---------------------
+
+This is a new version of AmahiTunes without a native Amahi app,
+and instead with a separate webapp of it's own, created by
+Guillaume Boudreau.
+
+As a bonus, it let's you stream to iTunes directly from the web
+browser and also download the song.
+
+To do:
+
+	- support full configuration of the Firefly media server
+
+ -- Cale Cunningham <[e-mail]>  Sun, 06 Jun 2010 11:13:56 -0500

=== added file 'apps/amahitunes5/debian/changelog'
--- apps/amahitunes5/debian/changelog	1970-01-01 00:00:00 +0000
+++ apps/amahitunes5/debian/changelog	2010-08-08 06:35:52 +0000
@@ -0,0 +1,23 @@
+amahitunes (5-1ubuntu3) lucid; urgency=low
+
+  * Another stupid mistake.
+
+ -- Cale Cunningham <[e-mail]>  Sat, 12 Jun 2010 22:59:52 -0500
+
+amahitunes (5-1ubuntu2) lucid; urgency=low
+
+  * Forgot rsync
+
+ -- Cale Cunningham <[e-mail]>  Sat, 12 Jun 2010 22:31:52 -0500
+
+amahitunes (5-1ubuntu1) lucid; urgency=low
+
+  * Debian packaging fixes. Again.
+
+ -- Cale Cunningham <[e-mail]>  Wed, 09 Jun 2010 01:20:57 -0500
+
+amahitunes (5-1) unstable; urgency=low
+
+  * Initial release  <nnnn is the bug number of your ITP>
+
+ -- Cale Cunningham <[e-mail]>  Sun, 06 Jun 2010 11:13:56 -0500

=== added file 'apps/amahitunes5/debian/compat'
--- apps/amahitunes5/debian/compat	1970-01-01 00:00:00 +0000
+++ apps/amahitunes5/debian/compat	2010-08-08 06:35:52 +0000
@@ -0,0 +1,1 @@
+7

=== added file 'apps/amahitunes5/debian/control'
--- apps/amahitunes5/debian/control	1970-01-01 00:00:00 +0000
+++ apps/amahitunes5/debian/control	2010-08-08 06:35:52 +0000
@@ -0,0 +1,12 @@
+Source: amahitunes
+Section: web
+Priority: extra
+Maintainer: Cale Cunningham <[e-mail]>
+Build-Depends: debhelper,rsync
+Standards-Version: 3.8.3
+Homepage: http://www.amahi.org
+
+Package: amahitunes5
+Architecture: all
+Depends: hdactl,hda-platform,rsync,mt-daapd
+Description: Amahitunes is an iTunes-capable music streaming server based on daapd.

=== added file 'apps/amahitunes5/debian/copyright'
--- apps/amahitunes5/debian/copyright	1970-01-01 00:00:00 +0000
+++ apps/amahitunes5/debian/copyright	2010-08-08 06:35:52 +0000
@@ -0,0 +1,35 @@
+This work was packaged for Debian by:
+
+    Cale Cunningham <[e-mail]> on Sun, 06 Jun 2010 11:13:56 -0500
+
+It was downloaded from <url://example.com>
+
+Upstream Author(s):
+
+    <put author's name and email here>
+    <likewise for another author>
+
+Copyright:
+
+    <Copyright (C) YYYY Name OfAuthor>
+    <likewise for another author>
+
+License:
+
+    <Put the license of the package here indented by 4 spaces>
+
+The Debian packaging is:
+
+    Copyright (C) 2010 Cale Cunningham <[e-mail]>
+
+# Please chose a license for your packaging work. If the program you package
+# uses a mainstream license, using the same license is the safest choice.
+# Please avoid to pick license terms that are more restrictive than the
+# packaged work, as it may make Debian's contributions unacceptable upstream.
+# If you just want it to be GPL version 3, leave the following lines in.
+
+and is licensed under the GPL version 3, 
+see `/usr/share/common-licenses/GPL-3'.
+
+# Please also look if there are files or directories which have a
+# different copyright/license attached and list them here.

=== added file 'apps/amahitunes5/debian/docs'
--- apps/amahitunes5/debian/docs	1970-01-01 00:00:00 +0000
+++ apps/amahitunes5/debian/docs	2010-08-08 06:35:52 +0000
@@ -0,0 +1,1 @@
+README

=== added file 'apps/amahitunes5/debian/install'
--- apps/amahitunes5/debian/install	1970-01-01 00:00:00 +0000
+++ apps/amahitunes5/debian/install	2010-08-08 06:35:52 +0000
@@ -0,0 +1,7 @@
+# NOTE (cale250, 2010-06-06): Install daapd.conf this way.
+
+app		/var/hda/platform/apps/amahitunes/
+music         /var/hda/platform/apps/amahitunes/
+mt-daapd.conf   /var/hda/platform/apps/amahitunes/
+
+#Yup. Seriously. That's it.

=== added file 'apps/amahitunes5/debian/postinst'
--- apps/amahitunes5/debian/postinst	1970-01-01 00:00:00 +0000
+++ apps/amahitunes5/debian/postinst	2010-08-08 06:35:52 +0000
@@ -0,0 +1,54 @@
+#!/bin/sh
+# postinst script for amahitunes
+#
+# see: dh_installdeb(1)
+
+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
+
+
+case "$1" in
+    configure)
+    	chown www-data:users /var/hda/platform/apps/amahitunes/mt-daapd.conf
+	chmod 664 /var/hda/platform/apps/amahitunes/mt-daapd.conf
+	mv /etc/mt-daapd.conf /etc/mt-daapd.conf.debsave
+	ln -s /var/hda/platform/apps/amahitunes/mt-daapd.conf /etc/mt-daapd.conf
+	mkdir -p /var/hda/files/music
+	/sbin/chkconfig mt-daapd on
+	service mt-daapd stop &> /dev/null
+	service mt-daapd start &> /dev/null
+	service apache2 reload &> /dev/null
+
+	if  [ -z $(ls /var/hda/files/music/) ] ; then
+		rsync -a /var/hda/platform/apps/amahitunes/music/ /var/hda/files/music/
+		chown -R 500:users /var/hda/files/music
+	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 'apps/amahitunes5/debian/prerm'
--- apps/amahitunes5/debian/prerm	1970-01-01 00:00:00 +0000
+++ apps/amahitunes5/debian/prerm	2010-08-08 06:35:52 +0000
@@ -0,0 +1,51 @@
+#!/bin/sh
+# prerm script for amahitunes
+#
+# 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)
+    	if [ "$1" = 0 ]; then
+		# an uninstall
+		/sbin/service mt-daapd stop &> /dev/null
+		/sbin/chkconfig mt-daapd off
+		/sbin/chkconfig --del mt-daapd
+		/sbin/service apache2 restart &> /dev/null
+		mv /etc/mt-daapd.conf.debsave /etc/mt-daapd.conf
+	else
+		# update
+		( /usr/bin/killall mt-daapd && rm -f /var/run/mt-daapd.pid ) &> /dev/null
+		# rely on monit to restart it properly see http://bugs.amahi.org/issues/show/21
+		/sbin/service apache2 restart &> /dev/null
+	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 'apps/amahitunes5/debian/rules'
--- apps/amahitunes5/debian/rules	1970-01-01 00:00:00 +0000
+++ apps/amahitunes5/debian/rules	2010-08-08 06:35:52 +0000
@@ -0,0 +1,13 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+# Sample debian/rules that uses debhelper.
+# This file was originally written by Joey Hess and Craig Small.
+# As a special exception, when this file is copied by dh-make into a
+# dh-make output file, you may use that output file without restriction.
+# This special exception was added by Craig Small in version 0.37 of dh-make.
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+%:
+	dh  $@

=== removed file 'platform/hdactl/COPYING'
--- platform/hdactl/COPYING	2010-04-22 00:19:57 +0000
+++ platform/hdactl/COPYING	1970-01-01 00:00:00 +0000
@@ -1,690 +0,0 @@
-Amahi Home Server
-
-This program is Copyright (C) 2007-2010, Amahi 
-
-This program is free software released under the terms of the GNU
-AGPLv3 (and no other AGPL version), found below for your convenience.
-
-We further require that you leave the logos and URLs pointing to
-the Amahi web site intact and in the same visible condition if
-you redistribute this program.
-
-Contact the Amahi Team at the address listed in
-http://www.amahi.org/ (under Contact Us) if you are interested in
-licensing this program under other terms.
-
-It is important to note that this license applies to the Amahi
-platform and closely tied plugins and themes released by the
-Amahi team, not to the programs that run on top of or aided by
-the Amahi platform. Conversely, Amahi makes no claims as to the
-Linux platforms on top of which it runs. Contributions and any
-brands used are owned by their respective parties.
-
-The Amahi Team wishes to thank all the components of open source
-system without which the Amahi Home Server would not be possible.
-
-The Amahi Team
-
------------------------------------------------------------------------
-
-                    GNU AFFERO GENERAL PUBLIC LICENSE
-                       Version 3, 19 November 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU Affero General Public License is a free, copyleft license for
-software and other kinds of works, specifically designed to ensure
-cooperation with the community in the case of network server software.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-our General Public Licenses are intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.
-
-  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
-them 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.
-
-  Developers that use our General Public Licenses protect your rights
-with two steps: (1) assert copyright on the software, and (2) offer
-you this License which gives you legal permission to copy, distribute
-and/or modify the software.
-
-  A secondary benefit of defending all users' freedom is that
-improvements made in alternate versions of the program, if they
-receive widespread use, become available for other developers to
-incorporate.  Many developers of free software are heartened and
-encouraged by the resulting cooperation.  However, in the case of
-software used on network servers, this result may fail to come about.
-The GNU General Public License permits making a modified version and
-letting the public access it on a server without ever releasing its
-source code to the public.
-
-  The GNU Affero General Public License is designed specifically to
-ensure that, in such cases, the modified source code becomes available
-to the community.  It requires the operator of a network server to
-provide the source code of the modified version running there to the
-users of that server.  Therefore, public use of a modified version, on
-a publicly accessible server, gives the public access to the source
-code of the modified version.
-
-  An older license, called the Affero General Public License and
-published by Affero, was designed to accomplish similar goals.  This is
-a different license, not a version of the Affero GPL, but Affero has
-released a new version of the Affero GPL which permits relicensing under
-this license.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU Affero General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey 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;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If 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 convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Remote Network Interaction; Use with the GNU General Public License.
-
-  Notwithstanding any other provision of this License, if you modify the
-Program, your modified version must prominently offer all users
-interacting with it remotely through a computer network (if your version
-supports such interaction) an opportunity to receive the Corresponding
-Source of your version by providing access to the Corresponding Source
-from a network server at no charge, through some standard or customary
-means of facilitating copying of software.  This Corresponding Source
-shall include the Corresponding Source for any work covered by version 3
-of the GNU General Public License that is incorporated pursuant to the
-following paragraph.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the work with which it is combined will remain governed by version
-3 of the GNU General Public License.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU Affero 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 that a certain numbered version of the GNU Affero General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU Affero General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU Affero General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  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.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-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.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     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
-state 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 Affero General Public License as published by
-    the Free Software Foundation, either version 3 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 Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If your software can interact with users remotely through a computer
-network, you should also make sure that it provides a way for users to
-get its source.  For example, if your program is a web application, its
-interface could display a "Source" link that leads users to an archive
-of the code.  There are many ways you could offer source, and different
-solutions will be better for different programs; see section 13 for the
-specific requirements.
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU AGPL, see
-<http://www.gnu.org/licenses/>.

=== removed file 'platform/hdactl/ChangeLog'
--- platform/hdactl/ChangeLog	2009-10-13 05:15:48 +0000
+++ platform/hdactl/ChangeLog	1970-01-01 00:00:00 +0000
@@ -1,15 +0,0 @@
-Mon Oct 12 14:30:23 PDT 2009 Carlos Puchol <[e-mail]>
-
-	* updates to the new installer
-	* fixes to hdactl. closes #333 - default to enabled unless explicitly disabled
-
-Sun Oct 11 04:37:08 2009 -0700 Carlos Puchol <[e-mail]>
-
-	* fixes for f11 kickstart install on the new installer
-
-Wed Oct 7 19:43:33 2009 -0500 Michael Essary <[e-mail]>
-
-	* Closes #18 - Modified hdactl to provide clients with a
-	  secondary DNS. This patch uses the primary external DNS
-	  setting in the database as the secondary DNS add ress.
-

=== modified file 'platform/hdactl/Makefile'
--- platform/hdactl/Makefile	2010-07-31 17:17:55 +0000
+++ platform/hdactl/Makefile	2010-08-08 06:35:52 +0000
@@ -6,7 +6,7 @@
 
 CFLAGS='-Wall'
 
-all: rpm
+
 
 dist: hdactl-hup
 	(mkdir -p release && cd release && mkdir -p hdactl-$(VERSION))
@@ -28,11 +28,13 @@
 	mv $(RPMBUILDDIR)/RPMS/$(ARCH)/hdactl-$(VERSION)-*.$(ARCH).rpm release/
 	mv $(RPMBUILDDIR)/SRPMS/hdactl-$(VERSION)-*.src.rpm release/
 
-deb: update-header dist
+deb: update-header
 	(cd release && ln -sf hdactl-$(VERSION).tar.gz hdactl_$(VERSION).orig.tar.gz)
 	(cd release && tar -zxf hdactl_$(VERSION).orig.tar.gz)
-#Commenting out until can figure out why debuild -S is not working	
-	#(cd release/hdactl-$(VERSION)/debian && debuild -uc -us && debuild -S -uc -us)
-	(cd release/hdactl-$(VERSION)/debian && debuild -uc -us)
+	#These have to be signed in order to be put into launchpad!	
+	(debuild && debuild -S)
+	
+donothing: 
+
 install: rpm
 	(cd release && sudo rpm -Uvh hdactl-$(VERSION)-*.$(ARCH).rpm)

=== added file 'platform/hdactl/amahi-installer.debian'
--- platform/hdactl/amahi-installer.debian	1970-01-01 00:00:00 +0000
+++ platform/hdactl/amahi-installer.debian	2010-08-08 06:35:52 +0000
@@ -0,0 +1,125 @@
+#!/usr/bin/perl -w
+#
+# Amahi Home Server
+# Copyright (C) 2007-2009 Amahi Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License v3
+# (29 June 2007), as published in the COPYING file.
+# 
+# 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
+# file COPYING for more details.
+# 
+# You should have received a copy of the GNU General Public
+# License along with this program; if not, write to the Amahi
+# team at http://www.amahi.org/ under "Contact Us."
+
+# web based installer front end
+
+use strict;
+use Getopt::Std;
+
+our($opt_f, $opt_h, $opt_q);
+getopts('fhq');
+
+my $LOG = "/tmp/amahi-ruby-install.log";
+
+sub fork_it {
+
+	my $pid = fork;
+	if ($pid < 0) {
+		print STDERR "ERROR: can not fork/detach ($!)\n";
+		exit -1;
+	} elsif ($pid) {
+		# parent simply exit
+		exit 0;
+	}
+	# chil continues execution
+	$SIG{'CHLD'}   = 'DEFAULT';
+	open(STDOUT, ">$LOG");
+	open(STDERR, ">$LOG");
+	open(STDIN,  "</dev/null");
+}
+
+
+sub do_system_multiple () {
+	my $args = shift;
+
+	# attempt the install at most this times
+	my $times = 10;
+	my $res = 0;
+	my $i = 0;
+
+	foreach (1..$times) {
+		last unless ($res = system ($args . " &> $LOG"));
+	}
+
+	return $res;
+}
+
+sub do_basic_checks {
+	$ENV{PATH} .= ":/sbin:/usr/sbin:/bin";
+	my $ruid = $<;
+	my $euid = $>;
+
+	if ($opt_h) {
+		printf "usage: amahi-installer [-f|-h]\n";
+		printf "\t -h  - help\n";
+		printf "\t -f  - force\n";
+		exit (1);
+	}
+	if ($euid != 0) {
+		printf "ERROR: this program must be run as \"root\". type \"su\" (to Switch User to root),\n";
+		printf "       then input your root password, then run this program again.\n\n";
+		printf "       \$ su\n";
+		printf "       Password:         (enter your root password)\n";
+		exit (1);
+	}
+	if (-e "/etc/amahi-hda") {
+		if ($opt_f) {
+			printf "WARNING: this system is already intialized for Amahi use\n";
+		} else {
+			# exit silently
+			printf ": this system is already intialized for Amahi use. (use -f to force at your own risk)\n" unless ($opt_q);
+			exit (0);
+		}
+	}
+}
+
+sub installed () {
+	my $pkg = shift;
+
+	return (system("dpkg -s $pkg &> /dev/null") == 0);
+}
+
+&do_basic_checks();
+
+printf "Starting the Amahi web-based installer (this may take a while) ...\n" unless ($opt_q);
+
+#have to install monit here
+#sets the apt-get installer to not go interactive if ncurses fires up
+&do_system_multiple("export DEBIAN_FRONTEND=noninteractive");
+&do_system_multiple("apt-get -y install monit");
+&do_system_multiple("apt-get -y install ruby");
+&do_system_multiple("apt-get -y install libmysql-ruby");
+&do_system_multiple("apt-get -y install libgemplugin-ruby");
+&do_system_multiple("apt-get -y install libopenssl-ruby");
+&do_system_multiple("gem install --no-ri --no-rdoc --version 0.9.4 sinatra");
+
+
+unless ($opt_q) {
+	# quiet mode
+	printf "Access it at this URL (Shift-Control-Click on the link):\n\n";
+	printf "\thttp://localhost:2000\n\n";
+	printf "For help:\n";
+	printf "\t- visit http://talk.amahi.org for live community help\n";
+	printf "\t- look for errors at the bottom of /root/hda-install.log\n";
+	printf "\t- paste any errors in http://paste.amahi.org/\n";
+	printf "\t- if you think it's a bug, file a bug in http://bugs.amahi.org/\n";
+}
+
+&fork_it;
+
+exec "ruby /usr/share/hdactl/web-installer/install-server &> $LOG";

=== added file 'platform/hdactl/amahi-installer.metainit'
--- platform/hdactl/amahi-installer.metainit	1970-01-01 00:00:00 +0000
+++ platform/hdactl/amahi-installer.metainit	2010-08-08 06:35:52 +0000
@@ -0,0 +1,7 @@
+Short-Description: Amahi Install Controller
+Description: amahi-installer controls the installation of the Amahi platform.
+Exec: /usr/bin/amahi-installer
+Required-Start: $syslog $time $local_fs $remote_fs $network $named
+Required-Stop: 
+Prestart-Hook: echo "Starting amahi-installer";
+Poststop-Hook: echo "Stopped amahi-installer";

=== modified symlink 'platform/hdactl/debian/amahi-installer.init' (properties changed: -x to +x)
=== target was u'../amahi-installer.initscript'
--- platform/hdactl/debian/amahi-installer.init	1970-01-01 00:00:00 +0000
+++ platform/hdactl/debian/amahi-installer.init	2010-08-08 06:35:52 +0000
@@ -0,0 +1,117 @@
+#! /bin/sh
+#
+# This a generated file. DO NOT EDIT THIS FILE!
+# If you want to modify how this file works, please
+# modify /etc/metainit/amahi-installer.metainit and re-run update-metainit.
+#
+# If you are sure that you want to modify this file,
+# remove this comment, and update-metainit will not override
+# this script any more.
+#
+### BEGIN INIT INFO
+# Provides:          amahi-installer
+# Default-Start:     
+# Default-Stop:      1 2 3 4 5
+# Short-Description: Amahi Install Controller
+# Required-Start:   $syslog $time $local_fs $remote_fs $network $named
+# Required-Stop:     
+# Description:       amahi-installer controls the installation of the Amahi platform.
+
+### END INIT INFO
+
+# PATH should only include /usr/* if it runs after the mountnfs.sh script
+PATH=/sbin:/usr/sbin:/bin:/usr/bin
+DESC=Amahi\ Install\ Controller
+NAME=amahi\-installer
+DAEMON=/usr/bin/amahi-installer
+BASENAME=amahi-installer
+DAEMON_ARGS=
+PIDFILE=/var/run/$NAME.pid
+SCRIPTNAME=/etc/init.d/$NAME
+# Exit if the package is not installed
+[ -x "$DAEMON" ] || exit 5
+
+# Load the VERBOSE setting and other rcS variables
+. /lib/init/vars.sh
+
+# Define LSB log_* functions.
+# Depend on lsb-base (>= 3.0-6) to ensure that this file is present.
+. /lib/lsb/init-functions
+
+#
+# Function that starts the daemon/service
+#
+do_start()
+{
+	echo "Starting amahi-installer";
+	start-stop-daemon --start --oknodo --background --quiet --make-pidfile --pidfile $PIDFILE --exec $DAEMON -- \
+		$DAEMON_ARGS || return 1
+}
+
+#
+# Function that stops the daemon/service
+#
+do_stop()
+{
+	start-stop-daemon --stop --oknodo --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE --name $BASENAME
+	RETVAL="$?"
+
+	rm -f $PIDFILE
+
+	return $RETVAL
+	echo "Stopped amahi-installer";
+	return "$RETVAL"
+}
+
+#
+# Function that sends a SIGHUP to the daemon/service
+#
+do_reload() {
+	start-stop-daemon --stop --signal 1 --quiet --pidfile $PIDFILE --name $NAME
+	return 0
+}
+
+case "$1" in
+  start)
+	[ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC" "$NAME"
+	do_start
+    log_end_msg $?
+	;;
+  stop)
+	[ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME"
+	do_stop
+    log_end_msg $?
+	;;
+  #reload|force-reload)
+	#
+	# If do_reload() is not implemented then leave this commented out
+	# and leave 'force-reload' as an alias for 'restart'.
+	#
+	#log_daemon_msg "Reloading $DESC" "$NAME"
+	#do_reload
+	#log_end_msg $?
+	#;;
+  restart|force-reload)
+	#
+	# If the "reload" option is implemented then remove the
+	# 'force-reload' alias
+	#
+	log_daemon_msg "Restarting $DESC" "$NAME"
+	do_stop
+	case "$?" in
+	  0)
+		do_start
+        log_end_msg "$?"
+		;;
+	  *)
+	  	# Failed to stop
+		log_end_msg 1
+		;;
+	esac
+	;;
+  *)
+	#echo "Usage: $SCRIPTNAME {start|stop|restart|reload|force-reload}" >&2
+	echo "Usage: $SCRIPTNAME {start|stop|restart|force-reload}" >&2
+	exit 3
+	;;
+esac

=== modified file 'platform/hdactl/debian/changelog'
--- platform/hdactl/debian/changelog	2010-03-24 05:38:42 +0000
+++ platform/hdactl/debian/changelog	2010-08-08 06:35:52 +0000
@@ -1,3 +1,40 @@
+hdactl (3.2.2ubuntu6) lucid; urgency=low
+
+  * More merge fixes
+
+ -- Cale Cunningham <[e-mail]>  Sun, 08 Aug 2010 01:25:13 -0500
+
+hdactl (3.2.2ubuntu5) lucid; urgency=low
+
+  * Fixed typos.
+
+ -- Cale Cunningham <[e-mail]>  Sat, 07 Aug 2010 20:16:57 -0500
+
+hdactl (3.2.2ubuntu4) lucid; urgency=low
+
+  * Massive Merge Changes. Experimental.
+
+ -- Cale Cunningham <[e-mail]>  Tue, 06 Jul 2010 02:27:20 -0500
+
+hdactl (3.2.2ubuntu3) lucid; urgency=low
+
+  * More renamed packages caused breakage.
+
+ -- Cale Cunningham <[e-mail]>  Mon, 14 Jun 2010 20:02:03 -0500
+
+hdactl (3.2.2ubuntu2) lucid; urgency=low
+
+  * Changed from old racc1.8 to new racc package.
+
+ -- Cale Cunningham <[e-mail]>  Sun, 13 Jun 2010 23:49:27 -0500
+
+hdactl (3.2.2ubuntu1) lucid; urgency=low
+
+  * Made a lot of changes and returned to original filetree.
+  * Debian Standard Format!
+
+ -- Cale Cunningham <[e-mail]>  Tue, 01 Jun 2010 21:01:55 -0500
+
 hdactl (3.2.2) unstable; urgency=low
 
   * Fixed init bug.
@@ -21,7 +58,7 @@
   * Updated makefile to run debuild with -us -uc command to disable package signing.
   * Updated control to reflect that Amahi Developers are the packager. 
 
- -- Kyle Law (Anzenketh)  <[e-mail]>  Fri, 19 Mar 2010 00:39:08 -0600
+ -- Kyle Law <[e-mail]>  Fri, 19 Mar 2010 00:39:08 -0600
 
 hdactl (2.40-1) unstable; urgency=low
 

=== modified file 'platform/hdactl/debian/control'
--- platform/hdactl/debian/control	2010-03-24 05:38:42 +0000
+++ platform/hdactl/debian/control	2010-08-08 06:35:52 +0000
@@ -2,14 +2,13 @@
 Section: web
 Priority: extra
 Maintainer: Amahi Developers <[e-mail]>
-XSBC-Original-Maintainer: Amahi Developers <[e-mail]>
 Build-Depends: debhelper (>= 7)
 Standards-Version: 3.8.0
 Homepage: http://www.amahi.org/
 
 Package: hdactl
-Architecture: any 
-Depends: chkconfig,bind9utils,openvpn,dhcp3-server,mysql-server,samba,apache2,monit,libauthen-pam-perl,ruby,libdbd-mysql-ruby,libroot-ruby-dev,eruby,libaugeas-ruby,irb,libdb-ruby1.8,libracc-runtime-ruby,rdoc,ri1.8,php5-mysql,php5,cadaver,liburi-perl,libwww-perl,rubygems
+Architecture: all
+Depends: chkconfig,bind9utils,openvpn,dhcp3-server,samba,apache2,monit,libauthen-pam-perl,ruby,libdbd-mysql-ruby,libroot-ruby-dev,eruby,libaugeas-ruby,irb,libdb-ruby1.8,libracc-runtime-ruby,rdoc,ri1.8,php5,cadaver,liburi-perl,libwww-perl,rubygems,build-essential
 Description: Amahi Home Digital Assistant daemon
  The Amahi Home Server is more than what you'd expect from a GNU/Linux
  home server. We call it "Home Digital Assistant" or HDA.  The Amahi

=== modified file 'platform/hdactl/debian/copyright'
--- platform/hdactl/debian/copyright	2010-03-20 03:39:16 +0000
+++ platform/hdactl/debian/copyright	2010-08-08 06:35:52 +0000
@@ -1,4 +1,4 @@
-Packaged by Carlos Puchol and Kyle Law from an original attempt
+Packaged by Carlos Puchol, Kyle Law and Cale Cunningham from an original attempt
 by Praveen Kumar.
 
 Upstream Author(s):

=== added file 'platform/hdactl/debian/dirs'
--- platform/hdactl/debian/dirs	1970-01-01 00:00:00 +0000
+++ platform/hdactl/debian/dirs	2010-08-08 06:35:52 +0000
@@ -0,0 +1,14 @@
+/etc/openvpn/amahi
+/var/hda
+/var/hda/calendar
+/var/hda/calendar/html
+/var/hda/calendar/locks
+/var/hda/calendar/logs
+/var/hda/files/books
+/var/hda/files/movies
+/var/hda/files/music
+/var/hda/files/pictures
+/var/hda/files/docs
+/var/hda/files/backups
+/var/hda/wiki
+/var/hda/wiki/logs

=== added symlink 'platform/hdactl/debian/hda-update.cron.hourly'
=== target is u'../hda-update'
=== removed symlink 'platform/hdactl/debian/hda-update.hda-update.cron.hourly'
=== target was u'../hda-update'
=== removed file 'platform/hdactl/debian/hdactl.amahi-installer.init'
--- platform/hdactl/debian/hdactl.amahi-installer.init	2010-03-24 05:38:42 +0000
+++ platform/hdactl/debian/hdactl.amahi-installer.init	1970-01-01 00:00:00 +0000
@@ -1,155 +0,0 @@
-#! /bin/sh
-### BEGIN INIT INFO
-# Provides:          amhi-installer
-# Required-Start:    $remote_fs $syslog $networking
-# Required-Stop:     $remote_fs $syslog
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Short-Description: Amahi Installer init script
-# Description:       This starts the amahi-installer script based upon skeliton
-### END INIT INFO
-
-# Author: Amahi Team [e-mail]
-#
-
-# Do NOT "set -e"
-
-# PATH should only include /usr/* if it runs after the mountnfs.sh script
-PATH=/sbin:/usr/sbin:/bin:/usr/bin
-DESC="Starts the amahi-installer"
-NAME=amahi-installer
-DAEMON=/usr/sbin/$NAME
-DAEMON_ARGS="--options args"
-PIDFILE=/var/run/$NAME.pid
-SCRIPTNAME=/etc/init.d/$NAME
-
-# Exit if the package is not installed
-[ -x "$DAEMON" ] || exit 0
-
-# Read configuration variable file if it is present
-[ -r /etc/default/$NAME ] && . /etc/default/$NAME
-
-# Load the VERBOSE setting and other rcS variables
-. /lib/init/vars.sh
-
-# Define LSB log_* functions.
-# Depend on lsb-base (>= 3.0-6) to ensure that this file is present.
-. /lib/lsb/init-functions
-
-#
-# Function that starts the daemon/service
-#
-do_start()
-{
-	# Return
-	#   0 if daemon has been started
-	#   1 if daemon was already running
-	#   2 if daemon could not be started
-	start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON --test > /dev/null \
-		|| return 1
-	start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON -- \
-		$DAEMON_ARGS \
-		|| return 2
-	# Add code here, if necessary, that waits for the process to be ready
-	# to handle requests from services started subsequently which depend
-	# on this one.  As a last resort, sleep for some time.
-}
-
-#
-# Function that stops the daemon/service
-#
-do_stop()
-{
-	# Return
-	#   0 if daemon has been stopped
-	#   1 if daemon was already stopped
-	#   2 if daemon could not be stopped
-	#   other if a failure occurred
-	start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE --name $NAME
-	RETVAL="$?"
-	[ "$RETVAL" = 2 ] && return 2
-	# Wait for children to finish too if this is a daemon that forks
-	# and if the daemon is only ever run from this initscript.
-	# If the above conditions are not satisfied then add some other code
-	# that waits for the process to drop all resources that could be
-	# needed by services started subsequently.  A last resort is to
-	# sleep for some time.
-	start-stop-daemon --stop --quiet --oknodo --retry=0/30/KILL/5 --exec $DAEMON
-	[ "$?" = 2 ] && return 2
-	# Many daemons don't delete their pidfiles when they exit.
-	rm -f $PIDFILE
-	return "$RETVAL"
-}
-
-#
-# Function that sends a SIGHUP to the daemon/service
-#
-do_reload() {
-	#
-	# If the daemon can reload its configuration without
-	# restarting (for example, when it is sent a SIGHUP),
-	# then implement that here.
-	#
-	start-stop-daemon --stop --signal 1 --quiet --pidfile $PIDFILE --name $NAME
-	return 0
-}
-
-case "$1" in
-  start)
-	[ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC" "$NAME"
-	do_start
-	case "$?" in
-		0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
-		2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
-	esac
-	;;
-  stop)
-	[ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME"
-	do_stop
-	case "$?" in
-		0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
-		2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
-	esac
-	;;
-  status)
-       status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $?
-       ;;
-  #reload|force-reload)
-	#
-	# If do_reload() is not implemented then leave this commented out
-	# and leave 'force-reload' as an alias for 'restart'.
-	#
-	#log_daemon_msg "Reloading $DESC" "$NAME"
-	#do_reload
-	#log_end_msg $?
-	#;;
-  restart|force-reload)
-	#
-	# If the "reload" option is implemented then remove the
-	# 'force-reload' alias
-	#
-	log_daemon_msg "Restarting $DESC" "$NAME"
-	do_stop
-	case "$?" in
-	  0|1)
-		do_start
-		case "$?" in
-			0) log_end_msg 0 ;;
-			1) log_end_msg 1 ;; # Old process is still running
-			*) log_end_msg 1 ;; # Failed to start
-		esac
-		;;
-	  *)
-		# Failed to stop
-		log_end_msg 1
-		;;
-	esac
-	;;
-  *)
-	#echo "Usage: $SCRIPTNAME {start|stop|restart|reload|force-reload}" >&2
-	echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2
-	exit 3
-	;;
-esac
-
-:

=== removed file 'platform/hdactl/debian/hdactl.dirs'
--- platform/hdactl/debian/hdactl.dirs	2010-03-20 13:12:40 +0000
+++ platform/hdactl/debian/hdactl.dirs	1970-01-01 00:00:00 +0000
@@ -1,17 +0,0 @@
-/etc/openvpn/amahi
-
-/var/hda/calendar
-/var/hda/calendar/html
-/var/hda/calendar/locks
-/var/hda/calendar/logs
-
-/var/hda/files/books
-/var/hda/files/movies
-/var/hda/files/music
-/var/hda/files/pictures
-/var/hda/files/docs
-/var/hda/files/backups
-
-
-/var/hda/wiki
-/var/hda/wiki/logs

=== removed file 'platform/hdactl/debian/hdactl.hdactl.init'
--- platform/hdactl/debian/hdactl.hdactl.init	2010-03-24 05:38:42 +0000
+++ platform/hdactl/debian/hdactl.hdactl.init	1970-01-01 00:00:00 +0000
@@ -1,154 +0,0 @@
-#! /bin/sh
-### BEGIN INIT INFO
-# Provides:          $hdactl
-# Required-Start:    $remote_fs $syslog $networking
-# Required-Stop:     $remote_fs $syslog
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Short-Description: Example initscript
-# Description:       This file should be used to construct scripts to be
-#                    placed in /etc/init.d.
-### END INIT INFO
-
-# Author: Amahi Debian Packaging team
-# Do NOT "set -e"
-
-# PATH should only include /usr/* if it runs after the mountnfs.sh script
-PATH=/sbin:/usr/sbin:/bin:/usr/bin
-DESC="Starts the HDACTL Deamon"
-NAME=hdactl
-DAEMON=/usr/sbin/$NAME
-DAEMON_ARGS="--options args"
-PIDFILE=/var/run/$NAME.pid
-SCRIPTNAME=/etc/init.d/$NAME
-
-# Exit if the package is not installed
-[ -x "$DAEMON" ] || exit 0
-
-# Read configuration variable file if it is present
-[ -r /etc/default/$NAME ] && . /etc/default/$NAME
-
-# Load the VERBOSE setting and other rcS variables
-. /lib/init/vars.sh
-
-# Define LSB log_* functions.
-# Depend on lsb-base (>= 3.0-6) to ensure that this file is present.
-. /lib/lsb/init-functions
-
-#
-# Function that starts the daemon/service
-#
-do_start()
-{
-	# Return
-	#   0 if daemon has been started
-	#   1 if daemon was already running
-	#   2 if daemon could not be started
-	start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON --test > /dev/null \
-		|| return 1
-	start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON -- \
-		$DAEMON_ARGS \
-		|| return 2
-	# Add code here, if necessary, that waits for the process to be ready
-	# to handle requests from services started subsequently which depend
-	# on this one.  As a last resort, sleep for some time.
-}
-
-#
-# Function that stops the daemon/service
-#
-do_stop()
-{
-	# Return
-	#   0 if daemon has been stopped
-	#   1 if daemon was already stopped
-	#   2 if daemon could not be stopped
-	#   other if a failure occurred
-	start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE --name $NAME
-	RETVAL="$?"
-	[ "$RETVAL" = 2 ] && return 2
-	# Wait for children to finish too if this is a daemon that forks
-	# and if the daemon is only ever run from this initscript.
-	# If the above conditions are not satisfied then add some other code
-	# that waits for the process to drop all resources that could be
-	# needed by services started subsequently.  A last resort is to
-	# sleep for some time.
-	start-stop-daemon --stop --quiet --oknodo --retry=0/30/KILL/5 --exec $DAEMON
-	[ "$?" = 2 ] && return 2
-	# Many daemons don't delete their pidfiles when they exit.
-	rm -f $PIDFILE
-	return "$RETVAL"
-}
-
-#
-# Function that sends a SIGHUP to the daemon/service
-#
-do_reload() {
-	#
-	# If the daemon can reload its configuration without
-	# restarting (for example, when it is sent a SIGHUP),
-	# then implement that here.
-	#
-	start-stop-daemon --stop --signal 1 --quiet --pidfile $PIDFILE --name $NAME
-	return 0
-}
-
-case "$1" in
-  start)
-	[ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC" "$NAME"
-	do_start
-	case "$?" in
-		0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
-		2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
-	esac
-	;;
-  stop)
-	[ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME"
-	do_stop
-	case "$?" in
-		0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
-		2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
-	esac
-	;;
-  status)
-       status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $?
-       ;;
-  #reload|force-reload)
-	#
-	# If do_reload() is not implemented then leave this commented out
-	# and leave 'force-reload' as an alias for 'restart'.
-	#
-	#log_daemon_msg "Reloading $DESC" "$NAME"
-	#do_reload
-	#log_end_msg $?
-	#;;
-  restart|force-reload)
-	#
-	# If the "reload" option is implemented then remove the
-	# 'force-reload' alias
-	#
-	log_daemon_msg "Restarting $DESC" "$NAME"
-	do_stop
-	case "$?" in
-	  0|1)
-		do_start
-		case "$?" in
-			0) log_end_msg 0 ;;
-			1) log_end_msg 1 ;; # Old process is still running
-			*) log_end_msg 1 ;; # Failed to start
-		esac
-		;;
-	  *)
-		# Failed to stop
-		log_end_msg 1
-		;;
-	esac
-	;;
-  *)
-	#echo "Usage: $SCRIPTNAME {start|stop|restart|reload|force-reload}" >&2
-	echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2
-	exit 3
-	;;
-esac
-
-:

=== modified symlink 'platform/hdactl/debian/hdactl.init' (properties changed: -x to +x)
=== target was u'../hdactl.initscript.debian'
--- platform/hdactl/debian/hdactl.init	1970-01-01 00:00:00 +0000
+++ platform/hdactl/debian/hdactl.init	2010-08-08 06:35:52 +0000
@@ -0,0 +1,117 @@
+#! /bin/sh
+#
+# This a generated file. DO NOT EDIT THIS FILE!
+# If you want to modify how this file works, please
+# modify /etc/metainit/hdactl.metainit and re-run update-metainit.
+#
+# If you are sure that you want to modify this file,
+# remove this comment, and update-metainit will not override
+# this script any more.
+#
+### BEGIN INIT INFO
+# Provides:          hdactl
+# Default-Start:     2 3 4 5
+# Default-Stop:      1
+# Short-Description: Amahi Network Controller
+# Required-Start:   $syslog $time $local_fs $remote_fs $network $named
+# Required-Stop:     
+# Description:       hdactl is a program designed to provide network information for the whole of the Amahi platform.
+
+### END INIT INFO
+
+# PATH should only include /usr/* if it runs after the mountnfs.sh script
+PATH=/sbin:/usr/sbin:/bin:/usr/bin
+DESC=Amahi\ Network\ Controller
+NAME=hdactl
+DAEMON=/usr/bin/hdactl
+BASENAME=hdactl
+DAEMON_ARGS=
+PIDFILE=/var/run/$NAME.pid
+SCRIPTNAME=/etc/init.d/$NAME
+# Exit if the package is not installed
+[ -x "$DAEMON" ] || exit 5
+
+# Load the VERBOSE setting and other rcS variables
+. /lib/init/vars.sh
+
+# Define LSB log_* functions.
+# Depend on lsb-base (>= 3.0-6) to ensure that this file is present.
+. /lib/lsb/init-functions
+
+#
+# Function that starts the daemon/service
+#
+do_start()
+{
+	echo "Starting hdactl";
+	start-stop-daemon --start --oknodo --background --quiet --make-pidfile --pidfile $PIDFILE --exec $DAEMON -- \
+		$DAEMON_ARGS || return 1
+}
+
+#
+# Function that stops the daemon/service
+#
+do_stop()
+{
+	start-stop-daemon --stop --oknodo --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE --name $BASENAME
+	RETVAL="$?"
+
+	rm -f $PIDFILE
+
+	return $RETVAL
+	echo "Stopped hdactl";
+	return "$RETVAL"
+}
+
+#
+# Function that sends a SIGHUP to the daemon/service
+#
+do_reload() {
+	start-stop-daemon --stop --signal 1 --quiet --pidfile $PIDFILE --name $NAME
+	return 0
+}
+
+case "$1" in
+  start)
+	[ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC" "$NAME"
+	do_start
+    log_end_msg $?
+	;;
+  stop)
+	[ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME"
+	do_stop
+    log_end_msg $?
+	;;
+  #reload|force-reload)
+	#
+	# If do_reload() is not implemented then leave this commented out
+	# and leave 'force-reload' as an alias for 'restart'.
+	#
+	#log_daemon_msg "Reloading $DESC" "$NAME"
+	#do_reload
+	#log_end_msg $?
+	#;;
+  restart|force-reload)
+	#
+	# If the "reload" option is implemented then remove the
+	# 'force-reload' alias
+	#
+	log_daemon_msg "Restarting $DESC" "$NAME"
+	do_stop
+	case "$?" in
+	  0)
+		do_start
+        log_end_msg "$?"
+		;;
+	  *)
+	  	# Failed to stop
+		log_end_msg 1
+		;;
+	esac
+	;;
+  *)
+	#echo "Usage: $SCRIPTNAME {start|stop|restart|reload|force-reload}" >&2
+	echo "Usage: $SCRIPTNAME {start|stop|restart|force-reload}" >&2
+	exit 3
+	;;
+esac

=== removed file 'platform/hdactl/debian/hdactl.install'
--- platform/hdactl/debian/hdactl.install	2010-03-29 10:17:37 +0000
+++ platform/hdactl/debian/hdactl.install	1970-01-01 00:00:00 +0000
@@ -1,29 +0,0 @@
-# NOTE (praveen, 2009-06-14): Not including hdactl hda-install.
-#Installing init.d scripts this way due to running chkconfig in post inst
-
-hdactl		        /usr/bin
-hda-install		/usr/bin
-hda-new-install		/usr/bin
-hda-settings            /usr/bin
-hda-alias               /usr/bin
-hda-install-file        /usr/bin
-hda-register-apps       /usr/bin
-hda-change-gw 		/usr/bin
-hda-change-dns		/usr/bin
-amahi-installer		/usr/bin
-hda-php-zone-change	/usr/bin
-hda-install-gem         /usr/bin
-#hdactrl_hup		/usr/bin
-# hdactrl.initscript.debian is being handled by dh_installinit dh $@ Calls dh_installinit
-hdactl.sysconfig 	/etc/sysconfig
-amahi-hda               /usr/share/hdactl
-# amahi-installer.initscript is being handled by dh_installinit dh $@ Calls dh_installinit
-# Need to research how to install desktop icons should be
-web-installer		/usr/share/hdactl
-httpd                   /usr/share/hdactl
-samba                   /usr/share/hdactl
-vpn                     /usr/share/hdactl
-monit.conf              /usr/share/hdactl
-
-
-

=== removed file 'platform/hdactl/debian/hdactl.postinst'
--- platform/hdactl/debian/hdactl.postinst	2010-03-24 05:38:42 +0000
+++ platform/hdactl/debian/hdactl.postinst	1970-01-01 00:00:00 +0000
@@ -1,46 +0,0 @@
-#!/bin/sh
-# -*- shell-script -*-
-# postinst script for hda-platform
-#
-# see: dh_installdeb(1)
-
-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
-
-
-case "$1" in
-    configure)
-        echo "Configuring shares"
-	chgrp users /var/hda/files/docs
-	chgrp users /var/hda/files/pictures
-	chgrp users /var/hda/files/music
-	chgrp users /var/hda/files/movies
-	chgrp users /var/hda/files/books
-	;;
-
-    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

=== removed file 'platform/hdactl/debian/hdactl.templates'
=== added file 'platform/hdactl/debian/install'
--- platform/hdactl/debian/install	1970-01-01 00:00:00 +0000
+++ platform/hdactl/debian/install	2010-08-08 06:35:52 +0000
@@ -0,0 +1,29 @@
+# NOTE (praveen, 2009-06-14): Not including hdactl hda-install.
+#Installing init.d scripts this way due to running chkconfig in post inst
+
+hdactl.debian	        /usr/bin
+hda-install		/usr/bin
+hda-new-install		/usr/bin
+hda-settings            /usr/bin
+hda-alias               /usr/bin
+hda-install-file        /usr/bin
+hda-register-apps       /usr/bin
+hda-change-gw 		/usr/bin
+hda-change-dns		/usr/bin
+amahi-installer.debian		/usr/bin
+hda-php-zone-change	/usr/bin
+hda-install-gem         /usr/bin
+#hdactrl-hup		/usr/bin
+#hdactrl.initscript      /etc/init.d/
+hdactl.sysconfig 	/etc/
+amahi-hda               /usr/share/hdactl
+#amahi-installer.initscript	/etc/init.d/
+# Need to research how to install desktop icons should be
+web-installer		/usr/share/hdactl
+httpd                   /usr/share/hdactl
+samba                   /usr/share/hdactl
+vpn                     /usr/share/hdactl
+monit.conf              /usr/share/hdactl
+
+
+

=== added file 'platform/hdactl/debian/postinst'
--- platform/hdactl/debian/postinst	1970-01-01 00:00:00 +0000
+++ platform/hdactl/debian/postinst	2010-08-08 06:35:52 +0000
@@ -0,0 +1,51 @@
+#!/bin/sh
+# -*- shell-script -*-
+# postinst script for hda-platform
+#
+# see: dh_installdeb(1)
+
+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
+
+
+case "$1" in
+    configure)
+        echo "Configuring daemons..."
+	chgrp users /var/hda/files/backups
+	chgrp users /var/hda/files/books
+	chgrp users /var/hda/files/docs
+	chgrp users /var/hda/files/movies
+	chgrp users /var/hda/files/music
+	chgrp users /var/hda/files/pictures
+	mv /usr/bin/hdactl.debian /usr/bin/hdactl
+	mv /usr/bin/amahi-installer.debian /usr/bin/amahi-installer
+	echo "Please reboot after install!"
+	echo "Please ignore if the package doesn't say it installed correctly"
+	;;
+
+    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 'platform/hdactl/debian/preinst'
--- platform/hdactl/debian/preinst	1970-01-01 00:00:00 +0000
+++ platform/hdactl/debian/preinst	2010-08-08 06:35:52 +0000
@@ -0,0 +1,10 @@
+#!/bin/sh
+# -*- shell-script -*-
+# preinst script for hdactl
+#
+# see: dh_installdeb(1)
+
+#Yes. Seriously. This is all I need to do.
+export DEBIAN_FRONTEND=noninteractive
+
+exit 0

=== modified file 'platform/hdactl/debian/rules'
--- platform/hdactl/debian/rules	2010-03-24 05:38:42 +0000
+++ platform/hdactl/debian/rules	2010-08-08 06:35:52 +0000
@@ -5,10 +5,12 @@
 
 override_dh_auto_build:
 	make hdactl-hup
-	mv $(CURDIR)/hdactl.debian $(CURDIR)/hdactl
-	mv $(CURDIR)/hda-install.debian $(CURDIR)/hda-install
-	dh_auto_install
+	#ignore these lines for now, since they'll be merged anyways
+	#mv $(CURDIR)/hdactl.debian $(CURDIR)/hdactl
+	#mv $(CURDIR)/hda-install.debian $(CURDIR)/hda-install
+	make donothing
 override_dh_installinit:
-	dh_installinit --no-start --name=hdactl
-	dh_installinit --no-start --name=amahi-installer
-
+	dh_installinit --name=hdactl
+	dh_installinit --name=amahi-installer
+override_dh_auto_install:
+	make donothing

=== added file 'platform/hdactl/debian/templates'
=== modified file 'platform/hdactl/hda-new-install'
--- platform/hdactl/hda-new-install	2010-06-28 23:13:33 +0000
+++ platform/hdactl/hda-new-install	2010-08-08 06:35:52 +0000
@@ -301,6 +301,32 @@
 	puts "Network services started."
 end
 
+def do_restart_network_ubuntu
+	puts "Restarting the network ..."
+	do_system_silent "chkconfig network-manager off"
+	do_system_silent "service network-manager stop"
+	#do_system_silent "killall dhclient"
+	sleep 1
+	# generate the conf files
+	do_system_silent "service hdactl start"
+	# stop the net and related services
+	do_system_silent "service networking stop"
+	sleep 1
+	do_system_silent "service bind9 stop"
+	#do_system_silent "service named stop"
+	sleep 1
+	do_system_silent "service networking start"
+	puts "Network restart done."
+	sleep 1
+	puts "Starting network services ..."
+	do_system_silent "service hdactl stop"
+	sleep 1
+	do_system_silent "service hdactl start"
+	sleep 2
+	do_system_silent "service apache2 start"
+	puts "Network services started."
+end
+
 def do_samba
 	puts "Configuring Samba ... "
 	substitute "/usr/share/hdactl/samba/", "/etc/samba/"
@@ -328,6 +354,14 @@
 	puts "HTTPD install done."
 end
 
+def do_httpd_ubuntu
+	puts "Installing httpd ... "
+	substitute "/usr/share/hdactl/httpd/", "/etc/apache2/sites-enabled/"
+	do_system_silent "a2enmod rewrite dav dav_fs dav_lock"
+	do_system_silent "rm -f /etc/apache2/sites-enabled/000-default"
+	puts "HTTPD install done."
+end
+
 def start_all_services
 	puts "Starting services ... "
 
@@ -358,6 +392,31 @@
 	puts "Stopping unused services done."
 end
 
+def start_all_services_ubuntu
+	puts "Starting services ... "
+
+	# NOTE: monit must be the last one, to prevent race conditions
+	services_start = [ 'hdactl', 'ddclient', 'apache2', 'bind9', 'networking',
+	'mysql', 'smb', 'nmb', 'monit', 'openvpn', 'hddtemp']
+	services_stop = [ 'gpm', 'hplip', 'isdn', 'kudzu', 'sendmail',
+		'unattended-upgrades', 'dhcrelay', 'ldap', 'ufw',
+	'network-manager']
+
+	services_start.each do |service|
+		system "chkconfig --levels 2345 #{service} on 2>&1"
+	end
+
+	puts "Services started."
+
+	puts "Stopping and disabling unused services ... "
+	services_stop.each do |service|
+		system "chkconfig --levels 2345 #{service} off 2>&1"
+		system "service #{service} stop 2>&1"
+	end
+
+	puts "Stopping unused services done."
+end
+
 def start_service(service)
 	do_system "service #{service} start"
 end
@@ -382,11 +441,15 @@
 # So we need to fix this first!
 def identify_os_broken
 	distro = "Unknown"
-	release = "Unknown"
-	d, r = open("|lsb_release -ir") { |f| f.readlines }
-	distro = $1 if d =~ /Distributor ID:\t(.*)\n$/
-	release = $1 if r =~ /Release:\t(.*)\n$/
-	[distro, release]
+	fhos = File.open("/etc/issue", "r")
+	os = fhos.readline
+	if os["Fedora"]
+		distro = "Fedora"
+	elsif os["Ubuntu"]
+		distro = "Ubuntu"
+	end
+	fhos.close
+	distro
 end
 
 def get_arch
@@ -487,7 +550,8 @@
 
 def setup_default_homepage
 
-	files = Dir.glob "/usr/lib/firefox-*/defaults/preferences/all-redhat.js"
+	files = Dir.glob "/usr/lib/firefox-*/defaults/preferences/all-redhat.js" if identify_os_broken == "Fedora"
+	files = Dir.glob "/usr/lib/firefox-*/defaults/pref/firefox-branding.js" if identify_os_broken == "Ubuntu"
 
 	files.each do |file|
 
@@ -565,7 +629,7 @@
 end
 
 def do_install_gems
-	system "rpm -q rubygem-rails-2.3.4"
+	system "dpkg -s rails"
 	ret = $?
 	if (ret >> 8)
 		# not installed
@@ -601,14 +665,13 @@
 	set = ""
 	rpms.each do |set|
 
-		do_system_silent "killall yum-updatesd"
+		do_system_silent "killall update-notifier"
 		message "\t#{set} ..."
-		puts "YUM INSTALL OF: #{set}";
-		do_system_silent "killall yum-updatesd"
-		do_system_silent "killall yum"
+		puts "APT INSTALL OF: #{set}";
+		do_system_silent "killall update-notifier"
 
-		ret = do_system_multiple("yum -y install #{set}")
-		message "\tWARNING: rpm install failed ... please run\n\tyum -y install #{set}\n\n\tby hand until it installs correctly" unless ret
+		ret = do_system_multiple("apt-get -y install #{set}")
+		message "\tWARNING: apt-get install failed ... please run\n\tapt-get -y install #{set}\n\n\tby hand until it installs correctly" unless ret
 
 	end
 
@@ -848,6 +911,218 @@
 	message "OK. It is strongly recommended that you reboot your HDA ASAP."
 end
 
+def do_full_install_ubuntu(hda)
+
+	selinux_permissive
+
+	if File.exists?("/etc/sysconfig/amahi-hda")
+		# perhaps not a new install, do nothing unless forced
+		unless $OPT["f"]
+			message "ERROR: this appears to be initialized."
+			message "... use option -f to force complete reinstall."
+			exit 1
+		end
+	end
+
+	@gem_list = gem_list
+
+	message "Stopping background software updates ..."
+	# stop background yum to prevent waits
+	do_system_silent "service unattended-upgrades stop"
+	sleep 1
+	do_system_silent "killall unattended-upgrades"
+	sleep 1
+	do_system_silent "killall unattended-upgrades"
+	message "Background software updates stopped"
+
+	setup_default_homepage
+
+	rpms_to_remove = ["gnome-packagekit", "setroubleshoot setroubleshoot-server setroubleshoot-plugins"]
+	rpms_to_remove.each do |rpm|
+		do_system_silent "killall unattended-upgrades"
+		puts "RPM UNINSTALL OF: #{rpm}";
+		ret = do_system_multiple("dpkg -r #{rpm}")
+		message "WARNING: rpm uninstall failed ... please run\n\t   dpkg -r #{rpm}\n\tby hand until it uninstalls correctly" unless ret
+	end
+
+
+	rpms = Array.new
+	#Dropping these since this is Ubuntu
+	#rpms << "fedora-release yum-fastestmirror"
+	rpms << "mysql-server libwww-perl bind9"
+	rpms << "php5 php5-mysql dhcp3-server dhcp3-client openvpn monit libauthen-pam-perl"
+	rpms << "ruby1.8-dev racc irb1.8 ri1.8"
+	rpms << "libdb-ruby1.8 libruby1.8 libruby1.8-extras rdoc1.8 libmysql-ruby1.8"
+	rpms << "eruby liberuby rdoc1.8 hddtemp libaugeas-ruby1.8"
+	rpms << "rubygems1.8 libgemplugin-ruby1.8"
+	rpms << "libvalidatable-ruby1.8 ruby1.8-dev"
+	rpms << "rails rake"
+	# NOTE: these below are needed for F12 and Ubuntu
+	rpms << "rails rake libboost-all-dev"
+	rpms << "libapache2-mod-passenger"
+	rpms << "build-essential"
+
+	#message "Installing required packages (this may take a while depending on your download speed) ... "
+	rpms.each do |set|
+		do_system_silent "killall unattended-updates"
+		do_system_silent "export DEBIAN_FRONTEND=noninteractive"
+		message "Installing #{set} ..."
+		puts "APT INSTALL OF: #{set}";
+		ret = do_system_multiple("apt-get -y -q install #{set}")
+		message "WARNING: rpm install failed ... please run\n\t   apt-get -y install #{set}\n\tby hand until it installs correctly" unless ret
+	end
+
+	message "APT packages installed"
+	
+	#Install rubygems that were missing from repos
+	igems = Array.new
+	igems << "actionmailer"
+	igems << "actionpack"
+	igems << "activerecord"
+	igems << "activeresource"
+	igems << "activesupport"
+	igems << "hoe"
+	igems << "pluginfactory"
+	igems << "rubyforge"
+	igems << "gruff"
+	igems << "gd2"
+	igems << "fastthread"
+	
+	igems.each do |set|
+		message "Installing #{set} rubygem..."
+		install_gem(set,nil)
+	end
+	
+	message "Installing oddball rack 1.0.0..."
+	install_gem("rack","1.0.0")
+	
+	message "Installing rails 2.3.4"
+	install_gem("rails","2.3.4")
+	
+	message "Ruby Gems installed"
+
+	message "Starting MySQL"
+	do_system_silent "service mysql start"
+	sleep 2
+
+	# disable DNSSEC
+	#disable_dnssec
+
+	message "Initializing MySQL"
+
+	# initialize mysql
+	initialize_mysql
+
+	# install stuff for rails
+	# message "Installing Ruby Gems (may take a while depending on your server speed)."
+	# we already did this for ubuntu, commenting out for now
+	#do_install_gems() unless $OPT["r"]
+
+	# initialize rails and database
+	message "Initializing Ruby on Rails and DB"
+	do_system_silent "cd /var/hda/platform/html; rake db:migrate RAILS_ENV=production"
+
+	# update DB with remote data
+	message "Activating your HDA's settings"
+	copy_remote_db_configuration hda
+
+	sleep 1
+
+	# use the HDA data from the local db now
+	db_connect
+
+	# but autoconfigure the network first
+	autoconfigure_network
+
+	message "Initializing settings"
+
+	# load db settings
+	get_db_settings
+
+	message "Setting up watchdog monitor"
+	do_monit
+
+	# set php timezone
+	do_php_timezone
+
+	# instantiate /etc/sysconfig/amahi-hda
+	substitute "/usr/share/hdactl/amahi-hda", "/etc/amahi-hda"
+
+	# lockdown f12 user install of software
+	# not needed in ubuntu, commenting out
+	#do_fedora12_lockdown
+
+	# samba configuration
+	message "Starting SAMBA server ..."
+	do_samba
+
+	# vpn configuration
+	message "Starting VPN server ..."
+	do_vpn
+
+	# http configuration
+	message "Starting HTTP server ..."
+	do_httpd_ubuntu
+	
+
+	# desktop icons - broken for some reason in ubuntu
+	#do_desktop_icons
+
+	# restart the network and the rest of the services
+	message "Restarting the network ..."
+	do_restart_network_ubuntu
+
+	# NOTE: important to do this before the apps are
+	# installed
+	mark_as_installed
+
+	# This is being phased out!
+	# message "Installing HDA apps\n\t(may take a while depending on your download speed)."
+	# install_amahi_apps
+
+	# let the games begin!
+	message "Starting the rest of the services ..."
+	start_all_services_ubuntu
+
+	sleep 2
+
+	#disable_selinux
+
+	#disable_firewall
+
+	do_network_ubuntu
+
+	puts "****************************************************\n"
+	puts "  Amahi installed successfully! Please reboot it!\n"
+	puts "  Amahi installed successfully! Please reboot it!\n"
+	puts "****************************************************\n"
+
+	if $OPT["q"]
+		# indicate we're done to the automated installer
+		message ("Instalation completed! Please reboot your HDA and all your computers!" * 4)
+		return
+	end
+
+	final_message2
+
+	message "\nThe system needs to reboot for your settings to take effect."
+	message "\nWould you like to reboot now? (strongly recommended)? (yes/no)?"
+
+
+	system "reboot" if $OPT["y"]
+
+	resp = $stdin.gets
+
+	if resp != nil
+		if resp =~ /(y|yes)/
+			system "sync; sync; reboot"
+			exit 0 # just in case
+		end
+	end
+
+	message "OK. It is strongly recommended that you reboot your HDA ASAP."
+end
+
 def final_message2
 
 	message "\nCongratulations! Your Amahi HDA is set up!\n"
@@ -961,6 +1236,65 @@
 
 end
 
+def do_network_ubuntu
+
+	message "Configuring your network (eth0)."
+
+	netmask = @settings['netmask']
+	self_address = @settings['self-address']
+	domain = @settings['domain']
+	net = @settings['net']
+	nick = @settings['nick']
+	id = @settings['hda-id']
+	gw = @settings['gateway']
+	dns1 = @settings['external-dns1']
+	dns2 = @settings['external-dns2']
+
+	# do this to prevent NM from overtaking the changes!
+	do_system_silent "service network-manager stop"
+
+	ifcfg = "/etc/network/interfaces"
+
+	ifcfg_fh = nil
+	begin
+
+
+		begin
+			#FIXME:Changed to w+ for OVERWRITE! We may not want to do this!
+			ifcfg_fh = File.new ifcfg, "w+"
+		rescue
+			abort "cannot open file #{ifcfg}: #{$!}"
+		end
+
+		# Fun Ubuntu changes right here. 
+		ifcfg_fh.syswrite "auto eth0 lo\niface lo inet loopback\n\niface eth0 inet static\n"
+		ifcfg_fh.syswrite "address #{net}.#{self_address}\nnetmask #{netmask}\nnetwork #{net}.0\nbroadcast #{net}.255\ngateway #{net}.#{gw}"
+
+	rescue
+		abort "cannot open '#{ifcfg}' for reading: #{$!}"
+	ensure
+		ifcfg_fh.close if ifcfg_fh != nil
+	end
+
+	rslv = "/etc/resolv.conf"
+	rslv_fh = nil
+	begin
+		rslv_fh = File.new rslv, "w"
+		rslv_fh.puts "search #{domain}"
+		rslv_fh.puts "nameserver #{net}.#{self_address}"
+		rslv_fh.puts "nameserver #{dns1}"
+		rslv_fh.puts "nameserver #{dns2}"
+	rescue
+		abort "cannot open '#{rslv}' for writing: #{$!}"
+	ensure
+		rslv_fh.close if rslv_fh != nil
+	end
+
+	# ensure it's readable!
+	File.chmod 0644, rslv
+
+end
+
 def disable_firewall
 
 	message "Disabling firewall.\n"
@@ -1022,7 +1356,7 @@
 	require 'augeas'
 
 	message "Setting up global PHP timezone ..."
-	Augeas::open do |aug|
+	Augeas::open("/",nil,0) do |aug|
 		zone = aug.get("/files/etc/sysconfig/clock/ZONE")
 		#puts "ZONE = #{zone}"
 		# FIXME - we should also record it in the user settings! wether we get it or not from the clock file
@@ -1188,6 +1522,55 @@
 	end
 end
 
+def do_basic_checks_ubuntu
+	ENV["PATH"] += ":/sbin:/usr/sbin:/bin"
+
+	ruid = Process.uid
+	euid = Process.euid
+
+	if euid != 0
+		puts "ERROR: this program must be run as \"root\". type \"su\" (to Switch User to root),"
+		puts "       then input your root password, then do the install again.\n"
+		puts "       \$ su"
+		puts "       Password: (your root password)"
+		puts "       # hda-install YOUR_INSTALL_CODE"
+		exit 1
+	end
+
+	if File.exists?("/etc/amahi-hda")
+		# perhaps not a new install, do nothing unless forced
+		unless $OPT["f"]
+			puts "ERROR: this HDA appears to be installed already."
+			puts "       Remove the file /etc/amahi-hda to force reinstall."
+			exit 1
+		end
+		g = nil
+		begin
+			g =  open('http://www.yahoo.com/').read
+		rescue
+			g = nil
+		end
+
+		unless g
+			(1..3).each do
+				do_system_silent "service monit stop"
+				do_system_silent "service hdactl stop"
+				do_system_silent "service bind9 stop"
+				do_system_silent "killall dhclient"
+				sleep 1
+				do_system_silent "dhclient eth0"
+				sleep 1
+				begin
+					g = open('http://www.yahoo.com/').read
+				rescue
+					g = nil
+				end
+				break if g != nil
+		end
+		end
+	end
+end
+
 def do_fedora12_lockdown
 	# FIXME - make this not apply for other distro releases
 	# as appropriate
@@ -1214,8 +1597,11 @@
 	usage unless ARGV.size > 0
 
 	inst_code = ARGV[0]
+	
+	distrocode = identify_os_broken
 
-	do_basic_checks
+	do_basic_checks if (distrocode = "Fedora")
+	do_basic_checks_ubuntu if (distrocode = "Ubuntu")
 
 	set_standard_out
 
@@ -1242,7 +1628,8 @@
 		return
 	end
 
-	do_full_install inst_code
+	do_full_install inst_code if (distrocode = "Fedora")
+	do_full_install_ubuntu inst_code if (distrocode = "Ubuntu")
 end
 
 main

=== modified file 'platform/hdactl/hda-new-install.debian' (properties changed: +x to -x)
=== modified file 'platform/hdactl/hdactl' (properties changed: +x to -x)
=== modified file 'platform/hdactl/hdactl.debian'
--- platform/hdactl/hdactl.debian	2009-11-27 07:39:21 +0000
+++ platform/hdactl/hdactl.debian	2010-08-08 06:35:52 +0000
@@ -19,8 +19,15 @@
 
 # FIXME only eth0 supported for now - moving to do more
 my $device = "eth0";
-
-my $version = "2.40";
+# To enable DNS resolution secondary via OpenDNS,
+# set the line below to 1
+my $use_opendns_secondary = 0;
+# this is for the very few users with a different netmask
+my $netmask_size = 24;
+
+
+my $version = "3.4.3";
+
 
 my $DATABASE_NAME = "hda_production";
 my $DATABASE_USER = "amahihda";
@@ -33,6 +40,8 @@
 my $period = 600; # run period, in seconds
 my $cmdfile = "/tmp/.hdactl.s";
 
+my $platform = "EE";
+
 ## process args
 my $programd  = $0; 
 $programd =~ s%^.*/%%;
@@ -61,7 +70,7 @@
 my $file_hda = "hda.conf"; # "void" file
 my $file_dhcpd = "dhcpd.conf";
 my $file_resolv = "resolv.conf";
-my $file_ifcfg = "ifcfg-$device";
+my $file_ifcfg = "interfaces";
 
 my $ifcfg_idx = 1;
 my $dump_mode = 0;
@@ -116,7 +125,7 @@
 }
 
 sub get_named_settings {
-	open(my $named, "<", "/etc/sysconfig/named") or return;
+	open(my $named, "<", "/etc/bind") or return;
 
 	while (<$named>) {
 		next if /^\s*#/; # skip options
@@ -154,26 +163,10 @@
 		or &logdie($DBI::errstr);
 }
 
-
 sub db_disconnect {
 	$dbh->disconnect();
 }
 
-sub print_named_conf_hosts {
-	my $file = shift;
-
-	my $sth = $dbh->prepare("SELECT Domain FROM privacies order by Domain");
-	$sth->execute();
-
-	my @row = ();
-	while ( @row = $sth->fetchrow_array ) {
-		printf $file "zone \"%s\" IN { ", $row[0];
-		printf $file "type master; notify no; file \"%s\"; ", $file_hda;
-		printf $file "};\n";
-	}
-	$sth->finish();
-}
-
 sub print_named_conf {
 
 	open(my $hda, ">", $file_named);
@@ -207,13 +200,20 @@
 	printf $hda "# automatically generated file by hdactl\n";
 	printf $hda "options {\n";
 	printf $hda "\tlisten-on-v6 port 53 { ::1; };\n";
-	printf $hda "\tdirectory \"/var/named\";\n";
-	printf $hda "\tdump-file \"/var/named/data/cache_dump.db\";\n";
-	printf $hda "\tstatistics-file \"/var/named/data/named_stats.txt\";\n";
-	printf $hda "\tmemstatistics-file \"/var/named/data/named_mem_stats.txt\";\n";
+	printf $hda "\tdirectory \"/var/cache/bind\";\n";
+	printf $hda "\tdump-file \"/var/cache/bind/cache_dump.db\";\n";
+	printf $hda "\tstatistics-file \"/var/cache/bind/named_stats.txt\";\n";
+	printf $hda "\tmemstatistics-file \"/var/cache/bind/named_mem_stats.txt\";\n";
 	printf $hda "\tforward only;\n";
 	printf $hda "\tforwarders { %s; %s };\n", $extdns1, $extdns2;
 	printf $hda "\tlisten-on port 53 { %s; 127.0.0.1; };\n", $self;
+	printf $hda "\tallow-query { trusted; };\n";
+	printf $hda "};\n";
+
+	printf $hda "acl trusted {\n";
+	printf $hda "\tlocalhost;\n";
+	printf $hda "\t10.8.0.0/24;\n";
+	printf $hda "\t%s/%s;\n", $full_net, $netmask_size;
 	printf $hda "};\n";
 
 	printf $hda "logging {\n";
@@ -244,7 +244,7 @@
 	printf $hda "zone \"%s\" IN {\n", $domain;
         printf $hda "\ttype master;\n";
         printf $hda "\tnotify no;\n";
-        printf $hda "\tfile \"dynamic/%s\";\n", $file_n2a;
+        printf $hda "\tfile \"%s\";\n", $file_n2a;
         printf $hda "\tallow-update { key ddnskey; };\n";
         printf $hda "\tcheck-names ignore;\n";
 	printf $hda "};\n\n";
@@ -253,12 +253,10 @@
 	printf $hda "zone \"%s\" IN {\n", &reverse_net($net);
        	printf $hda "\ttype master;\n";
        	printf $hda "\tnotify no;\n";
-       	printf $hda "\tfile \"dynamic/%s\";\n", $file_a2n;
+       	printf $hda "\tfile \"%s\";\n", $file_a2n;
         printf $hda "\tallow-update { key ddnskey; };\n";
         printf $hda "\tcheck-names ignore;\n";
 	printf $hda "};\n\n";
-
-	&print_named_conf_hosts ($hda);
 }
 
 sub print_void_info {
@@ -272,13 +270,13 @@
 	my $serial = sprintf("%02d%02d%02d%02d%02d", $year, $mon, $mday, $hour, $min);
 
 	printf $void "\$TTL    86400\n";
-	printf $void "@ IN SOA %s. root.%s. (\n", $domain, $domain;
+	printf $void "@ IN SOA hda.%s. root.%s. (\n", $domain, $domain;
         printf $void "\t%s ; Serial\n", $serial;
         printf $void "\t28800   ; Refresh\n";
         printf $void "\t14400   ; Retry\n";
         printf $void "\t3600000 ; Expire\n";
         printf $void "\t86400 ) ; Minimum\n";
-	printf $void "\t\tIN NS %s.\n", $void_host;
+	printf $void "\t\tIN NS hda.%s.\n", $void_host;
 	printf $void "\t\tIN A %s\n", $void_host;
 	printf $void "*\tIN A %s\n", $void_host;
 	printf $void "\n";
@@ -302,6 +300,10 @@
 			$host[$address] = $name;
 		}
 	}
+
+	# Hard-code the hostname for the HDA to 'hda'
+	$host[int($settings{'self-address'})] = "hda";
+
 	$sth->finish();
 }
 
@@ -362,15 +364,15 @@
 	my $net = $settings{'net'};
 
 	printf $name2addr "\$TTL    86400\n";
-	printf $name2addr "@ IN SOA %s. root.%s. (\n", $domain, $domain;
+	printf $name2addr "@ IN SOA hda.%s. root.%s. (\n", $domain, $domain;
         printf $name2addr "\t%s ; Serial\n", $serial;
         printf $name2addr "\t28800   ; Refresh\n";
         printf $name2addr "\t14400   ; Retry\n";
         printf $name2addr "\t3600000 ; Expire\n";
         printf $name2addr "\t86400 ) ; Minimum\n";
-	printf $name2addr "\t\tIN NS %s.\n", $domain;
-	printf $name2addr "\t\tIN MX 10 %s.\n", $domain;
-	printf $name2addr "*\tIN MX 10 %s.\n", $domain;
+	printf $name2addr "\t\tIN NS hda.%s.\n", $domain;
+	printf $name2addr "\t\tIN MX 10 hda.%s.\n", $domain;
+	printf $name2addr "*\tIN MX 10 hda.%s.\n", $domain;
 	printf $name2addr "\n";
 
 	foreach my $i (1 .. 254) {
@@ -392,15 +394,15 @@
 	my $net = $settings{'net'};
 
 	printf $addr2name "\$TTL    86400\n";
-	printf $addr2name "@ IN SOA %s. root.%s. (\n", $domain, $domain;
+	printf $addr2name "@ IN SOA hda.%s. root.%s. (\n", $domain, $domain;
         printf $addr2name "\t%s ; Serial\n", $serial;
         printf $addr2name "\t28800   ; Refresh\n";
         printf $addr2name "\t14400   ; Retry\n";
         printf $addr2name "\t3600000 ; Expire\n";
         printf $addr2name "\t86400 ) ; Minimum\n";
-	printf $addr2name "\t\tIN NS %s.\n", $domain;
-	printf $addr2name "\t\tIN MX 10 %s.\n", $domain;
-	printf $addr2name "*\tIN MX 10 %s.\n", $domain;
+	printf $addr2name "\t\tIN NS hda.%s.\n", $domain;
+	printf $addr2name "\t\tIN MX 10 hda.%s.\n", $domain;
+	printf $addr2name "*\tIN MX 10 hda.%s.\n", $domain;
 	printf $addr2name "\n";
 
 	foreach my $i (1 .. 254) {
@@ -460,13 +462,17 @@
 	}
 
 	# FIXME: error checking!
-	&mv ($file_named, $prefix . "/etc");
-	&mv ($file_hda, $prefix . "/var/named");
-	&mv ($file_n2a, $prefix . "/var/named/dynamic");
-	&mv ($file_a2n, $prefix . "/var/named/dynamic");
+	&mv ($file_named, $prefix . "/etc/bind");
+	&mv ($file_hda, $prefix . "/var/cache/bind/");
+	&mv ($file_n2a, $prefix . "/var/cache/bind/");
+	&mv ($file_a2n, $prefix . "/var/cache/bind/");
 
 	# no prefix for dhcpd conf file
-	&mv ($file_dhcpd, "/etc");
+	my $dhcp_path = "/etc/dhcp3";
+
+	#$dhcp_path = "/etc" if ($platform eq "F10");
+
+	&mv ($file_dhcpd, $dhcp_path);
 	# &mv ($file_resolv, "/etc");
 }
 
@@ -515,29 +521,10 @@
 	my $dns1 = $settings{'external-dns1'};
 	my $dns2 = $settings{'external-dns2'};
 
-        my $ifcfg = "/etc/network/interfaces";
-
-	my $ifcfg_fh=IO::File->new("> $ifcfg") or &logdie("cannot open file $ifcfg: $!");
-	$ifcfg_fh->sysseek(0, 0);
-
-	my $header = "# Generated by hdactl on " . strftime("%Y-%m-%d %H:%M:%S", localtime) . " / " . $ifcfg_idx++;
-        $ifcfg_fh->syswrite("$header\n" .
-                            "auto lo $device\n\n" .
-                            "iface lo inet loopback\n\n" .
-                            "iface $device inet static\n" .
-                            "     address $net.$self\n" .
-                            "     netmask $netmask\n" .
-                            "     gatway $net.$gw\n");
-	$ifcfg_fh->close;
-
-	my $rslv = "/etc/resolv.conf";
-	open (my $RSLV, "> $rslv") or &logdie("cannot open '$rslv' for writing: $!");
-	printf $RSLV "search $domain\n";
-	printf $RSLV "nameserver $net.$self\n";
-	close $RSLV;
-
-	# ensure it's readable!
-	chmod 0644, $rslv;
+	my $prefix = "/etc/network";
+	my $ifcfg = "$prefix/$file_ifcfg";
+
+	
 }
 
 sub print_dhcp_conf {
@@ -550,7 +537,7 @@
 	my $dyn_lo = $net . ".100";
 	my $dyn_hi = $net . ".254";
 	my $rev_net = &reverse_net ($net);
-
+	my $time_offset = &get_time_offset();
 	open(my $dhcpd, ">", $file_dhcpd);
 
 	printf $dhcpd "ddns-update-style interim;\n";
@@ -568,8 +555,12 @@
 	printf $dhcpd "\toption routers %s;\n", $gw;
 	printf $dhcpd "\toption subnet-mask %s;\n", $settings{'netmask'};
 	printf $dhcpd "\toption domain-name \"%s\";\n", $settings{'domain'};
-	printf $dhcpd "\toption domain-name-servers %s;\n", $dns1;
-	printf $dhcpd "\toption time-offset -9;\n"; # FIXME: time zone
+	if ($use_opendns_secondary) {
+		printf $dhcpd "\toption domain-name-servers %s, %s;\n", $dns1, $settings{'external-dns1'};
+	} else {
+		printf $dhcpd "\toption domain-name-servers %s, %s;\n", $dns1, $dns1;
+	}
+	printf $dhcpd "\toption time-offset %s;\n", $time_offset;
 	printf $dhcpd "\trange %s %s;\n", $dyn_lo, $dyn_hi;
 	printf $dhcpd "\tdefault-lease-time %s;\n",$settings{'dhcp_lease_time'};
 	printf $dhcpd "\tmax-lease-time %s;\n",$settings{'dhcp_lease_time'};
@@ -597,14 +588,12 @@
 
 sub generate_files {
 
-	&db_connect ();
 	&get_db_settings();
 	&print_dhcp_conf ();
 	&print_network ();
 	&get_named_settings();
 	&print_named_conf ();
 	&print_domain_info ();
-	&db_disconnect ();
 	&move_files();
 }
 
@@ -617,10 +606,23 @@
 		printf "Quitting ...\n";
 		exit (1);
 	}
-
-}
-
-### start of the daemon code
+	$platform = &get_platform();
+}
+
+# FIXME support ubuntu too
+sub get_platform {
+	open (my $file, "< /etc/legal") or
+		return "F$1";
+	my $p = <$file>;
+	chomp $p;
+	if ($p =~ /Fedora release (\w+)/) {
+		return "EE"
+	}
+
+	return "EE";
+}
+
+### detach ourselves as a daemon
 
 sub fork_daemon {
 
@@ -629,8 +631,10 @@
 		print STDERR "${program}: can not fork ($!)\n";
 		exit -1;
 	} elsif ($pid) {
+		# parent simply exit
 		exit 0;
 	}
+	# chil continues execution
 	$SIG{'CHLD'}   = 'DEFAULT';
 	open(STDOUT, ">/dev/null");
 	open(STDERR, ">/dev/null");
@@ -645,14 +649,13 @@
 
 sub write_pid {
 
-	if ($pidfile) {	
-		local *FD;
-		if (! open(FD, "> $pidfile")) {
-			&log ("Cannot create file '$pidfile'. ($!)");
-		} else {
-			printf FD "$$\n";
-			close(FD);
-		}
+	return unless ($pidfile);
+	local *FD;
+	if (! open(FD, "> $pidfile")) {
+		&log ("Cannot create file '$pidfile'. ($!)");
+	} else {
+		printf FD "$$\n";
+		close(FD);
 	}
 }
 
@@ -682,11 +685,40 @@
 	&do_periodic_update();
 }
 
+sub check_service
+{
+	my $service = shift;
+
+	my $sth = $dbh->prepare('SELECT start_at_boot from `servers` WHERE `name` = ?; ')
+		or &logdie("Couldn't prepare statement: " . $dbh->errstr);
+	$sth->execute($service);
+	my @data = $sth->fetchrow_array();
+
+	my $result = 1;
+	if (@data) {
+		$result = ($data[0] == 1);
+		if ($result) {
+			&log ("$service is enabled")
+		} else {
+			&log ("$service is disabled")
+		}
+	} else {
+		# default to enabled, cause the service is not there!
+		$result = 1;
+		&log ("$service setting is not present - defaulting to enabled")
+	}
+	return $result;
+}
+
 sub restart_named {
-	if (system("service named restart >& /dev/null")) {
-		&log ("cannot restart named");
+	if (&check_service("bind9")) {
+		if (system("service bind9 restart >& /dev/null")) {
+			&log ("cannot restart bind9");
+		} else {
+			&log ("bind9 restarted successfully");
+		}
 	} else {
-		&log ("named restarted successfully");
+		&log("bind9 not enabled");	
 	}
 }
 
@@ -694,7 +726,7 @@
 
 	my $g = get("http://www.yahoo.com");
 	if (!defined($g)) {
-		if (system("service network restart >& /dev/null")) {
+		if (system("service networking restart >& /dev/null")) {
 			&log ("cannot restart network");
 		} else {
 			&log ("network restarted successfully");
@@ -705,7 +737,7 @@
 sub get_os_version {
 	if (-e '/etc/system-release') {
 		
-		open (my $file, "< /etc/system-release") or
+		open (my $file, "< /etc/legal") or
 			return uri_escape("cannot-open-sys-release-file");
 		my $f = <$file>;
 		chomp $f;
@@ -723,36 +755,43 @@
 }
 
 sub restart_dhcpd {
-	if (system("service dhcpd stop >& /dev/null")) {
-		&log ("cannot stop dhcpd");
-	} else {
-		&log ("dhcpd stopped successfully");
-	}
-
-	# FIXME: error checking!
-	unlink ("/var/lib/dhcpd/dhcpd.leases");
-
-	if (system("service dhcpd start >& /dev/null")) {
-		&log ("cannot start dhcpd");
-	} else {
-		&log ("dhcpd started successfully");
+	if(&check_service("dhcp3-server")){
+		if (system("service dhcp3-server stop >& /dev/null")) {
+			&log ("cannot stop dhcp3-server");
+		} else {
+			&log ("dhcp3-server stopped successfully");
+		}
+
+		# FIXME: error checking!
+		#unlink ("/var/lib/dhcpd/dhcpd.leases");
+
+		if (system("service dhcp3-server start >& /dev/null")) {
+			&log ("cannot start dhcp3-server");
+		} else {
+			&log ("dhcp3-server started successfully");
+		}
+	} else {
+		&log("dhcp3-server not enabled");	
 	}
 }
 
 sub do_hup_action {
 	&log ("caught SIGHUP: executing programmed action.");
 
+	&db_connect();
         &generate_files ();
-
 	&restart_named ();
 	&restart_dhcpd ();
+	&db_disconnect ();
 
 	&log ("services restarted");
 }
 
 sub dump_mode {
 	$dump_mode = 1;
+	&db_connect();
 	&generate_files ();
+	&db_disconnect();
 	exit (0);
 }
 
@@ -803,7 +842,8 @@
 		return -1;
 	}
 
-	while(1) {
+	&log("command fifo starting ...");
+	while (!$caught_term) {
 		# serve one at a time
 		while (accept(CLIENT, SERV)) {
 			CLIENT->autoflush(1);
@@ -820,8 +860,9 @@
 			}
 			close (CLIENT);
 		}
-		&log("WARNING: accept failed with: $!");
+		&log("WARNING: accept failed with: $!") unless $caught_term;
 	}
+	&log("caught SIGTERM: command fifo terminating.");
 	unlink $cmdfile;
 	return 0;
 }
@@ -851,6 +892,27 @@
 	exit (0);
 }
 
+sub get_time_offset {
+	my $wasnegative = 0;
+
+	open TIME, "date +%z |" or &logdie("Failed to open pipe in get_time_offset: $!");
+	my $time = <TIME>; 
+
+	if ($time < 0){
+		$wasnegative = 1;
+		$time *= -1;
+	}
+	$time =~ s/0//g;
+	
+	my $timeoffset = $time * 3600;
+
+	if ($wasnegative){
+		$timeoffset *= -1;
+	}
+
+	return $timeoffset;
+}
+
 sub main {
 
 	&usage() if (defined($opt_h));
@@ -866,9 +928,11 @@
 
 	# FIXME - this will reset the settings from the DB at
 	# every reboot
+	&db_connect ();
 	&generate_files ();
 	&restart_named ();
 	&restart_dhcpd ();
+	&db_disconnect ();
 
 	umask 077;
 	do {
@@ -892,7 +956,7 @@
 
 	} while (!$caught_term);
 
-	&log ("caught SIGTERM; exiting hdactl v$version.") if $caught_term;
+	&log ("caught SIGTERM: exiting hdactl v$version.") if $caught_term;
 	&unlink_files();
 	kill('TERM', $command_processor_pid);
 

=== added file 'platform/hdactl/hdactl.metainit'
--- platform/hdactl/hdactl.metainit	1970-01-01 00:00:00 +0000
+++ platform/hdactl/hdactl.metainit	2010-08-08 06:35:52 +0000
@@ -0,0 +1,7 @@
+Short-Description: Amahi Network Controller
+Description: hdactl is a program designed to provide network information for the whole of the Amahi platform.
+Exec: /usr/bin/hdactl
+Required-Start: $syslog $time $local_fs $remote_fs $network $named
+Required-Stop: 
+Prestart-Hook: echo "Starting hdactl";
+Poststop-Hook: echo "Stopped hdactl";

=== modified file 'platform/hdactl/vpn-client/mac/Amahi VPN Client Configuration.pkg/Contents/Packages/library.pkg/Contents/Archive.bom' (properties changed: +x to -x)
=== modified file 'platform/hdactl/vpn-client/mac/Amahi VPN Client Configuration.pkg/Contents/Packages/library.pkg/Contents/Archive.pax.gz' (properties changed: +x to -x)
=== modified file 'platform/hdactl/vpn-client/mac/Amahi VPN Client Configuration.pkg/Contents/Packages/library.pkg/Contents/Info.plist' (properties changed: +x to -x)
=== modified file 'platform/hdactl/vpn-client/mac/Amahi VPN Client Configuration.pkg/Contents/Packages/library.pkg/Contents/PkgInfo' (properties changed: +x to -x)
=== modified file 'platform/hdactl/vpn-client/mac/Amahi VPN Client Configuration.pkg/Contents/Packages/library.pkg/Contents/Resources/en.lproj/Description.plist' (properties changed: +x to -x)
=== modified file 'platform/hdactl/vpn-client/mac/Amahi VPN Client Configuration.pkg/Contents/Packages/library.pkg/Contents/Resources/package_version' (properties changed: +x to -x)
=== modified file 'platform/hdactl/vpn-client/mac/Amahi VPN Client Configuration.pkg/Contents/Packages/library.pkg/Contents/Resources/postflight' (properties changed: +x to -x)
=== modified file 'platform/hdactl/vpn-client/mac/Amahi VPN Client Configuration.pkg/Contents/Packages/library.pkg/Contents/Resources/postinstall' (properties changed: +x to -x)
=== modified file 'platform/hdactl/vpn-client/mac/Amahi VPN Client Configuration.pkg/Contents/distribution.dist' (properties changed: +x to -x)
=== modified file 'platform/hdactl/vpn-client/mac/Amahi VPN Client Configuration.pmdoc/01library-contents.xml' (properties changed: +x to -x)
=== modified file 'platform/hdactl/vpn-client/mac/Amahi VPN Client Configuration.pmdoc/01library.xml' (properties changed: +x to -x)
=== modified file 'platform/hdactl/vpn-client/mac/Amahi VPN Client Configuration.pmdoc/index.xml' (properties changed: +x to -x)
=== modified file 'platform/hdactl/vpn-client/mac/Library/openvpn/AmahiHDAClient.crt' (properties changed: +x to -x)
=== modified file 'platform/hdactl/vpn-client/mac/Library/openvpn/AmahiHDAClient.key' (properties changed: +x to -x)
=== modified file 'platform/hdactl/vpn-client/mac/Library/openvpn/MyHDA.conf' (properties changed: +x to -x)
=== modified file 'platform/hdactl/vpn-client/mac/Library/openvpn/ca-cert.crt' (properties changed: +x to -x)
=== modified file 'platform/hdactl/vpn-client/mac/edit_config.sh' (properties changed: +x to -x)
=== modified file 'platform/hdactl/vpn/amahi/auth-dumb.pl' (properties changed: +x to -x)
=== modified file 'platform/hdactl/vpn/amahi/auth-pam.pl' (properties changed: +x to -x)
=== modified file 'platform/hdactl/vpn/openvpn-startup' (properties changed: +x to -x)
=== modified file 'platform/hdactl/web-installer/config.rb' (properties changed: -x to +x)
=== modified file 'platform/platform/Makefile'
--- platform/platform/Makefile	2010-08-04 20:14:11 +0000
+++ platform/platform/Makefile	2010-08-08 06:35:52 +0000
@@ -2,10 +2,6 @@
 ARCH=noarch
 RPMBASE=$(HOME)/rpmbuild
 
-all: rpm
-
-copy:
-	rsync -av release/hda-platform-*$(VERSION)*.$(ARCH).rpm $(HOME)/amahi.org-f9/html/$(ARCH)/
 
 rpm: update-header dist
 	(cd release && rpmbuild -ta hda-platform-$(VERSION).tar.gz)
@@ -15,7 +11,7 @@
 deb: update-header dist
 	(cd release && ln -sf hda-platform-$(VERSION).tar.gz hda-platform_$(VERSION).orig.tar.gz)
 	(cd release && tar -zxf hda-platform_$(VERSION).orig.tar.gz)
-	(cd release/hda-platform-$(VERSION)/debian && debuild -us -uc && debuild -S -us -uc)
+	(debuild && debuild -S)
 
 dist: clean
 	(mkdir -p release && cd release && mkdir -p hda-platform-$(VERSION))
@@ -29,8 +25,7 @@
 update-header:
 	sed -i -e 's/^Version:\s*[0-9.]*\s*$$/Version: $(VERSION)/' hda-platform.spec
 
-install: rpm
-	(cd release && sudo rpm -Uvh hda-platform-$(VERSION)-*.$(ARCH).rpm)
+donothing:
 
 clean:
 	find . -name '._*' -exec rm '{}' \;

=== modified file 'platform/platform/debian/changelog'
--- platform/platform/debian/changelog	2010-03-19 22:22:18 +0000
+++ platform/platform/debian/changelog	2010-08-08 06:35:52 +0000
@@ -1,3 +1,52 @@
+hda-platform (5.2ubuntu8) lucid; urgency=low
+
+  * More merge changes. Includes new OS detection library!
+
+ -- Cale Cunningham <[e-mail]>  Sun, 08 Aug 2010 01:24:24 -0500
+
+hda-platform (5.2ubuntu7) lucid; urgency=low
+
+  * Massive Merge Changes. Experimental.
+
+ -- Cale Cunningham <[e-mail]>  Tue, 06 Jul 2010 02:28:05 -0500
+
+hda-platform (5.2ubuntu6) lucid; urgency=low
+
+  * (Hopefully) Fixed a bug in the app installer script
+
+ -- Cale Cunningham <[e-mail]>  Wed, 09 Jun 2010 01:52:59 -0500
+
+hda-platform (5.2ubuntu5) lucid; urgency=low
+
+  * Removed a dependency that doesn't have a package (rubygem)
+
+ -- Cale Cunningham <[e-mail]>  Fri, 04 Jun 2010 23:25:46 -0500
+
+hda-platform (5.2ubuntu4) lucid; urgency=low
+
+  * Fixed a typo
+
+ -- Cale Cunningham <[e-mail]>  Wed, 02 Jun 2010 09:29:15 -0500
+
+hda-platform (5.2ubuntu3) lucid; urgency=low
+
+  * More package control fixes
+
+ -- Cale Cunningham <[e-mail]>  Wed, 02 Jun 2010 09:15:39 -0500
+
+hda-platform (5.2ubuntu2) lucid; urgency=low
+
+  * Fixed package control script for build
+
+ -- Cale Cunningham <[e-mail]>  Wed, 02 Jun 2010 09:00:05 -0500
+
+hda-platform (5.2ubuntu1) lucid; urgency=low
+
+  * Several updates to make most of the platform run smoothly on Ubuntu
+  * Addresses several issues with apache complaining about logs
+
+ -- Cale Cunningham <[e-mail]>  Tue, 01 Jun 2010 21:38:55 -0500
+
 hda-platform (5.2) karmic; urgency=low
 
   * Updated to revision 5.2

=== modified file 'platform/platform/debian/control'
--- platform/platform/debian/control	2010-03-22 08:06:41 +0000
+++ platform/platform/debian/control	2010-08-08 06:35:52 +0000
@@ -3,13 +3,13 @@
 Priority: extra
 Maintainer: Amahi Developers <[e-mail]>
 XSBC-Original-Maintainer: Praveen Kumar <[e-mail]>
-Build-Depends: debhelper (>= 7)
+Build-Depends: debhelper (>= 7), rsync, devscripts
 Standards-Version: 3.8.0
 Homepage: http://www.amahi.org/
 
 Package: hda-platform
 Architecture: all
-Depends: hdactl, apache2, libapache2-mod-fcgid, ruby1.8, rake, libopenssl-ruby1.8, libldap-ruby1.8, libmysql-ruby1.8, libfcgi-ruby1.8,hdactl,libyaml-ruby,libzlib-ruby,ruby-dev,rubygems,libactivesupport-ruby,libgruff-ruby,libgd-ruby, rails, patch, hddtemp
+Depends: hdactl, apache2, libapache2-mod-fcgid, ruby1.8, rake, libopenssl-ruby1.8, libldap-ruby1.8, libmysql-ruby1.8, libfcgi-ruby1.8,hdactl,libyaml-ruby,libzlib-ruby,ruby-dev,rubygems,libgruff-ruby,libgd-ruby, rails, patch, hddtemp
 Description: Amahi Home Digital Assistant web platform
  The Amahi Home Server is more than what you'd expect from a GNU/Linux
  home server. We call it "Home Digital Assistant" or HDA.  The Amahi

=== added file 'platform/platform/debian/dirs'
--- platform/platform/debian/dirs	1970-01-01 00:00:00 +0000
+++ platform/platform/debian/dirs	2010-08-08 06:35:52 +0000
@@ -0,0 +1,14 @@
+var/hda/platform/logs
+etc/apache2/config.d
+var/hda/web-apps
+var/hda/domain-settings/netlogon
+var/hda/domain-settings/profiles
+var/lib/samba/drivers
+var/hda/platform
+usr/share/fonts/default/TrueType
+usr/share/hda-platform
+
+
+
+
+

=== removed file 'platform/platform/debian/hda-platform.dirs'
--- platform/platform/debian/hda-platform.dirs	2010-03-24 08:29:44 +0000
+++ platform/platform/debian/hda-platform.dirs	1970-01-01 00:00:00 +0000
@@ -1,14 +0,0 @@
-var/hda/platform/logs
-etc/apache2/config.d
-var/hda/web-apps
-var/hda/domain-settings/netlogon
-var/hda/domain-settings/profiles
-var/lib/samba/drivers
-var/hda/platform
-usr/share/fonts/default/TrueType
-usr/share/hda-platform
-
-
-
-
-

=== removed file 'platform/platform/debian/hda-platform.install'
--- platform/platform/debian/hda-platform.install	2010-03-24 08:29:44 +0000
+++ platform/platform/debian/hda-platform.install	1970-01-01 00:00:00 +0000
@@ -1,18 +0,0 @@
-html 				var/hda/platform
-hda-gems-install 		usr/bin
-hda-diskmount			usr/bin
-pdc/logon.bat			var/hda/domain-settings/netlogon
-fonts/*                         usr/share/fonts/TrueType
-webapps				usr/share/hda-platform
-hda-usermap			usr/share/hda-platform
-
-#Files to be created in the usr/bin directory
-hda-refresh-shares              usr/bin
-hda-update-webapps              usr/bin
-hda-create-db-and-user		usr/bin
-amahi-download			usr/bin
-
-
-
-
-

=== removed file 'platform/platform/debian/hda-platform.postinst'
--- platform/platform/debian/hda-platform.postinst	2010-03-24 08:29:44 +0000
+++ platform/platform/debian/hda-platform.postinst	1970-01-01 00:00:00 +0000
@@ -1,44 +0,0 @@
-#!/bin/sh
-# -*- shell-script -*-
-# postinst script for hda-platform
-#
-# see: dh_installdeb(1)
-
-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
-
-
-case "$1" in
-    configure)
-        echo "Deploying HDA platform"
-	
-        touch /var/hda/platform/html/log/production.log
-        touch /var/hda/platform/html/log/development.log
-    ;;
-
-    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 'platform/platform/debian/install'
--- platform/platform/debian/install	1970-01-01 00:00:00 +0000
+++ platform/platform/debian/install	2010-08-08 06:35:52 +0000
@@ -0,0 +1,19 @@
+html 				var/hda/platform
+hda-gems-install 		usr/bin
+hda-diskmount			usr/bin
+pdc/logon.bat			var/hda/domain-settings/netlogon
+fonts/*                         usr/share/fonts/TrueType
+webapps				usr/share/hda-platform
+hda-usermap			usr/share/hda-platform
+
+#Files to be created in the usr/bin directory
+hda-refresh-shares              usr/bin
+hda-update-webapps              usr/bin
+hda-create-db-and-user		usr/bin
+amahi-download			usr/bin
+hda-create-server.debian	usr/bin
+
+
+
+
+

=== added file 'platform/platform/debian/postinst'
--- platform/platform/debian/postinst	1970-01-01 00:00:00 +0000
+++ platform/platform/debian/postinst	2010-08-08 06:35:52 +0000
@@ -0,0 +1,46 @@
+#!/bin/sh
+# -*- shell-script -*-
+# postinst script for hda-platform
+#
+# see: dh_installdeb(1)
+
+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
+
+
+case "$1" in
+    configure)
+        echo "Deploying HDA platform"
+	
+	mv /usr/bin/hda-update-webapps.debian /usr/bin/hda-update-webapps
+	mv /usr/bin/hda-create-server.debian /usr/bin/hda-create-server
+        touch /var/hda/platform/html/log/production.log
+        touch /var/hda/platform/html/log/development.log
+    ;;
+
+    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

=== modified file 'platform/platform/debian/rules'
--- platform/platform/debian/rules	2010-03-22 08:06:41 +0000
+++ platform/platform/debian/rules	2010-08-08 06:35:52 +0000
@@ -5,3 +5,6 @@
 override_dh_auto_install:
 	touch $(CURDIR)/debian/hda-platform/var/hda/web-apps/htpasswd
 	dh_auto_install	
+
+override_dh_auto_build:
+	$(MAKE) donothing

=== added file 'platform/platform/hda-create-server.debian'
--- platform/platform/hda-create-server.debian	1970-01-01 00:00:00 +0000
+++ platform/platform/hda-create-server.debian	2010-08-08 06:35:52 +0000
@@ -0,0 +1,163 @@
+#!/usr/bin/env ruby
+#
+# Amahi Home Server
+# Copyright (C) 2007-2009 Amahi Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License v3
+# (29 June 2007), as published in the COPYING file.
+# 
+# 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
+# file COPYING for more details.
+# 
+# You should have received a copy of the GNU General Public
+# License along with this program; if not, write to the Amahi
+# team at http://www.amahi.org/ under "Contact Us."
+
+require 'optparse'
+require 'pp'
+
+SCRIPT_NAME = File.basename($0)
+
+def initscript_file(name, visible_name, user = "www-data")
+		file = ["#! /bin/sh",
+			"#",
+			"### BEGIN INIT INFO",
+			"# Provides:          #{name}",
+			"# Default-Start:     2 3 4 5",
+			"# Default-Stop:      1",
+			"# Short-Description: #{visible_name}",
+			"# Required-Start:   $syslog $time $local_fs $remote_fs $network $named",
+			"# Required-Stop:",
+			"# Description:       #{name} is one of the services on the Amahi platform.",
+			"",
+			"### END INIT INFO",
+			"",
+			"# PATH should only include /usr/* if it runs after the mountnfs.sh script",
+			"PATH=/sbin:/usr/sbin:/bin:/usr/bin",
+			"DESC=\"#{visible_name}\"",
+			"NAME=#{name}",
+			"DAEMON=/usr/bin/#{name}",
+			"BASENAME=#{name}",
+			"DAEMON_ARGS=",
+			"PIDFILE=/var/run/$NAME.pid",
+			"SCRIPTNAME=/etc/init.d/$NAME",
+			"# Exit if the package is not installed",
+			"[ -x "$DAEMON" ] || exit 5",
+			"",
+			"# Load the VERBOSE setting and other rcS variables",
+			". /lib/init/vars.sh",
+			"",
+			"# Define LSB log_* functions.",
+			"# Depend on lsb-base (>= 3.0-6) to ensure that this file is present.",
+			". /lib/lsb/init-functions",
+			"",
+			"# Function that starts the daemon/service",
+			"",
+			"do_start()",
+			"{",
+			"	echo \"Starting $DESC\";",
+			"	start-stop-daemon --start --oknodo --background --quiet --make-pidfile --pidfile $PIDFILE --exec $DAEMON -- \ ",
+			"		$DAEMON_ARGS || return 1",
+			"}",
+			"",
+			"# Function that stops the daemon/service",
+			"",
+			"do_stop()",
+			"{",
+			"	start-stop-daemon --stop --oknodo --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE --name $BASENAME",
+			"	RETVAL=\"$?\"",
+			"",
+			"	rm -f $PIDFILE",
+			"",
+			"	return $RETVAL",
+			"	echo \"Stopped $DESC\";",
+			"	return \"$RETVAL\"",
+			"}",
+			"",
+			"# Function that sends a SIGHUP to the daemon/service",
+			"",
+			"do_reload() {",
+			"	start-stop-daemon --stop --signal 1 --quiet --pidfile $PIDFILE --name $NAME",
+			"	return 0",
+			"}",
+			"",
+			"case "$1" in",
+			"  start)",
+			"	[ \"$VERBOSE\" != no ] && log_daemon_msg \"Starting $DESC\" \"$NAME\"",
+			"	do_start",
+			"    log_end_msg $?",
+			"	;;",
+			"  stop)",
+			"	[ \"$VERBOSE\" != no ] && log_daemon_msg \"Stopping $DESC\" \"$NAME\"",
+			"	do_stop",
+			"    log_end_msg $?",
+			"	;;",
+			"  restart|force-reload)",
+			"	log_daemon_msg "Restarting $DESC" "$NAME"",
+			"	do_stop",
+			"	case \"$?\" in",
+			"	  0)",
+			"		do_start",
+			"        log_end_msg \"$?\"",
+			"		;;",
+			"	  *)",
+			"	  	# Failed to stop",
+			"		log_end_msg 1",
+			"		;;",
+			"	esac",
+			"	;;",
+			"  *)",
+			"	echo "Usage: $SCRIPTNAME {start|stop|restart|force-reload}" >&2",
+			"	exit 3",
+			"	;;",
+			"esac" ]
+	file.join "\n"
+end
+
+class OptParser
+
+	def self.parse(args)
+		options = { }
+		options[:visible_name] = nil
+		options[:service_name] = nil
+
+		opts = OptionParser.new do |opts|
+			opts.banner = "Usage: #{SCRIPT_NAME} [options] name"
+
+			opts.separator ""
+
+			opts.on("-n", "--name ServerName", "Name of the server is ServerName.") do |lib|
+				options[:visible_name] = lib
+				options[:service_name] ||= lib.downcase
+			end
+
+			opts.on("-s", "--service servicename", "Name of the service is 'servicename'.") do |lib|
+				options[:service_name] = lib
+			end
+
+			opts.separator ""
+
+			opts.on("-h", "--help",
+				"Show this help message.") { $stderr.puts opts; exit }
+
+		end
+		opts.parse!(args)
+		options
+	end
+end
+
+options = OptParser.parse(ARGV)
+
+pp options
+
+puts initscript_file("adito", "OpenVPN ALS")
+
+if options[:visible_name].nil?
+	$stderr.puts "error: cannot parse arguments. please run '#{SCRIPT_NAME} -h' for help."
+	exit 1
+end
+
+exit

=== modified file 'platform/platform/hda-diskmount' (properties changed: +x to -x)
=== modified file 'platform/platform/hda-gems-install' (properties changed: +x to -x)
=== added file 'platform/platform/hda-update-webapps.debian'
--- platform/platform/hda-update-webapps.debian	1970-01-01 00:00:00 +0000
+++ platform/platform/hda-update-webapps.debian	2010-08-08 06:35:52 +0000
@@ -0,0 +1,33 @@
+#!/usr/bin/perl
+
+# update webapps all in one shot
+
+sub main {
+	chdir "/var/hda/web-apps";
+	my @files = glob("*");
+	&command("mkdir -p amahi_tmp_name");
+	foreach $i (@files) {
+		next unless -d "$i";
+		print "processing dir: $i\n";
+		next if -e "$i/html";
+		print "upgrading $i\n";
+		&command("mkdir -p amahi_tmp_name/$i");
+		&command("mv $i amahi_tmp_name/$i/html");
+		&command("mkdir amahi_tmp_name/$i/logs");
+		&command("chown www-data:users amahi_tmp_name/$i amahi_tmp_name/$i/logs");
+		&command("mv amahi_tmp_name/$i .");
+	}
+	&command("rmdir amahi_tmp_name");
+
+	chdir "/var/hda/platform/html";
+	&command("/var/hda/platform/html/script/runner 'Webapp.find(:all).each { |w| w.save! }'")
+}
+
+sub command {
+	my $cmd = shift;
+
+	print "\t$cmd\n";
+	system $cmd;
+}
+
+&main();

=== modified file 'platform/platform/hda-usermap' (properties changed: +x to -x)
=== modified file 'platform/platform/hda-usermap.rb' (properties changed: +x to -x)
=== modified file 'platform/platform/html/app/models/user.rb'
--- platform/platform/html/app/models/user.rb	2010-03-30 10:07:17 +0000
+++ platform/platform/html/app/models/user.rb	2010-08-08 06:35:52 +0000
@@ -95,7 +95,8 @@
 
 	# add to the group called "users" so that it's like the rest
 	def add_to_users_group
-		c = Command.new("usermod -g users -G users \"#{self.login}\"")
+		c = Command.new("usermod -a -G users \"#{self.login}\"")
+		c = Command.new("usermod -a -G admin \"#{self.login}\"")
 		c.execute
 	end
 
@@ -133,6 +134,7 @@
 		pwd_option = password_option()
 		# FIXME: use a different (programmable) group
 		c = Command.new "useradd -g users -c \"#{self.name}\" #{pwd_option} \"#{self.login}\""
+		c = Command.new "usermod -a -G admin \"#{self.name}\" #{pwd_option} \"#{self.login}\""
 		# FIXME - we should use add_or_passwd_change_samba_user above! DRY
 		unless self.password.nil? && self.password.blank?
 			p = self.password

=== modified file 'platform/platform/html/app/views/front/_app.html.erb' (properties changed: +x to -x)
=== modified file 'platform/platform/html/app/views/front/_one.html.erb' (properties changed: +x to -x)
=== modified file 'platform/platform/html/app/views/front/index.html.erb' (properties changed: +x to -x)
=== modified file 'platform/platform/html/app/views/layouts/amahi.html.erb' (properties changed: +x to -x)
=== modified file 'platform/platform/html/app/views/layouts/login.html.erb' (properties changed: +x to -x)
=== modified file 'platform/platform/html/app/views/search/hda.rhtml' (properties changed: +x to -x)
=== modified file 'platform/platform/html/app/views/search/index.rhtml' (properties changed: +x to -x)
=== modified file 'platform/platform/html/app/views/setup/index.html.erb' (properties changed: +x to -x)
=== modified file 'platform/platform/html/db/migrate/20090711072328_add_shares_debug.rb'
--- platform/platform/html/db/migrate/20090711072328_add_shares_debug.rb	2010-05-25 00:52:27 +0000
+++ platform/platform/html/db/migrate/20090711072328_add_shares_debug.rb	2010-08-08 06:35:52 +0000
@@ -5,7 +5,7 @@
     Setting.set_kind('shares', 'pdc', 0)
     Setting.set_kind('shares', 'win98', 0)
     # NOTE: the domain may not be set yet in fresh installs!
-    d = Setting.general.get('domain') || 'WORKGROUP'
+    d = Setting.general.get('domain') || 'home.com'
     Setting.set_kind('shares', 'workgroup', Share.default_samba_domain(d))
   end
 

=== added file 'platform/platform/html/lib/os-detect.rb'
--- platform/platform/html/lib/os-detect.rb	1970-01-01 00:00:00 +0000
+++ platform/platform/html/lib/os-detect.rb	2010-08-08 06:35:52 +0000
@@ -0,0 +1,31 @@
+# Amahi Home Server
+# Copyright (C) 2007-2009 Amahi Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License v3
+# (29 June 2007), as published in the COPYING file.
+#
+# 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
+# file COPYING for more details.
+#
+# You should have received a copy of the GNU General Public
+# License along with this program; if not, write to the Amahi
+# team at http://www.amahi.org/ under "Contact Us."
+
+Class OSDetect
+	def self.detect
+			distro = "Unknown"
+		fhos = File.open("/etc/issue", "r")
+		os = fhos.readline
+		if os["Fedora"]
+			distro = "Fedora"
+		elsif os["Ubuntu"]
+			distro = "Ubuntu"
+		end
+		fhos.close
+		distro
+	end
+end
+

=== modified file 'platform/platform/html/log/production.log' (properties changed: -x to +x)
=== modified file 'platform/platform/html/script/about' (properties changed: +x to -x)
=== modified file 'platform/platform/html/script/console' (properties changed: +x to -x)
=== modified file 'platform/platform/html/script/db-backup' (properties changed: +x to -x)
=== modified file 'platform/platform/html/script/db-restore' (properties changed: +x to -x)
=== modified file 'platform/platform/html/script/dbconsole' (properties changed: +x to -x)
=== modified file 'platform/platform/html/script/destroy' (properties changed: +x to -x)
=== modified file 'platform/platform/html/script/generate' (properties changed: +x to -x)
=== modified file 'platform/platform/html/script/install-app' (properties changed: +x to -x)
--- platform/platform/html/script/install-app	2010-06-16 20:48:21 +0000
+++ platform/platform/html/script/install-app	2010-08-08 06:35:52 +0000
@@ -16,11 +16,13 @@
 # team at http://www.amahi.org/ under "Contact Us."
 
 require File.dirname(__FILE__) + '/../config/boot'
+require File.dirname(__FILE__) + '/../lib/os-detect.rb'
 #require 'commands/runner'
 require 'optparse'
 
 # switch to apache:users first
-uid = Etc.getpwnam("apache").uid
+uid = Etc.getpwnam("apache").uid if OSDetect.detect == "Fedora"
+uid = Etc.getpwnam("www-data").uid if OSDetect.detect == "Ubuntu"
 gid = Etc.getgrnam("users").gid
 Process.gid = gid
 Process.egid = gid

=== modified file 'platform/platform/html/script/install-servers' (properties changed: +x to -x)
=== modified file 'platform/platform/html/script/performance/benchmarker' (properties changed: +x to -x)
=== modified file 'platform/platform/html/script/performance/profiler' (properties changed: +x to -x)
=== modified file 'platform/platform/html/script/plugin' (properties changed: +x to -x)
=== modified file 'platform/platform/html/script/reset-user-password' (properties changed: +x to -x)
=== modified file 'platform/platform/html/script/runner' (properties changed: +x to -x)
=== modified file 'platform/platform/html/tmp/cache/.gitignore' (properties changed: -x to +x)
=== modified file 'platform/platform/html/tmp/pids/.gitignore' (properties changed: -x to +x)
=== modified file 'platform/platform/html/tmp/sessions/.gitignore' (properties changed: -x to +x)
=== modified file 'platform/platform/html/tmp/sockets/.gitignore' (properties changed: -x to +x)