Remove all stuff that is unrelated to packaging XUL extensions.

63 files changed, 48 insertions, 3406 deletions

diff --git a/Makefile b/Makefile
index 4602c6a..7ebe77d 100644
--- a/Makefile
+++ b/Makefile
@@ -1,23 +1,13 @@
-PREFIX ?= /usr
-DOCDIR ?= $(PREFIX)/share/doc/mozilla-devscripts
-MANDIR ?= $(PREFIX)/share/man
-
-MANPAGES := $(wildcard man/*.1)
-
-build:
-	$(MAKE) -C src $@
+build: ;
 
 test:
 	tests/dh_xul-ext/test
 	tests/test-moz-version
 
 install:
-	install -d $(DESTDIR)$(DOCDIR) $(DESTDIR)$(MANDIR)/man1
-	install $(MANPAGES) $(DESTDIR)$(MANDIR)/man1/
-	install -m 644 README $(DESTDIR)$(DOCDIR)/README
-	$(MAKE) -C src $@
+	python setup.py install --root="$(DESTDIR)" --no-compile --install-layout=deb
 
 clean:
-	$(MAKE) -C src $@
+	rm -rf build src/*.pyc
 
 .PHONY: build clean install test
diff --git a/README b/README
index 268dcdf..b9250f8 100644
--- a/README
+++ b/README
@@ -1,203 +1,13 @@
 mozilla-devscripts is a collection of scripts based on Makefile inheritance
 usable by Mozilla packages in Ubuntu.
 
-- mozclient is an abstract tarball creator which provides a get-new-orig
-  target
-- compare is an install checker looking for missing files
-- minefield-packager creates debs from Firefox (official) nightly built
-  tarballs
 - xpi provides hooks to help package extensions in an elegant way
-- lp-locale-export is an helper for translations in launchpad for mozilla
-  products and extensions
- 
-============================================================================
 
-The package contains rules for the following projects:
- - firefox-3.0
- - firefox-3.1
- - firefox-4.0
- - fennec
- - lightning-sunbird (from MOZILLA_1_8_BRANCH)
- - nspr
- - nss
- - seamonkey-2.0
- - thunderbird (2.0, from MOZILLA_1_8_BRANCH)
- - thunderbird-3.0
- - xulrunner (1.8, from MOZILLA_1_8_BRANCH)
- - xulrunner-1.9
- - xulrunner-1.9.1
- - xulrunner-2.0
- - midbrowser
- - prism
- - flock
+============================================================================
 
 In addition there is a xpi.mk which provides standard rules/targets to package
 XPI extensions for mozilla/toolkit based applications.
 
-=== mozclient ===
-
-Creates a source tarball from a VCS
-
-A clean-up script, called "remove.binonly.sh", is called to remove all
-binary-only files. It is applied to all projects before packing.
-Optionally, $(project)-remove.binonly.sh is also applied.
-Traces of the cleaning are preserved inside that resulting tarball
-in REMOVED+nobinonly.txt. If nothing has been removed, both the log and
-the "+nobinonly" signature are dropped.
-
-To use :
-
-- in debian/control: add mozilla-devscripts to Build-Depends
-- in debian/rules: add "include /usr/share/mozilla-devscripts/yourproject.mk"
-
-Note: it is also possible to keep all project files outside of mozilla-devscripts.
-To do so, mozclient needs two variables:
-- MOZCLIENT_PROJECTNAME: the name of the conf file as described below, without the
-  ".conf" extension
-- MOZCLIENT_PROJECTDIR: a directory containing the project specific files to be used
-  by mozclient. It is not a recommended to use the debian directory directly because
-  there will be a confusion between debian/patches and $(MOZCLIENT_PROJECTDIR)/patches
-
-ex:
-  in debian/rules:
-    MOZCLIENT_PROJECTNAME  = myproject
-    MOZCLIENT_PROJECTDIR   = debian/mozclient
-    include /usr/share/mozilla-devscripts/mozclient.mk
-  in debian/mozclient:
-    - a mandatory file called myproject.conf
-    - an optional patches directory
-    - an optional myproject-remove.binonly.sh file
-
-The following targets are then available to the caller of debian/rules:
-- get-orig-source
-   Build a tarball according to parameters from project.mk
-   and optionally using either DEBIAN_DATE or DEBIAN_TAG, and optionally
-   DEBIAN_BRANCH
-- list-tags
-   List all the registered VCS tags from upstream server
-
-The caller could specify the following parameters:
-DEBIAN_DATE in the form YYYYMMDDtHHMM
- ex: DEBIAN_DATE=20070911t1711
-or
-DEBIAN_TAG in the form CVS_TAG=debian_version
- ex: DEBIAN_TAG=FIREFOX_3_0b2_RC1=3.0~b2~rc1
-
-Optionally:
-
-DEBIAN_KEEP_VCS to preserve the VCS files (*/CVS, .hg, ...)
- ex: DEBIAN_KEEP_VCS=1
-
-LOCAL_BRANCH=/foo/bar/baz to point to a local branch instead of
-the configured remote one. It is faster if you have to publish
-tarballs quite often from this branch, such as daily snapshots.
-The local branch will be updated first.
-Note that the getdate are still remote so you need network connectivity.
-
-Projects files are stored in /usr/share/mozilla-devscripts/mozclient
-as .conf files. They contain the following parameters:
-
-- MOZCLIENT_APPNAME (mandatory): package name
-- MOZCLIENT_MODULES (optional): list of modules/directories for direct checkout
-- MOZCLIENT_VCS (mandatory): VCS (hg, git, cvs, svn..)
-- MOZCLIENT_VCS_LOC (mandatory): VCS location (cvs loc, url, ...)
-- MOZCLIENT_PROJECT (optional): VCS project name. If $(NULL), then
-  $(MOZCLIENT_MODULES) becomes mandatory
-- MOZCLIENT_BRANCH (optional): VCS branch name
-- MOZCLIENT_POSTCOCMD (optional): a shell command that is executed after checkout
-- MOZCLIENT_FILE (mandatory): source file containing the version
-- MOZCLIENT_GETVERSION (mandatory): how to transform the version
-- MOZCLIENT_GETDATE (mandatory): get the last commit date for the project
-- MOZCLIENT_SEPARATOR (optional): separator between version and date (default: ~)
-- MOZCLIENT_TAREXCLUDE (optional): list of additional dirs/files to exclude
-  from packaging
-- MOZCLIENT_EMBEDDED (optional): create an embedded tarball (default: 0)
-- MOZCLIENT_WANTMOZDIR (optional): should the root dir be 'mozilla'?
-  (default: 0 unless MOZCLIENT_EMBEDDED=1)
-- MOZCLIENT_WANTPATCH (optional): should we use the patch system? (default: 0)
-- MOZCLIENT_DYNTAG (optional): paired with MOZCLIENT_DYNTAG_FILES, a shell
-  command that is executed to get a VCS tag
-- MOZCLIENT_DYNTAG_FILES (optional): list of files to get before calling
-  MOZCLIENT_DYNTAG
-
-Example with firefox-3.0:
-
-- in debian/control, add mozilla-devscripts to Build-Depends
-- in debian/rules, add:
-   include /usr/share/mozilla-devscripts/firefox-3.0.mk
-
-That's it. You've gained get-orig-source.
-
-You can now call it:
-- debian/rules get-orig-source
-  => firefox-3.0_3.0~b2~cvs20071120t1456+nobinonly.orig.tar.gz
-
-- debian/rules get-orig-source DEBIAN_DATE=20070914t1713
-  => firefox-3.0_3.0~a8~cvs20070914t1713+nobinonly.orig.tar.gz
-
-- debian/rules get-orig-source DEBIAN_TAG=FIREFOX_3_0b2_RC1=3.0~b2~rc1
-  => firefox-3.0_3.0~b2~rc1+nobinonly.orig.tar.gz
-
-=== compare ===
-
-Compares installed files and debs content
-
-The following target is available to the caller:
-
-compare: check the difference between:
-a/ what has been built (in dists/bin) and what has been installed (in debian/tmp)
-b/ what has been installed (in debian/tmp) and what has been put in the debs
-dists/bin is populated by the upstream build system
-debian/tmp is populated according to upstream installer/package-static files
-
-The following variable are available:
-COMPARE_FILTER_PRE_IN and COMPARE_FILTER_PRE_OUT (for a/)
-COMPARE_FILTER_IN and COMPARE_FILTER_OUT (for b/)
-By default, all are 'sed' commands that could be augmented (+=) or
-overwritten by the caller.
-
-To use (if not already done for another mozilla-devscripts script)
-
-- in debian/control: add mozilla-devscripts to Build-Depends
-- in debian/rules: add "include /usr/share/mozilla-devscripts/yourproject.mk"
-
-Example of COMPARE_FILTER_IN tweak:
-
-COMPARE_FILTER_IN += \
-  -e 's,^usr/lib/seamonkey-2.0/extensions/{f13b157f-b174-47e7-a34d-4815ddfdfeb8}.*,,' \
-  $(NULL)
-
-=== minefield-packager ===
-
-minefield-packager creates debs from Firefox nightly built tarballs available
-on mozilla web/ftp site. Those builds are often useful to check a regression
-and to determine if a bug is Ubuntu specific or if it is also affecting
-upstream builds. The deb produced are for testing purpose only, please don't
-report bugs in Launchpad about those.
-
-Example:
-
-(from a writable directory)
-$ make -f /usr/share/mozilla-devscripts/minefield-packager.mk
-$ sudo dpkg -i firefox-minefield_3.0~b5~build2008032304-1_i386.deb
-
-You can also ask for a particular snapshot by adding DEBIAN_DATE=id,
-where id is one of the date returned by the 'list' command:
-
-$ make -f /usr/share/mozilla-devscripts/minefield-packager.mk list
-Available snapshots are:
-2008-02-27-04   04-Mar-2008 19:31
-2008-02-27-14   28-Feb-2008 07:30
-2008-02-27-18   28-Feb-2008 04:53
-2008-02-28-04   06-Mar-2008 04:56
-...
-2008-03-28-04   29-Mar-2008 05:03
-2008-03-28-05   29-Mar-2008 06:57
-2008-03-29-04   29-Mar-2008 06:50
-latest  29-Mar-2008 06:50
-$ make -f /usr/share/mozilla-devscripts/minefield-packager.mk DEBIAN_DATE=2008-03-28-04
-$ sudo dpkg -i firefox-minefield_3.0~build2008032804-1_i386.deb
-
 === xpi.mk ===
 
 targets:
@@ -229,27 +39,17 @@ parameters:
                      |firefox-addons|, which will link the extension to the
                      /usr/lib/firefox/extensions and /usr/lib/firefox-addons/extensions
                      directories, respectively.
- 
+
 cdbs:
 ------
  If you are using cdbs (debhelper.mk) xpi.mk hooks in appropriately.
  cdbs targets to build the packages without any rule. The only thing required
  is to include the debhelper.mk from cdbs _before_ including xpi.mk.
 
-
 examples:
 ----------
  A template is available in the branch available under the following URL:
    https://code.launchpad.net/~mozillateam/firefox-extensions/XPI.TEMPLATE
- 
-
-=== lp-locale-export.mk ===
-
-Include this helper if you want to translate your mozilla application or extension
-through launchpad.
-
-XXX: document here!
-
 
 === xpi-unpack ===
 
diff --git a/setup.py b/setup.py
new file mode 100644
index 0000000..ad48412
--- /dev/null
+++ b/setup.py
@@ -0,0 +1,43 @@
+#!/usr/bin/python
+
+import glob
+import os
+import re
+
+from distutils.core import setup
+
+def get_debian_version():
+    """look what Debian version we have"""
+    version = None
+    changelog = "debian/changelog"
+    if os.path.exists(changelog):
+        head = open(changelog).readline()
+        match = re.compile(".*\((.*)\).*").match(head)
+        if match:
+            version = match.group(1)
+    return version
+
+SCRIPTS = [
+    'dh_xul-ext',
+    'install-xpi',
+    'xpi-pack',
+    'xpi-repack',
+    'xpi-unpack',
+    'moz-version',
+]
+
+if __name__ == '__main__':
+    setup(name='mozilla-devscripts',
+          version=get_debian_version(),
+          scripts=[os.path.join('src', s) for s in SCRIPTS],
+          py_modules=['src/moz_version'],
+          data_files=[('share/doc/mozilla-devscripts', ['README']),
+                      ('share/man/man1', glob.glob("man/*.1")),
+                      ('share/mozilla-devscripts',
+                       ['src/xpi.mk'] + glob.glob('src/xul-app-data.csv.*')),
+                      ('share/perl5/Debian/Debhelper/Buildsystem',
+                       ['src/Buildsystem/xul_ext.pm']),
+                      ('share/perl5/Debian/Debhelper/Sequence',
+                       ['src/Sequence/xul_ext.pm']),
+                     ],
+    )
diff --git a/src/xul-ext_build.pm b/src/Buildsystem/xul_ext.pm
index 89c8763..89c8763 100644
--- a/src/xul-ext_build.pm
+++ b/src/Buildsystem/xul_ext.pm
diff --git a/src/Makefile b/src/Makefile
deleted file mode 100644
index 1c285d1..0000000
--- a/src/Makefile
+++ /dev/null
@@ -1,90 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-
-# Copyright (c) 2007-2008 Fabien Tassin <fta@sofaraway.org>
-# Description: Build system for mozilla-devscripts
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-PREFIX ?= /usr
-BINDIR ?= $(PREFIX)/bin
-DATADIR = $(PREFIX)/share/mozilla-devscripts
-
-VENDOR := $(shell if dpkg-vendor --is Ubuntu || dpkg-vendor --derives-from Ubuntu; then echo "Ubuntu"; else echo "Debian"; fi)
-
-subst_files = \
-	firefox-3.0.mk \
-	firefox-3.0-full.mk \
-	firefox-3.1.mk \
-	firefox-4.0.mk \
-	fennec.mk \
-	lightning-sunbird.mk \
-	nspr.mk \
-	nss.mk \
-	seamonkey-2.0.mk \
-	thunderbird-3.0.mk \
-	xulrunner-1.8.mk \
-	xulrunner-1.9.mk \
-	xulrunner-1.9.1.mk \
-	xulrunner-2.0.mk \
-	prism.mk \
-	flock.mk \
-	mozclient.mk \
-	compare.mk \
-	minefield-packager.mk \
-	xulapp.mk \
-	$(NULL)
-
-extra_files = \
-	lp-locale-export.mk \
-	xpi.mk \
-	$(NULL)
-
-extra_dirs = \
-	mozclient \
-	mozclient/patches \
-	mozclient/lib \
-	mozclient/lib/MozClient \
-	minefield-packager/debian \
-	$(NULL)
-
-build: $(subst_files)
-
-%.mk: %.mk.in
-	cat $< | sed \
-	-e "s|^\(include\) \(.*\)\.in|\1 $(DATADIR)/\2|" \
-	-e "s|^\(MOZCLIENT_EXCLUDE_SCRIPT.*=[ 	][ 	]*\)\(.*/\)\(.*\)|\1$(DATADIR)/\3|" \
-	-e "s|^\(MOZCLIENT_PATCHES.*=[ 	][ 	]*\)\(.*/\)\(.*\)|\1$(DATADIR)/\3|" \
-	-e "s|^\(MOZDEVSCRIPT_DIR.*=[ 	]*\)\(.*\)|\1$(DATADIR)/\2|" \
-	> $@
-	chmod 644 $@
-
-install: $(subst_files) $(extra_files) $(foreach dir,$(extra_dirs),$(wildcard $(dir)/*))
-	python setup.py install --root="$(DESTDIR)" --no-compile --install-layout=deb
-	install -m 755 -d $(DESTDIR)$(DATADIR) $(foreach dir,$(extra_dirs),$(DESTDIR)$(DATADIR)/$(dir))
-	install -m 644 $(subst_files) $(extra_files) $(DESTDIR)$(DATADIR)
-	for dir in $(extra_dirs) ; do \
-		install -m 644 `echo $$dir/*` $(DESTDIR)$(DATADIR)/$$dir ; \
-	done
-	find $(DESTDIR)$(DATADIR) -type f \( -name \*.pl -o -name \*.sh \) -exec chmod -v 755 {} \;
-	chmod 755 $(DESTDIR)$(DATADIR)/minefield-packager.mk
-	install -m 644 xul-app-data.csv.Debian $(DESTDIR)$(DATADIR)/xul-app-data.csv.Debian
-	install -m 644 xul-app-data.csv.Ubuntu $(DESTDIR)$(DATADIR)/xul-app-data.csv.Ubuntu
-	install -D -m 644 xul-ext.pm $(DESTDIR)$(PREFIX)/share/perl5/Debian/Debhelper/Sequence/xul_ext.pm
-	install -D -m 644 xul-ext_build.pm $(DESTDIR)$(PREFIX)/share/perl5/Debian/Debhelper/Buildsystem/xul_ext.pm
-
-clean:
-	rm -f *.pyc $(subst_files)
-
-.PHONY: clean install
diff --git a/src/xul-ext.pm b/src/Sequence/xul_ext.pm
index 515deea..515deea 100644
--- a/src/xul-ext.pm
+++ b/src/Sequence/xul_ext.pm
diff --git a/src/compare.mk.in b/src/compare.mk.in
deleted file mode 100644
index 12abcf0..0000000
--- a/src/compare.mk.in
+++ /dev/null
@@ -1,76 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-
-# Copyright (c) 2007-2008 Fabien Tassin <fta@sofaraway.org>
-# Description: The 'compare' module of mozilla-devscripts
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-#####################################################################
-
-# Don't include this file directly, include one of the project.mk
-# file instead, which will include this file for you.
-
-# The following target is available to the caller:
-# compare: check the difference between:
-# a/ what has been built (in dists/bin) and what has been installed (in debian/tmp)
-# b/ what has been installed (in debian/tmp) and what has been put in the debs
-# dists/bin is populated by the upstream build system
-# debian/tmp is populated according to upstream installer/package-static files
-#
-# The following variable are available:
-# COMPARE_FILTER_PRE_IN and COMPARE_FILTER_PRE_OUT (for a/)
-# COMPARE_FILTER_IN and COMPARE_FILTER_OUT (for b/)
-# By default, all are 'sed' commands that could be augmented (+=) or
-# overwritten by the caller.
-
-TEMP           := $(shell echo $$$$)
-LIST_BUILT     := /tmp/built.$(TEMP)
-LIST_INSTALLED := /tmp/installed.$(TEMP)
-LIST_IN_DEBS   := /tmp/in_debs.$(TEMP)
-
-PKG_DIRS = $(addprefix debian/,$(shell grep ^Package debian/control | cut -d' ' -f2))
-
-compare:
-	@if [ "Z${COMPARE_FILTER_PRE_IN}Z" = "ZZ" ] ; then \
-	echo "## Can't compare dist/bin and debian/tmp (no COMPARE_FILTER_PRE_IN filter defined)" ; \
-	else \
-	if [ -d mozilla/dist ] ; then \
-	find mozilla/dist/bin \! -type d | cut -d/ -f4- | $(COMPARE_FILTER_PRE_IN) | sort > $(LIST_BUILT) ; \
-	elif [ -d build-tree/mozilla/dist ] ; then \
-	find build-tree/mozilla/dist/bin \! -type d | cut -d/ -f5- | $(COMPARE_FILTER_PRE_IN) | sort > $(LIST_BUILT) ; \
-	elif [ -d build-tree/dist ] ; then \
-	find build-tree/dist/bin \! -type d | cut -d/ -f4- | $(COMPARE_FILTER_PRE_IN) | sort > $(LIST_BUILT) ; \
-	elif [ -d dist ] ; then \
-	find dist/bin \! -type d | cut -d/ -f3- | $(COMPARE_FILTER_PRE_IN) | sort > $(LIST_BUILT) ; \
-	elif [ -d $(DEB_BUILDDIR)/mozilla/dist ] ; then \
-	find $(DEB_BUILDDIR)/mozilla/dist/bin \! -type d | cut -d/ -f5- | $(COMPARE_FILTER_PRE_IN) | sort > $(LIST_BUILT) ; \
-	else \
-	echo "Error: Can't find any suitable dist/bin directory" ; \
-	fi ; \
-	find debian/tmp -type f | cut -d/ -f3- | $(COMPARE_FILTER_PRE_OUT) | sort > $(LIST_INSTALLED) ; \
-	echo "## Compare the content of dist/bin and debian/tmp..." ; \
-	diff -u $(LIST_BUILT) $(LIST_INSTALLED)  | grep -E '^(\+|-).' | tail -n +3 ;\
-	echo "## =================================================" ; \
-	fi
-	@if [ "Z${COMPARE_FILTER_IN}Z" = "ZZ" ] ; then \
-	echo "## Can't compare debian/tmp and the debs produced (no COMPARE_FILTER_IN filter defined)" ; \
-	else \
-	echo "## Compare the content of debian/tmp and the debs produced..." ; \
-	find debian/tmp -type f | cut -d/ -f3- | $(COMPARE_FILTER_IN) | sort > $(LIST_INSTALLED) ; \
-	find $(PKG_DIRS) -type f | cut -d/ -f3- | $(COMPARE_FILTER_OUT) | sort > $(LIST_IN_DEBS) ; \
-	diff -u $(LIST_INSTALLED) $(LIST_IN_DEBS) | grep -E '^(\+|-).' | tail -n +3 ; \
-	fi
-	@echo "## End of Compare"
-	@rm -f $(LIST_BUILT) $(LIST_INSTALLED) $(LIST_IN_DEBS)
diff --git a/src/fennec.mk.in b/src/fennec.mk.in
deleted file mode 100644
index 8802c69..0000000
--- a/src/fennec.mk.in
+++ /dev/null
@@ -1,23 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-
-# Copyright (c) 2008 Fabien Tassin <fta@sofaraway.org>
-# Description: Project Fennec
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-MOZCLIENT_PROJECTNAME := fennec
-
-include mozclient.mk.in
-include xulapp.mk.in
diff --git a/src/firefox-3.0-full.mk.in b/src/firefox-3.0-full.mk.in
deleted file mode 100644
index 4a5f29d..0000000
--- a/src/firefox-3.0-full.mk.in
+++ /dev/null
@@ -1,54 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-
-# Copyright (c) 2007-2008 Fabien Tassin <fta@sofaraway.org>
-# Description: Project firefox 3.0
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-MOZCLIENT_PROJECTNAME := firefox-3.0-full
-
-include mozclient.mk.in
-
-COMPARE_FILTER_PRE_IN := sed \
-	-e 's,foo,bar,' \
-	$(NULL)
-
-COMPARE_FILTER_PRE_OUT := sed \
-	-e 's,^usr/lib/firefox-3.0[^/]*/,,' \
-        $(NULL)
-
-COMPARE_FILTER_IN    := sed \
-	-e 's,^usr/lib/firefox-3.0[^/]*/searchplugins,usr/lib/firefox-addons/searchplugins,' \
-	-e 's,^usr/lib/firefox-3.0[^/]*/extensions/inspector@mozilla.org/.*,,' \
-	-e 's,^usr/lib/firefox-3.0[^/]*/extensions,usr/lib/xulrunner-addons/extensions,' \
-	-e 's,^usr/lib/firefox-3.0[^/]*/defaults/profile,etc/firefox-3.0/profile,' \
-	-e 's,^usr/lib/firefox-3.0[^/]*/\(old-homepage-default.properties\|README.txt\|removed-files\),,' \
-	-e 's,^usr/lib/firefox-3.0[^/]*/.autoreg,,' \
-	-e 's,^etc/firefox-3.0[^/]*/.autoreg,,' \
-	$(NULL)
-
-COMPARE_FILTER_OUT   := sed \
-	-e 's,^DEBIAN/.*,,' \
-	-e 's,^usr/lib/debug/.*,,' \
-	-e 's,^usr/share/doc/.*,,' \
-	-e 's,^usr/share/menu/.*,,' \
-	-e 's,^usr/share/applications/.*,,' \
-	-e 's,^usr/share/bug/firefox-3.0/presubj,,' \
-	-e 's,^etc/firefox-3.0/\(firefoxrc\|pref/firefox.js\),,' \
-	-e 's,^usr/lib/firefox-addons/searchplugins/\(debsearch\|wikipedia\).\(gif\|src\),,' \
-	-e 's,^usr/lib/firefox-3.0[^/]*/\(firefox-3.0-restart-required.update-notifier\|firefox.cfg\|firefox.sh\|ffox-3-beta-profile-migration-dialog\),,' \
-	$(NULL)
-
-include compare.mk.in
diff --git a/src/firefox-3.0.mk.in b/src/firefox-3.0.mk.in
deleted file mode 100644
index 2f45f55..0000000
--- a/src/firefox-3.0.mk.in
+++ /dev/null
@@ -1,54 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-
-# Copyright (c) 2007-2008 Fabien Tassin <fta@sofaraway.org>
-# Description: Project firefox 3.0
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-MOZCLIENT_PROJECTNAME := firefox-3.0
-
-include mozclient.mk.in
-
-COMPARE_FILTER_PRE_IN := sed \
-	-e 's,foo,bar,' \
-	$(NULL)
-
-COMPARE_FILTER_PRE_OUT := sed \
-	-e 's,^usr/lib/firefox-3.0[^/]*/,,' \
-        $(NULL)
-
-COMPARE_FILTER_IN    := sed \
-	-e 's,^usr/lib/firefox-3.0[^/]*/searchplugins,usr/lib/firefox-addons/searchplugins,' \
-	-e 's,^usr/lib/firefox-3.0[^/]*/extensions/inspector@mozilla.org/.*,,' \
-	-e 's,^usr/lib/firefox-3.0[^/]*/extensions,usr/lib/xulrunner-addons/extensions,' \
-	-e 's,^usr/lib/firefox-3.0[^/]*/defaults/profile,etc/firefox-3.0/profile,' \
-	-e 's,^usr/lib/firefox-3.0[^/]*/\(old-homepage-default.properties\|README.txt\|removed-files\),,' \
-	-e 's,^usr/lib/firefox-3.0[^/]*/.autoreg,,' \
-	-e 's,^etc/firefox-3.0[^/]*/.autoreg,,' \
-	$(NULL)
-
-COMPARE_FILTER_OUT   := sed \
-	-e 's,^DEBIAN/.*,,' \
-	-e 's,^usr/lib/debug/.*,,' \
-	-e 's,^usr/share/doc/.*,,' \
-	-e 's,^usr/share/menu/.*,,' \
-	-e 's,^usr/share/applications/.*,,' \
-	-e 's,^usr/share/bug/firefox-3.0/presubj,,' \
-	-e 's,^etc/firefox-3.0/\(firefoxrc\|pref/firefox.js\),,' \
-	-e 's,^usr/lib/firefox-addons/searchplugins/\(debsearch\|wikipedia\).\(gif\|src\),,' \
-	-e 's,^usr/lib/firefox-3.0[^/]*/\(firefox-3.0-restart-required.update-notifier\|firefox.cfg\|firefox.sh\|ffox-3-beta-profile-migration-dialog\),,' \
-	$(NULL)
-
-include compare.mk.in
diff --git a/src/firefox-3.1.mk.in b/src/firefox-3.1.mk.in
deleted file mode 100644
index 74becad..0000000
--- a/src/firefox-3.1.mk.in
+++ /dev/null
@@ -1,54 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-
-# Copyright (c) 2008 Fabien Tassin <fta@sofaraway.org>
-# Description: Project firefox 3.1
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-MOZCLIENT_PROJECTNAME := firefox-3.1
-
-include mozclient.mk.in
-
-COMPARE_FILTER_PRE_IN := sed \
-	-e 's,foo,bar,' \
-	$(NULL)
-
-COMPARE_FILTER_PRE_OUT := sed \
-	-e 's,^usr/lib/firefox-3.1[^/]*/,,' \
-        $(NULL)
-
-COMPARE_FILTER_IN    := sed \
-	-e 's,^usr/lib/firefox-3.1[^/]*/searchplugins,usr/lib/firefox-addons/searchplugins,' \
-	-e 's,^usr/lib/firefox-3.1[^/]*/extensions/inspector@mozilla.org/.*,,' \
-	-e 's,^usr/lib/firefox-3.1[^/]*/extensions,usr/lib/xulrunner-addons/extensions,' \
-	-e 's,^usr/lib/firefox-3.1[^/]*/defaults/profile,etc/firefox-3.1/profile,' \
-	-e 's,^usr/lib/firefox-3.1[^/]*/\(old-homepage-default.properties\|README.txt\|removed-files\),,' \
-	-e 's,^usr/lib/firefox-3.1[^/]*/.autoreg,,' \
-	-e 's,^etc/firefox-3.1[^/]*/.autoreg,,' \
-	$(NULL)
-
-COMPARE_FILTER_OUT   := sed \
-	-e 's,^DEBIAN/.*,,' \
-	-e 's,^usr/lib/debug/.*,,' \
-	-e 's,^usr/share/doc/.*,,' \
-	-e 's,^usr/share/menu/.*,,' \
-	-e 's,^usr/share/applications/.*,,' \
-	-e 's,^usr/share/bug/firefox-3.1/presubj,,' \
-	-e 's,^etc/firefox-3.1/\(firefoxrc\|pref/firefox.js\),,' \
-	-e 's,^usr/lib/firefox-addons/searchplugins/\(debsearch\|wikipedia\).\(gif\|src\),,' \
-	-e 's,^usr/lib/firefox-3.1[^/]*/\(firefox-3.1-restart-required.update-notifier\|firefox.cfg\|firefox.sh\|ffox-4-beta-profile-migration-dialog\),,' \
-	$(NULL)
-
-include compare.mk.in
diff --git a/src/firefox-4.0.mk.in b/src/firefox-4.0.mk.in
deleted file mode 100644
index ccdd100..0000000
--- a/src/firefox-4.0.mk.in
+++ /dev/null
@@ -1,54 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-
-# Copyright (c) 2008 Fabien Tassin <fta@sofaraway.org>
-# Description: Project firefox 4.0
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-MOZCLIENT_PROJECTNAME := firefox-4.0
-
-include mozclient.mk.in
-
-COMPARE_FILTER_PRE_IN := sed \
-	-e 's,foo,bar,' \
-	$(NULL)
-
-COMPARE_FILTER_PRE_OUT := sed \
-	-e 's,^usr/lib/firefox-4.0[^/]*/,,' \
-        $(NULL)
-
-COMPARE_FILTER_IN    := sed \
-	-e 's,^usr/lib/firefox-4.0[^/]*/searchplugins,usr/lib/firefox-addons/searchplugins,' \
-	-e 's,^usr/lib/firefox-4.0[^/]*/extensions/inspector@mozilla.org/.*,,' \
-	-e 's,^usr/lib/firefox-4.0[^/]*/extensions,usr/lib/xulrunner-addons/extensions,' \
-	-e 's,^usr/lib/firefox-4.0[^/]*/defaults/profile,etc/firefox-4.0/profile,' \
-	-e 's,^usr/lib/firefox-4.0[^/]*/\(old-homepage-default.properties\|README.txt\|removed-files\),,' \
-	-e 's,^usr/lib/firefox-4.0[^/]*/.autoreg,,' \
-	-e 's,^etc/firefox-4.0[^/]*/.autoreg,,' \
-	$(NULL)
-
-COMPARE_FILTER_OUT   := sed \
-	-e 's,^DEBIAN/.*,,' \
-	-e 's,^usr/lib/debug/.*,,' \
-	-e 's,^usr/share/doc/.*,,' \
-	-e 's,^usr/share/menu/.*,,' \
-	-e 's,^usr/share/applications/.*,,' \
-	-e 's,^usr/share/bug/firefox-4.0/presubj,,' \
-	-e 's,^etc/firefox-4.0/\(firefoxrc\|pref/firefox.js\),,' \
-	-e 's,^usr/lib/firefox-addons/searchplugins/\(debsearch\|wikipedia\).\(gif\|src\),,' \
-	-e 's,^usr/lib/firefox-4.0[^/]*/\(firefox-4.0-restart-required.update-notifier\|firefox.cfg\|firefox.sh\|ffox-4-beta-profile-migration-dialog\),,' \
-	$(NULL)
-
-include compare.mk.in
diff --git a/src/flock.mk.in b/src/flock.mk.in
deleted file mode 100644
index 2536f48..0000000
--- a/src/flock.mk.in
+++ /dev/null
@@ -1,55 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-
-# Copyright (c) 2008 Fabien Tassin <fta@sofaraway.org>
-# Description: Project Flock
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-MOZCLIENT_PROJECTNAME := flock
-
-include mozclient.mk.in
-
-COMPARE_FILTER_PRE_IN := sed \
-	-e 's,foo,foo,' \
-	$(NULL)
-
-COMPARE_FILTER_PRE_OUT := sed \
-	-e 's,^usr/share/idl/.*,,' \
-	-e 's,^usr/include/.*,,' \
-	-e 's,^usr/lib/flock-devel.*,,' \
-	-e 's,^usr/lib/flock-2.0[^/]*/,,' \
-        $(NULL)
-
-COMPARE_FILTER_IN    := sed \
-	-e 's,^usr/lib/flock-2.0[^/]*/\(old-homepage-default.properties\|README.txt\|removed-files\),,' \
-	-e 's,^usr/lib/flock-2.0[^/]*/.autoreg,,' \
-	-e 's,^usr/share/idl/flock-2.0.*,,' \
-	-e 's,^usr/lib/flock-devel-2.0.*,,' \
-	-e 's,^usr/include/flock-2.0.*,,' \
-	-e 's,^etc/flock-2.0[^/]*/.autoreg,,' \
-	$(NULL)
-
-COMPARE_FILTER_OUT   := sed \
-	-e 's,^DEBIAN/.*,,' \
-	-e 's,^usr/lib/debug/.*,,' \
-	-e 's,^usr/share/doc/.*,,' \
-	-e 's,^usr/share/menu/.*,,' \
-	-e 's,^usr/share/applications/.*,,' \
-	-e 's,^usr/share/bug/flock-2.0/presubj,,' \
-	-e 's,^etc/flock-2.0/\(firefoxrc\|pref/firefox.js\),,' \
-	-e 's,^usr/lib/flock-2.0[^/]*/\(flock-2.0-restart-required.update-notifier\|firefox.cfg\|firefox.sh\|ffox-3-beta-profile-migration-dialog\),,' \
-	$(NULL)
-
-include compare.mk.in
diff --git a/src/lightning-sunbird.mk.in b/src/lightning-sunbird.mk.in
deleted file mode 100644
index eff5e84..0000000
--- a/src/lightning-sunbird.mk.in
+++ /dev/null
@@ -1,22 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-
-# Copyright (c) 2007 Fabien Tassin <fta@sofaraway.org>
-# Description: Project Sunbird 0.* (MOZILLA_1_8_BRANCH)
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-MOZCLIENT_PROJECTNAME := lightning-sunbird
-
-include mozclient.mk.in
diff --git a/src/lp-locale-export.mk b/src/lp-locale-export.mk
deleted file mode 100644
index 096f205..0000000
--- a/src/lp-locale-export.mk
+++ /dev/null
@@ -1,114 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-
-# Copyright (c) 2008 Canonical Ltd.
-# Author(s): Alexander Sack <asac@ubuntu.com>
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-
-# arguments: MOZ_TRANSLATION_TARGET_DIRS - application names that this xpi is suitable for
-#            MOZ_TRANSLATION_TARGET_IDS  - application IDS that this xpi can be hosted on
-#            MOZ_TRANSLATION_TARGET_MAX_VERSION_$(ID) - max version for the target application with ID
-#            MOZ_TRANSLATION_TARGET_MIN_VERSION_($ID) - min version for the target application with ID
-#
-#            MOZ_TRANSLATION_AUTO_XPI_LOCALE - locales you want to generate xpis automatically for
-#            MOZ_TRANSLATION_AUTO_XPI_SEARCHDIRS - directories you want to inspect for install manifests
-#                                                  and extract locale content from
-#            MOZ_TRANSLATION_AUTO_XPI_OUTDIR
-#
-
-
-MOZ_TRANSLATION_AUTO_XPI_LOCALE ?= en-US
-MOZ_TRANSLATION_TARGET_IDS ?= {firefox-id}
-MOZ_TRANSLATION_TARGET_DIRS ?= firefox-addons
-MOZ_TRANSLATION_AUTO_XPI_OUTDIR ?= debian/lp-export-xpis/
-#MOZ_TRANSLATION_TARGET_MAX_VERSION_{firefox-id} = 3.0.*
-#MOZ_TRANSLATION_TARGET_MIN_VERSION_{firefox-id} = 3.0b3
-
-# ----  define $(call ...) functions
-
-MOZCALL_all_manifests = \
-	$(shell \
-		find $(MOZ_TRANSLATION_AUTO_XPI_SEARCHDIRS) -name \*.manifest \
-	)
-
-MOZCALL_filter_manifest_locales_by_lang_to_norm = \
-	$(shell \
-		cat $(1) | grep "^locale " | grep " $(2) " >> $(3) \
-	)
-
-MOZCALL_manifest_locale_files_to_outdir = \
-	$(shell \
-		if test `grep -c ^locale $(1)` -gt 0; then \
-			localefiles=`cat $(1) | \
-				grep "^locale[[:space:]]" | \
-				grep "[[:space:]]$(2)[[:space:]]" | \
-				sed -e 's/^.*[[:space:]][[:space:]]*$(2)[[:space:]][[:space:]]*jar:\(.*\)!.*$$/\1/' | \
-				sed -e 's/^.*[[:space:]][[:space:]]*$(2)[[:space:]][[:space:]]*\(.*\)$$/\1/' \
-			`; \
-			echo "tar -c -C `dirname $(1)`/ -f - $$localefiles \| \
-			tar -C $(3) -x -f - " > /tmp/cmd; \
-			tar -c -C `dirname $(1)`/ -f - $$localefiles | \
-			tar -C $(3) -x -f -; \
-		 fi \
-	)
-
-
-# ---- define generic targets
-
-%.mkdir:
-	mkdir -p $*
-
-
-# create xpi in 3 steps:
-#   1. mkdir flat directory
-#   2. fill directory with locale files
-#   3. generate manifest
-
-$(MOZ_TRANSLATION_AUTO_XPI_OUTDIR)%.xpi: \
-	$(MOZ_TRANSLATION_AUTO_XPI_OUTDIR)%.xpi-flat.mkdir
-
-	# extract locale filenames from $$(MOZCALL_all_manifests) and
-	# move the files to $$(MOZCALL_manifest_locale_files_to_outdir)
-	$(foreach manifest,$(MOZCALL_all_manifests), \
-		$(call MOZCALL_manifest_locale_files_to_outdir, \
-			$(manifest),$*,$@-flat/))
-
-	# produce chrome.manifest for all locale entries
-	$(foreach manifest,$(MOZCALL_all_manifests), \
-		$(call MOZCALL_filter_manifest_locales_by_lang_to_norm, \
-			$(manifest),$*,$@-flat/chrome.manifest))
-
-	@sh -c "cd $@-flat/; zip -r ../$*.xpi ."
-	rm -rf $@-flat/
-
-
-# translate
-auto-locale-xpi.mk/translate : \
-	$(foreach l,$(MOZ_TRANSLATION_AUTO_XPI_LOCALE),$(MOZ_TRANSLATION_AUTO_XPI_OUTDIR)$(l).xpi)
-
-
-auto-locale-xpi.mk/clean:
-	rm -rf $(MOZ_TRANSLATION_AUTO_XPI_OUTDIR)*.xpi $(MOZ_TRANSLATION_AUTO_XPI_OUTDIR)*.xpi-flat
-
-
-# ---- hook in cdbs
-
-# run this in binary-post-install
-binary-post-install/%:: auto-locale-xpi.mk/translate
-
-clean::
-	rm -rf $(MOZ_TRANSLATION_AUTO_XPI_OUTDIR)/
-
diff --git a/src/minefield-packager.mk.in b/src/minefield-packager.mk.in
deleted file mode 100644
index 57b762a..0000000
--- a/src/minefield-packager.mk.in
+++ /dev/null
@@ -1,145 +0,0 @@
-#!/usr/bin/make -f
-
-# Copyright (c) 2007-2008 Fabien Tassin <fta@sofaraway.org>
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-#####################################################################
-
-URLBASE    := http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/
-MACHINE    := $(shell uname -m)
-WORKDIR    := temp-$(shell echo $$$$)
-BUILDSTAMP := $(WORKDIR)/build-stamp
-PKGNAME    := firefox-minefield
-TRUNK_SIG  := mozilla-central
-
-MOZDEVSCRIPT_DIR := minefield-packager
-LIBDIR           := $(MOZDEVSCRIPT_DIR)/
-
-ifeq (,$(filter i686 x86_64,$(MACHINE)))
-$(error $(MACHINE) is not a supported platform)
-endif
-
-ifeq (,$(DEBIAN_DATE))
-SNAPSHOT=latest
-else
-SNAPSHOT=$(DEBIAN_DATE)
-endif
-
-LINE := $(shell wget -qO - $(URLBASE)$(SNAPSHOT)-$(TRUNK_SIG)/ | grep linux-$(MACHINE).tar.bz2)
-
-ifeq (,$(LINE))
-$(error Could not find a valid archive for $(MACHINE))
-endif
-
-FILE := $(shell echo '$(LINE)' | cut -d'"' -f8)
-
-#############################
-
-GARBAGE += $(WORKDIR)
-
-.PHONY: build
-build: $(BUILDSTAMP) make_deb clean
-
-list:
-	@echo Available snapshots are:
-	@wget -qO - $(URLBASE) | grep -- -$(TRUNK_SIG)/ | cut -d'"' -f8,11 | sed -e 's,\(.*\)-$(TRUNK_SIG)/">\(.*\)  .*,\1	\2,'
-
-$(BUILDSTAMP):
-	rm -rf $(WORKDIR)
-	mkdir -p $(WORKDIR)/debian/tmp/DEBIAN $(WORKDIR)/debian/tmp/usr/lib
-	wget -P $(WORKDIR) $(URLBASE)$(SNAPSHOT)-$(TRUNK_SIG)/$(FILE)
-	tar -C $(WORKDIR)/debian/tmp -jxf $(WORKDIR)/$(FILE)
-	mv $(WORKDIR)/debian/tmp/firefox $(WORKDIR)/debian/tmp/usr/lib/$(PKGNAME)
-	touch $(BUILDSTAMP)
-
-#############################
-
-make_deb_targets = \
-	$(WORKDIR)/debian/tmp/usr/bin/$(PKGNAME) \
-	$(WORKDIR)/debian/tmp/usr/share/applications/$(PKGNAME).desktop \
-	$(WORKDIR)/debian/tmp/usr/share/pixmaps/$(PKGNAME).png \
-	$(WORKDIR)/debian/tmp/DEBIAN/changelog \
-	$(WORKDIR)/debian/tmp/DEBIAN/control \
-	$(WORKDIR)/debian/tmp/DEBIAN/md5sums \
-	$(NULL)
-
-make_deb: BUILDID = $(shell grep ^BuildID $(WORKDIR)/debian/tmp/usr/lib/$(PKGNAME)/platform.ini | cut -d= -f2)
-make_deb: VERSION = $(shell echo $(FILE) | sed -e 's/^[^-]*-//' | cut -d. -f1,2 | sed -e 's/pre//' -e 's/\([ab]\)/~\1/')
-make_deb: PACKDATE := $(shell date -R)
-make_deb: $(BUILDSTAMP) $(WORKDIR)/shlibs.local $(make_deb_targets)
-	fakeroot dpkg-deb -b $(WORKDIR)/debian/tmp .
-
-#############################
-
-$(WORKDIR)/debian/tmp/usr/bin/$(PKGNAME): $(BUILDSTAMP)
-	mkdir -p $(WORKDIR)/debian/tmp/usr/bin
-	cd $(WORKDIR)/debian/tmp/usr/bin ; ln -s ../lib/$(PKGNAME)/firefox $(PKGNAME)
-
-#############################
-
-$(WORKDIR)/debian/tmp/usr/share/applications/$(PKGNAME).desktop: $(LIBDIR)debian/pkgname.desktop.in $(BUILDSTAMP)
-	mkdir -p $(WORKDIR)/debian/tmp/usr/share/applications
-	cat $< | sed \
-	-e 's/@PKGNAME@/$(PKGNAME)/g' \
-	-e 's/@VERSION@/$(subst ~, ,$(VERSION))pre/g' \
-	-e 's/@BUILDID@/$(BUILDID)/g' \
-	> $@
-
-#############################
-
-$(WORKDIR)/debian/tmp/usr/share/pixmaps/$(PKGNAME).png: $(BUILDSTAMP)
-	mkdir -p $(WORKDIR)/debian/tmp/usr/share/pixmaps
-	cp $(WORKDIR)/debian/tmp/usr/lib/$(PKGNAME)/icons/mozicon128.png $(WORKDIR)/debian/tmp/usr/share/pixmaps/$(PKGNAME).png
-
-#############################
-
-$(WORKDIR)/debian/tmp/DEBIAN/changelog: $(LIBDIR)debian/changelog.in $(BUILDSTAMP)
-	cat $< | sed \
-	-e 's/@PKGNAME@/$(PKGNAME)/g' \
-	-e 's/@VERSION@/$(VERSION)~build$(BUILDID)/g' \
-	-e 's/@DATE@/$(PACKDATE)/g' \
-	> $@
-
-#############################
-
-$(WORKDIR)/debian/tmp/DEBIAN/control: DEPENDS = $(shell sed -e 's/, $$//' $(WORKDIR)/deps)
-$(WORKDIR)/debian/tmp/DEBIAN/control: ARCH = $(shell dpkg-architecture -qDEB_BUILD_ARCH)
-$(WORKDIR)/debian/tmp/DEBIAN/control: $(LIBDIR)debian/control.in $(BUILDSTAMP)
-	cat $< | sed \
-	-e 's/@PKGNAME@/$(PKGNAME)/g' \
-	-e 's/@ARCH@/$(ARCH)/g' \
-	-e 's/@VERSION@/$(VERSION)~build$(BUILDID)/g' \
-	-e 's/@DEPENDS@/$(DEPENDS)/g' \
-	> $@
-
-#############################
-
-$(WORKDIR)/shlibs.local: SOFILES = $(shell cd $(WORKDIR)/debian/tmp ; find usr -type f -print0 | xargs -0 file | awk '$$2 ~ /^ELF/ {print $$1}' | sed 's/:$$//')
-$(WORKDIR)/shlibs.local: SONAMES = $(foreach sofile,$(SOFILES),$(shell objdump -p $(WORKDIR)/debian/tmp/$(sofile) | awk '$$1 == "SONAME" && $$2 !~ /^\.\// {print $$2}'))
-$(WORKDIR)/shlibs.local:
-	(echo "Source: $(PKGNAME)"; echo ; echo "Package: $(PKGNAME)" ; echo "Depends:") > $(WORKDIR)/debian/control
-	(for soname in $(SONAMES) ; do echo $$soname | sed -e 's/\(.*\)\.so\.\(.*\)/\1 \2 \1-\2/' -e 's/.*\.so$$//' ; done) | sort -u | grep -vE '^$$' > $(WORKDIR)/shlibs.local || test $$? = 1
-	cd $(WORKDIR); (for file in $(SOFILES); do LD_LIBRARY_PATH=debian/tmp/usr/lib/$(PKGNAME) dpkg-shlibdeps -O -Lshlibs.local "debian/tmp/$$file" 2> /dev/null | sed -e 's/^shlibs:Depends=//' -e 's/, /\n/g'; done) | sort -u | tr '\n' ',' | sed -e 's/ *,/, /g' > deps
-	rm -f $(WORKDIR)/shlibs.local $(WORKDIR)/debian/control
-
-#############################
-
-$(WORKDIR)/debian/tmp/DEBIAN/md5sums:
-	(cd $(WORKDIR)/debian/tmp && find usr -type f -print0 | xargs -0 md5sum) > $@
-
-.PHONY: clean
-clean:
-	@rm -rf $(GARBAGE)
diff --git a/src/minefield-packager/debian/changelog.in b/src/minefield-packager/debian/changelog.in
deleted file mode 100644
index e4f4bf3..0000000
--- a/src/minefield-packager/debian/changelog.in
+++ /dev/null
@@ -1,5 +0,0 @@
-@PKGNAME@ (@VERSION@-1) testing; urgency=low
-
-  * New upstream build: @VERSION@
-
- -- Ubuntu Mozilla Team <ubuntu-mozillateam@lists.ubuntu.com>  @DATE@
diff --git a/src/minefield-packager/debian/compat b/src/minefield-packager/debian/compat
deleted file mode 100644
index 7ed6ff8..0000000
--- a/src/minefield-packager/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/src/minefield-packager/debian/control.in b/src/minefield-packager/debian/control.in
deleted file mode 100644
index c6d2419..0000000
--- a/src/minefield-packager/debian/control.in
+++ /dev/null
@@ -1,12 +0,0 @@
-Package: @PKGNAME@
-Version: @VERSION@-1
-Section: net
-Priority: optional
-Maintainer: Ubuntu Mozilla Team <ubuntu-mozillateam@lists.ubuntu.com>
-Architecture: @ARCH@
-Depends: @DEPENDS@
-Description: Minefield web browser nightly build
- Minefield is the code name of the nighly build of the developpement branch
- of Mozilla Firefox. It is often useful to try those builds in order
- to check if a bug in the ubuntu firefox package is Ubuntu specific or
- also present in the upstream build.
diff --git a/src/minefield-packager/debian/pkgname.desktop.in b/src/minefield-packager/debian/pkgname.desktop.in
deleted file mode 100644
index 896032a..0000000
--- a/src/minefield-packager/debian/pkgname.desktop.in
+++ /dev/null
@@ -1,15 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Encoding=UTF-8
-Name=Minefield @VERSION@ Nightly
-Comment=Minefield @VERSION@ (Mozilla nightly build @BUILDID@)
-GenericName=Web Browser
-Exec=@PKGNAME@ %u
-Terminal=false
-X-MultipleArgs=false
-Type=Application
-Icon=@PKGNAME@
-Categories=Application;Network;
-MimeType=text/html;text/xml;application/xhtml+xml;application/xml;application/vnd.mozilla.xul+xml;application/rss+xml;application/rdf+xml;
-StartupWMClass=Minefield
-StartupNotify=true
diff --git a/src/mozclient.mk.in b/src/mozclient.mk.in
deleted file mode 100644
index 3d2955e..0000000
--- a/src/mozclient.mk.in
+++ /dev/null
@@ -1,77 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-
-# Copyright (c) 2007-2008 Fabien Tassin <fta@sofaraway.org>
-# Description: The 'mozclient' module of mozilla-devscripts
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-#####################################################################
-
-# Don't include this file directly, include one of the project.mk
-# file instead, which will include this file for you.
-
-MOZDEVSCRIPT_DIR = mozclient
-
-ifeq (mozclient,$(MOZDEVSCRIPT_DIR))
-  ARGS += -c $(MOZDEVSCRIPT_DIR)
-endif
-
-ifdef DEBIAN_TAG
-  ARGS += -t $(DEBIAN_TAG)
-endif
-
-ifdef DEBIAN_DATE
-  ARGS += -d $(DEBIAN_DATE)
-endif
-
-ifdef DEBIAN_BRANCH
-  ARGS += -b $(DEBIAN_BRANCH)
-endif
-
-ifdef DEBIAN_KEEP_VCS
-  ARGS += -p
-endif
-
-ifdef MOZCLIENT_EMBEDDED
-  ARGS += -e
-endif
-
-ifdef MOZ_CO_MODULE
-  # MOZ_CO_MODULE is a list of comma separated paths (no spaces)
-  ARGS += -m $(MOZ_CO_MODULE)
-endif
-
-ifdef MOZCLIENT_PROJECTDIR
-  ARGS += -c $(MOZCLIENT_PROJECTDIR)
-endif
-
-ifdef LOCAL_BRANCH
-  ARGS += -L $(LOCAL_BRANCH)
-endif
-
-ifeq (,$(MOZCLIENT_PROJECTNAME))
-$(error You must specify MOZCLIENT_PROJECTNAME)
-endif
-
-list-tags:
-	perl $(MOZDEVSCRIPT_DIR)/mozclient.pl $(ARGS) -l $(MOZCLIENT_PROJECTNAME)
-
-get-orig-source:
-	perl $(MOZDEVSCRIPT_DIR)/mozclient.pl $(ARGS) $(MOZCLIENT_PROJECTNAME)
-
-mozclient-version:
-	perl $(MOZDEVSCRIPT_DIR)/mozclient.pl $(ARGS) -V $(MOZCLIENT_PROJECTNAME)
-
-.PHONY: get-orig-source list-tags mozclient-version
diff --git a/src/mozclient/fennec.conf b/src/mozclient/fennec.conf
deleted file mode 100644
index 70bbfb2..0000000
--- a/src/mozclient/fennec.conf
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright (c) 2008 Fabien Tassin <fta@sofaraway.org>
-# Description: Project Fennec
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-MOZCLIENT_APPNAME    = fennec
-MOZCLIENT_PROJECT    = mobile-browser
-MOZCLIENT_FILE       = mobile/confvars.sh
-MOZCLIENT_GETVERSION = grep ^MOZ_APP_VERSION mobile/confvars.sh | cut -d= -f2 | sed -e 's/pre//; s/\([ab]\)\([0-9]*\)/~\1\2/'
-MOZCLIENT_VCS        = hg
-MOZCLIENT_VCS_LOC    = http://hg.mozilla.org/
-MOZCLIENT_GETDATE    = wget -O - -q --read-timeout=10 --user-agent='' --tries=3 http://hg.mozilla.org/index.cgi/mobile-browser/log 2> /dev/null | grep cite | head -1 | sed -e 's,.*</cite>,,' | perl -e '$m = { "Jan" => 1, "Feb" => 2, "Mar" => 3, "Apr" => 4, "May" => 5, "Jun" => 6, "Jul" => 7, "Aug" => 8, "Sep" => 9, "Oct" => 10, "Nov" => 11, "Dec" => 12 } ; $a = <>; $a =~ m/^ - \S+,\s+(\d+) (\S+) (\d+) \S+ \S+ - rev (\d+)/ && do { printf "%04d%02d%02dr%d\n", $3, $$m{$2}, $1, $4 }; '
-MOZCLIENT_EMBEDDED  = 0
-MOZCLIENT_WANTMOZDIR = 1
-MOZCLIENT_MOZDIRNAME = mobile
-MOZCLIENT_TAREXCLUDE = CVS .cvsignore
diff --git a/src/mozclient/firefox-3.0-full.conf b/src/mozclient/firefox-3.0-full.conf
deleted file mode 100644
index 6dfe537..0000000
--- a/src/mozclient/firefox-3.0-full.conf
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright (c) 2007-2008 Fabien Tassin <fta@sofaraway.org>
-# Project: firefox-3.0
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-MOZCLIENT_APPNAME    = firefox-3.0
-MOZCLIENT_PROJECT    = browser
-MOZCLIENT_VCS        = cvs
-MOZCLIENT_VCS_LOC    = :pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot
-MOZCLIENT_FILE       = mozilla/browser/config/version.txt
-MOZCLIENT_GETVERSION = sed -e 's/pre//; s/a\([0-9]*\)/~alpha\1/; s/b\([0-9]*\)/~b\1/' mozilla/browser/config/version.txt
-MOZCLIENT_GETDATE    = wget -O - -q --read-timeout=10 --user-agent='' --tries=3 'http://bonsai.mozilla.org/cvsquery.cgi?treeid=default&module=SeaMonkeyBrowser&branch=HEAD&branchtype=match&dir=&file=&filetype=match&who=&whotype=match&sortby=Date&hours=2&date=week&mindate=&maxdate=&cvsroot=%2Fcvsroot' 2> /dev/null | grep "href='http://webtools" | head -1 | tr '<>' '@' | cut -d@ -f5 | tr -d ':-' | sed -e 's/&nbsp;/t/'
-MOZCLIENT_EMBEDDED   = 1
-MOZCLIENT_WANTMOZDIR = 1
diff --git a/src/mozclient/firefox-3.0.conf b/src/mozclient/firefox-3.0.conf
deleted file mode 100644
index 9021dd3..0000000
--- a/src/mozclient/firefox-3.0.conf
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright (c) 2007-2008 Fabien Tassin <fta@sofaraway.org>
-# Project: firefox-3.0
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-MOZCLIENT_APPNAME    = firefox-3.0
-MOZCLIENT_PROJECT    = xulbrowser
-MOZCLIENT_VCS        = cvs
-MOZCLIENT_VCS_LOC    = :pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot
-MOZCLIENT_FILE       = mozilla/browser/config/version.txt
-MOZCLIENT_GETVERSION = sed -e 's/pre//; s/a\([0-9]*\)/~alpha\1/; s/b\([0-9]*\)/~b\1/' mozilla/browser/config/version.txt
-MOZCLIENT_GETDATE    = wget -O - -q --read-timeout=10 --user-agent='' --tries=3 'http://bonsai.mozilla.org/cvsquery.cgi?treeid=default&module=SeaMonkeyBrowser&branch=HEAD&branchtype=match&dir=&file=&filetype=match&who=&whotype=match&sortby=Date&hours=2&date=week&mindate=&maxdate=&cvsroot=%2Fcvsroot' 2> /dev/null | grep "href='http://webtools" | head -1 | tr '<>' '@' | cut -d@ -f5 | tr -d ':-' | sed -e 's/&nbsp;/t/'
-MOZCLIENT_EMBEDDED   = 1
-MOZCLIENT_WANTMOZDIR = 1
-MOZCLIENT_WANTPATCH  = 1
-MOZCLIENT_POSTCOCMD  = bzr branch lp:~mozillateam/firefox/awesome-browser-branding-3.0 && mv awesome-browser-branding-3.0 mozilla/browser/branding/awesome-browser
diff --git a/src/mozclient/firefox-3.1.conf b/src/mozclient/firefox-3.1.conf
deleted file mode 100644
index b16ce73..0000000
--- a/src/mozclient/firefox-3.1.conf
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright (c) 2008 Fabien Tassin <fta@sofaraway.org>
-# Description: Project firefox 3.1
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-MOZCLIENT_APPNAME    = firefox-3.1
-MOZCLIENT_PROJECT    = mozilla-central
-MOZCLIENT_VCS        = hg
-MOZCLIENT_VCS_LOC    = http://hg.mozilla.org/
-MOZCLIENT_FILE       = mozilla/browser/config/version.txt
-MOZCLIENT_GETVERSION = sed -e 's/pre//; s/\([ab]\)\([0-9]*\)/~\1\2/' mozilla/browser/config/version.txt
-#MOZCLIENT_POSTCOCMD  = cd mozilla && python client.py checkout
-MOZCLIENT_GETDATE    = wget -O - -q --read-timeout=10 --user-agent='' --tries=3 http://hg.mozilla.org/index.cgi/mozilla-central/log 2> /dev/null | grep cite | head -1 | sed -e 's,.*</cite>,,' | perl -e '$m = { "Jan" => 1, "Feb" => 2, "Mar" => 3, "Apr" => 4, "May" => 5, "Jun" => 6, "Jul" => 7, "Aug" => 8, "Sep" => 9, "Oct" => 10, "Nov" => 11, "Dec" => 12 } ; $a = <>; $a =~ m/^ - \S+,\s+(\d+) (\S+) (\d+) \S+ \S+ - rev (\d+)/ && do { printf "%04d%02d%02dr%d\n", $3, $$m{$2}, $1, $4 }; '
-MOZCLIENT_EMBEDDED   = 1
-MOZCLIENT_WANTMOZDIR = 1
-MOZCLIENT_POSTCOCMD  = bzr branch lp:~mozillateam/firefox/awesome-browser-branding && mv awesome-browser-branding mozilla/browser/branding/awesome-browser
diff --git a/src/mozclient/firefox-4.0.conf b/src/mozclient/firefox-4.0.conf
deleted file mode 100644
index 8f4c27c..0000000
--- a/src/mozclient/firefox-4.0.conf
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright (c) 2008 Fabien Tassin <fta@sofaraway.org>
-# Description: Project firefox 4.0
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-MOZCLIENT_APPNAME    = firefox-4.0
-MOZCLIENT_PROJECT    = mozilla-central
-MOZCLIENT_VCS        = hg
-MOZCLIENT_VCS_LOC    = http://hg.mozilla.org/
-MOZCLIENT_FILE       = mozilla/browser/config/version.txt
-MOZCLIENT_GETVERSION = sed -e 's/pre//; s/\([ab]\)\([0-9]*\)/~\1\2/' mozilla/browser/config/version.txt
-MOZCLIENT_POSTCOCMD  = cd mozilla && python client.py checkout
-MOZCLIENT_GETDATE    = wget -O - -q --read-timeout=10 --user-agent='' --tries=3 http://hg.mozilla.org/index.cgi/mozilla-central/log 2> /dev/null | grep cite | head -1 | sed -e 's,.*</cite>,,' | perl -e '$m = { "Jan" => 1, "Feb" => 2, "Mar" => 3, "Apr" => 4, "May" => 5, "Jun" => 6, "Jul" => 7, "Aug" => 8, "Sep" => 9, "Oct" => 10, "Nov" => 11, "Dec" => 12 } ; $a = <>; $a =~ m/^ - \S+,\s+(\d+) (\S+) (\d+) \S+ \S+ - rev (\d+)/ && do { printf "%04d%02d%02dr%d\n", $3, $$m{$2}, $1, $4 }; '
-MOZCLIENT_EMBEDDED   = 1
-MOZCLIENT_WANTMOZDIR = 1
-MOZCLIENT_POSTCOCMD  = bzr branch lp:~mozillateam/firefox/awesome-browser-branding && mv awesome-browser-branding mozilla/browser/branding/awesome-browser
diff --git a/src/mozclient/flock-remove.binonly.sh b/src/mozclient/flock-remove.binonly.sh
deleted file mode 100644
index b387646..0000000
--- a/src/mozclient/flock-remove.binonly.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/sh
-
-rm -fv ./other-licenses/branding/Sulfur/nsi-installer/install_flash_player.exe
-rm -fv ./other-licenses/branding/Sulfur/nsi-installer/SetBrowser.EXE
-rm -fv ./other-licenses/branding/Sulfur/nsi-installer/FLset.exe
-rm -fv ./other-licenses/branding/Sulfur/nsi-installer/RunCmdFile.exe
-rm -fv ./other-licenses/branding/Flock/nsi-installer/install_flash_player.exe
-rm -fv ./other-licenses/branding/Flock/nsi-installer/SetBrowser.EXE
-rm -fv ./other-licenses/branding/Flock/nsi-installer/FLset.exe
-rm -fv ./other-licenses/branding/Flock/nsi-installer/RunCmdFile.exe
-rm -fv ./other-licenses/branding/Flock/installer/photobucket/install_flash_player.exe
-rm -fv ./other-licenses/branding/Flock/installer/photobucket/SetBrowser.EXE
-rm -fv ./other-licenses/branding/Flock/installer/photobucket/FLset.exe
-rm -fv ./other-licenses/branding/Flock/installer/photobucket/RunCmdFile.exe
-rm -fv ./other-licenses/bundled/install_flash_player.exe
-rm -fv ./flock/base/photo/gm/linux/gm
-rm -fv ./flock/base/photo/gm/osx/ppc/gm
-rm -fv ./flock/base/photo/gm/osx/universal/gm
-rm -fv ./flock/base/photo/gm/osx/i386/gm
-rm -fv ./flock/base/photo/gm/win/gm.exe
-rm -fv ./flock/installer/windows/Processes.dll
-rm -fv ./flock/installer/windows/AppAssocReg.dll
-rm -fv ./flock/installer/windows/UAC.dll
-rm -fv ./flock/installer/windows/7zSD.sfx
-rm -fv ./flock/installer/windows/nsProcess.dll
-rm -fv ./flock/installer/windows/ShellLink.dll
-rm -fv ./flock/installer/windows/time.dll
-rm -fv ./flock/installer/windows/inetc.dll
diff --git a/src/mozclient/flock.conf b/src/mozclient/flock.conf
deleted file mode 100644
index 53bf86e..0000000
--- a/src/mozclient/flock.conf
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright (c) 2008 Fabien Tassin <fta@sofaraway.org>
-# Description: Project Flock
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-MOZCLIENT_APPNAME    = flock
-MOZCLIENT_PROJECT    = flock/trunk
-MOZCLIENT_VCS        = svn
-MOZCLIENT_VCS_LOC    = svn://svn-mirror.flock.com/master/
-MOZCLIENT_FILE       = mozilla/flock/config/version.txt
-MOZCLIENT_GETVERSION = sed -e 's/pre//; s/\([ab]\)\([0-9]*\)/~\1\2/' mozilla/flock/config/version.txt
-MOZCLIENT_GETDATE    = svn log --xml --limit 1 svn://svn-mirror.flock.com/master/flock/trunk/mozilla | grep -E '^( *revision=|<date>)' | tr -d '\n' | sed -e 's/.*"\([0-9]*\)".*>\(....\)-\(..\)-\(..\)T.*/\2\3\4r\1/'
-MOZCLIENT_EMBEDDED   = 1
-MOZCLIENT_WANTMOZDIR = 0
-MOZCLIENT_TAREXCLUDE = CVS .cvsignore
diff --git a/src/mozclient/lib/MozClient/CVS.pm b/src/mozclient/lib/MozClient/CVS.pm
deleted file mode 100644
index 81cbb7c..0000000
--- a/src/mozclient/lib/MozClient/CVS.pm
+++ /dev/null
@@ -1,161 +0,0 @@
-# -*- mode: Perl -*-
-
-# Copyright (c) 2007-2008 Fabien Tassin <fta@sofaraway.org>
-# Description: MozClient::CVS
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-############################################################################
-
-package MozClient::CVS;
-
-use vars qw(@ISA);
-use strict;
-use Carp;
-use MozClient::VCS;
-
-@ISA = ("MozClient::VCS");
-
-# Return the list of TAGs known by the VCS for MOZCLIENT_FILE
-sub list_tags {
-  my $self = shift;
-
-  $self->LOG("MozClient::CVS::list_tags()");
-  $self->chdir($self->work_dir);
-  $self->run_system("cvs -d " . $self->{'MOZCLIENT_VCS_LOC'} . " co " .
-	      (join ' ',  @{$self->{'MOZCLIENT_FILE'}}));
-  my $file = ${$self->{'MOZCLIENT_FILE'}}[0];
-  $file =~ s,^([^/]*)/,,;
-  $self->chdir("$1");
-  $self->run_system("cvs status -v $file");
-  $self->chdir("../..");
-}
-
-sub do_dynamic_tag {
-  my $self = shift;
-
-  $self->LOG("MozClient::CVS::do_dynamic_tag()");
-  # We want a dynamic TAG. Fetch files listed in MOZCLIENT_DYNTAG_FILES, then
-  # apply MOZCLIENT_DYNTAG rule to set $want_tag
-  confess "Error: Missing MOZCLIENT_DYNTAG_FILES"
-    unless defined $self->{'MOZCLIENT_DYNTAG_FILES'};
-  $self->chdir($self->work_dir);
-  my $date = "";
-  $date = '-D "' . $self->convert_revdate($self->{'have_date'}) . '"'
-    if defined $self->{'have_date'};
-  undef $self->{'have_date'};
-  my $cmd = sprintf "cvs -d %s co %s", $self->{'MOZCLIENT_VCS_LOC'},
-    $self->{'MOZCLIENT_DYNTAG_FILES'};
-  $self->run_system($cmd);
-  chomp($self->{'want_tag'} = `$self->{'MOZCLIENT_DYNTAG'}`);
-  $self->LOG2("\$ want_tag=`" . $self->{'MOZCLIENT_DYNTAG'} . "` # => " .
-	      $self->{'want_tag'});
-  $self->chdir("..");
-}
-
-sub get_client {
-  my $self = shift;
-
-  $self->LOG("MozClient::CVS::get_client()");
-  my $tbranch = defined $self->{'want_branch'} ?
-    "-r " . $self->{'want_branch'} : "";
-
-  $self->chdir($self->work_dir);
-  my $cmd = sprintf "cvs -d %s co %s %s %s %s", $self->{'MOZCLIENT_VCS_LOC'},
-    $tbranch, $self->{'mozclient_date'}, $self->{'co_tag'},
-    $self->{'MOZILLA_CLIENT'};
-  $self->run_system($cmd);
-  $self->chdir("..");
-
-  if (defined $self->{'MOZCLIENT_WANTPATCH'} &&
-      $self->{'MOZCLIENT_WANTPATCH'}) {
-    my $cmd = sprintf "ln -s %s %s/patches", $self->{'MOZCLIENT_PATCHES'},
-      $self->work_dir;
-    $self->run_system($cmd);
-    $self->chdir($self->work_dir);
-    $self->run_system("quilt --quiltrc /dev/null push -a");
-    $self->chdir("..");
-  }
-}
-
-sub convert_revdate {
-  my $self = shift;
-  my $arg = shift;
-
-  $self->LOG("MozClient::CVS::convert_revdate($arg)");
-  $arg =~ s,(....)(..)(..)[rt](..)(..),$1/$2/$3 $4:$5 PST,;
-  $arg;
-}
-
-sub set_revdate {
-  my $self = shift;
-
-  $self->LOG("MozClient::CVS::set_revdate()");
-
-  # We can set a date for CVS
-  if (defined $self->{'MOZCLIENT_PROJECT'}) {
-    $self->{'mozclient_date'} =
-      'MOZ_CO_DATE="' . $self->convert_revdate($self->{'have_date'}) . '"';
-  }
-  else {
-    $self->{'mozclient_date'} =
-      '-D "' . $self->convert_revdate($self->{'have_date'}) . '"';
-  }
-}
-
-sub set_tag {
-  my $self = shift;
-  my $tag  = shift;
-
-  $self->LOG("MozClient::CVS::set_tag($tag)");
-
-  $self->{'co_tag'} = "-r $tag";
-  $self->{'moz_co_tag'} = "MOZ_CO_TAG=$tag";
-}
-
-sub checkout {
-  my $self = shift;
-
-  $self->LOG("MozClient:CVS::checkout:()");
-
-  if (defined $self->{'local-branch'}) {
-    confess "Can't MozClient::checkout() a local branch for " . $self->vcs;
-    # TODO: fix it if needed
-  }
-
-  $self->chdir($self->work_dir);
-  if (defined $self->{'MOZCLIENT_PROJECT'}) {
-    my $cmd = sprintf "make -f %s checkout MOZ_CO_PROJECT=%s %s %s",
-      $self->{'MOZILLA_CLIENT'}, $self->{'MOZCLIENT_PROJECT'},
-      $self->{'mozclient_date'}, $self->{'moz_co_tag'};
-    $self->run_system($cmd);
-  }
-  else {
-    my $cmd = sprintf "cvs -d %s -q -z 3 co -P -A %s %s %s",
-      $self->{'MOZCLIENT_VCS_LOC'}, $self->{'mozclient_date'},
-      $self->{'co_tag'}, $self->{'MOZCLIENT_MODULES'};
-    $self->run_system($cmd);
-  }
-  $self->chdir("..");
-}
-
-sub tar_exclude {
-  my $self = shift;
-
-  $self->LOG("MozClient::CVS::tar_exclude()");
-  [ '--exclude CVS', '--exclude .cvsignore' ];
-}
-
-1;
diff --git a/src/mozclient/lib/MozClient/Git.pm b/src/mozclient/lib/MozClient/Git.pm
deleted file mode 100644
index e160af3..0000000
--- a/src/mozclient/lib/MozClient/Git.pm
+++ /dev/null
@@ -1,106 +0,0 @@
-# -*- mode: Perl -*-
-
-# Copyright (c) 2007-2008 Fabien Tassin <fta@sofaraway.org>
-# Description: MozClient::Git
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-############################################################################
-
-package MozClient::Git;
-
-use vars qw(@ISA);
-use strict;
-use Carp;
-use MozClient::VCS;
-
-@ISA = ("MozClient::VCS");
-
-sub get_client {
-  my $self = shift;
-
-  $self->LOG("MozClient::Git::get_client()");
-  # nothing to do
-}
-
-sub convert_revdate {
-  my $self = shift;
-  my $arg = shift;
-
-  $self->LOG("MozClient::Git::convert_revdate($arg)");
-  $arg =~ s,^\d+r,,;
-  $arg;
-}
-
-sub set_revdate {
-  my $self = shift;
-
-  $self->LOG("MozClient::Git::set_revdate()");
-
-  # We can set a revision for git
-  $self->{'mozclient_date'} =
-    $self->convert_revdate($self->{'have_date'});
-}
-
-sub set_tag {
-  my $self = shift;
-  my $tag  = shift;
-
-  $self->LOG("MozClient::Git::set_tag($tag)");
-
-  $self->{'co_tag'} = "$tag";
-}
-
-sub checkout {
-  my $self = shift;
-
-  $self->LOG("MozClient:Git::checkout:()");
-
-  if (defined $self->{'local-branch'}) {
-    confess "Can't MozClient::checkout() a local branch for " . $self->vcs;
-    # TODO: fix it if needed
-  }
-  $self->chdir($self->work_dir);
-  my $modules = [];
-  if (defined $self->{'MOZCLIENT_PROJECT'}) {
-    push @$modules,
-      $self->{'MOZCLIENT_VCS_LOC'} . $self->{'MOZCLIENT_PROJECT'} . "/";
-  }
-  else {
-    warn "MOZCLIENT_MODULES not supported for Git";
-    for my $module (@{$self->{'MOZCLIENT_MODULES'}}) {
-      push @$modules, (sprintf " %s%s/%s", $self->{'MOZCLIENT_VCS_LOC'},
-	$self->{'MOZCLIENT_PROJECT'}, $module);
-    }
-  }
-  my $cmd = sprintf "git clone %s %s", join(" ", @$modules), $self->{'MOZCLIENT_MOZDIRNAME'};
-  $self->run_system($cmd);
-  $self->chdir($self->{'MOZCLIENT_MOZDIRNAME'});
-  my $rev =  $self->{'mozclient_date'} ?  $self->{'mozclient_date'} : $self->{'co_tag'};
-  $cmd = sprintf "git branch %s %s", $rev, $rev;
-  $self->run_system($cmd);
-  $cmd = sprintf "git checkout %s", $rev;
-  $self->run_system($cmd);
-  $self->chdir("../..");
-}
-
-sub tar_exclude {
-  my $self = shift;
-
-  $self->LOG("MozClient::Git::tar_exclude()");
-  [ '--exclude .git', '--exclude .gitignore' ];
-}
-
-1;
diff --git a/src/mozclient/lib/MozClient/Mercurial.pm b/src/mozclient/lib/MozClient/Mercurial.pm
deleted file mode 100644
index f3c4527..0000000
--- a/src/mozclient/lib/MozClient/Mercurial.pm
+++ /dev/null
@@ -1,105 +0,0 @@
-# -*- mode: Perl -*-
-
-# Copyright (c) 2007-2008 Fabien Tassin <fta@sofaraway.org>
-# Description: MozClient::Mercurial
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-############################################################################
-
-package MozClient::Mercurial;
-
-use vars qw(@ISA);
-use strict;
-use MozClient::VCS;
-
-@ISA = ("MozClient::VCS");
-
-sub get_client {
-  my $self = shift;
-
-  $self->LOG("MozClient::Mercurial::get_client()");
-  # nothing to do
-}
-
-sub convert_revdate {
-  my $self = shift;
-  my $arg = shift;
-
-  $self->LOG("MozClient::Mercurial::convert_revdate($arg)");
-  $arg =~ s,^\d+r,,;
-  $arg;
-}
-
-sub set_revdate {
-  my $self = shift;
-
-  $self->LOG("MozClient::Mercurial::set_revdate()");
-
-  # We can set a revision for hg
-  $self->{'mozclient_date'} =
-    '-r ' . $self->convert_revdate($self->{'have_date'});
-}
-
-sub set_tag {
-  my $self = shift;
-  my $tag  = shift;
-
-  $self->LOG("MozClient::Mercurial::set_tag($tag)");
-
-  $self->{'co_tag'} = "-r $tag";
-}
-
-sub checkout {
-  my $self = shift;
-
-  $self->LOG("MozClient:Mercurial::checkout:()");
-  if (defined $self->{'local-branch'}) {
-    chomp(my $cwd = `pwd`);
-    $self->chdir($self->{'local-branch'});
-    $self->run_system("hg pull");
-    $self->run_system("hg update");
-    $self->chdir($cwd);
-  }
-  $self->chdir($self->work_dir);
-  my $modules = [];
-  if (defined $self->{'MOZCLIENT_PROJECT'}) {
-    push @$modules,
-      $self->{'MOZCLIENT_VCS_LOC'} . $self->{'MOZCLIENT_PROJECT'} . "/";
-  }
-  else {
-    for my $module (@{$self->{'MOZCLIENT_MODULES'}}) {
-      push @$modules, (sprintf " %s%s/%s", $self->{'MOZCLIENT_VCS_LOC'},
-	$self->{'MOZCLIENT_PROJECT'}, $module);
-    }
-  }
-  my $cmd = sprintf "hg clone %s %s", join(" ", @$modules),
-    $self->{'MOZCLIENT_MOZDIRNAME'};
-  $self->run_system($cmd);
-  $self->chdir($self->{'MOZCLIENT_MOZDIRNAME'});
-  my $rev =  $self->{'mozclient_date'} ?  $self->{'mozclient_date'} : $self->{'co_tag'};
-  $cmd = sprintf "hg update %s", $rev;
-  $self->run_system($cmd);
-  $self->chdir("../..");
-}
-
-sub tar_exclude {
-  my $self = shift;
-
-  $self->LOG("MozClient::Mercurial::tar_exclude()");
-  [ '--exclude .hg' ];
-}
-
-1;
diff --git a/src/mozclient/lib/MozClient/Subversion.pm b/src/mozclient/lib/MozClient/Subversion.pm
deleted file mode 100644
index 0437a50..0000000
--- a/src/mozclient/lib/MozClient/Subversion.pm
+++ /dev/null
@@ -1,114 +0,0 @@
-# -*- mode: Perl -*-
-
-# Copyright (c) 2007-2008 Fabien Tassin <fta@sofaraway.org>
-# Description: MozClient::Subversion
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-############################################################################
-
-package MozClient::Subversion;
-
-use vars qw(@ISA);
-use strict;
-use Carp;
-use MozClient::VCS;
-
-@ISA = ("MozClient::VCS");
-
-sub get_client {
-  my $self = shift;
-
-  $self->LOG("MozClient::Subversion::get_client()");
-  # nothing to do
-}
-
-sub convert_revdate {
-  my $self = shift;
-  my $arg = shift;
-
-  $self->LOG("MozClient::Subversion::convert_revdate($arg)");
-  $arg =~ s,.*r(\d+),$1,;
-  $arg;
-}
-
-sub set_revdate {
-  my $self = shift;
-
-  $self->LOG("MozClient::Subversion::set_revdate()");
-
-  # We can set a revision for svn
-  $self->{'mozclient_date'} =
-    '-r ' . $self->convert_revdate($self->{'have_date'});
-}
-
-sub set_tag {
-  my $self = shift;
-  my $tag  = shift;
-
-  $self->LOG("MozClient::Subversion::set_tag()");
-
-  # For svn, a tag is just a snapshot
-  $self->{'MOZCLIENT_PROJECT'} =~ s,/[^/]*$,/tags/$tag,;
-  $self->{'co_tag'} = $tag;
-}
-
-sub checkout {
-  my $self = shift;
-
-  $self->LOG("MozClient::Subversion::checkout:()");
-
-  if (defined $self->{'local-branch'}) {
-    confess "Can't MozClient::checkout() a local branch for " . $self->vcs;
-    # TODO: fix it if needed
-  }
-
-  $self->chdir($self->work_dir);
-  my $modules = [];
-  $self->{'MOZCLIENT_VCS_LOC'} .= "/" unless $self->{'MOZCLIENT_VCS_LOC'} =~ m,/$,;
-  if (defined $self->{'MOZCLIENT_PROJECT'}) {
-    push @$modules,
-      $self->{'MOZCLIENT_VCS_LOC'} . $self->{'MOZCLIENT_PROJECT'} . "/";
-  }
-  else {
-    for my $module (@{$self->{'MOZCLIENT_MODULES'}}) {
-      push @$modules, (sprintf " %s%s/%s", $self->{'MOZCLIENT_VCS_LOC'},
-	$self->{'MOZCLIENT_PROJECT'}, $module);
-    }
-  }
-  my $out = length $self->{'co_tag'} > 0 ? $self->{'co_tag'} : "trunk";
-  my $cmd = sprintf "svn checkout %s %s $out", $self->{'mozclient_date'},
-    join " ", @$modules;
-  $self->run_system($cmd);
-  # We drop the 1st directory if there's a mozilla dir inside
-  if (-d "$out/" . $self->{'MOZCLIENT_MOZDIRNAME'}) {
-    $self->run_shell("mv $out/* $out/.svn .");
-    $self->run_system("rm -rf $out");
-  }
-  else {
-    # we name it mozilla as it is what is expected later on
-    $self->run_system("mv $out  " . $self->{'MOZCLIENT_MOZDIRNAME'});
-  }
-  $self->chdir("..");
-}
-
-sub tar_exclude {
-  my $self = shift;
-
-  $self->LOG("MozClient::Subversion::tar_exclude()");
-  [ '--exclude .svn' ];
-}
-
-1;
diff --git a/src/mozclient/lib/MozClient/VCS.pm b/src/mozclient/lib/MozClient/VCS.pm
deleted file mode 100644
index 4999cdc..0000000
--- a/src/mozclient/lib/MozClient/VCS.pm
+++ /dev/null
@@ -1,416 +0,0 @@
-# -*- mode: Perl -*-
-
-# Copyright (c) 2007-2008 Fabien Tassin <fta@sofaraway.org>
-# Description: MozClient::VCS - Main class
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-############################################################################
-
-package MozClient::VCS;
-
-# This is the main class. It should not be used directly. VCS specific classes
-# should be instantiated instead. They inherit from this main class and
-# overwrite some methods according to VCS requirements.
-
-use Carp;
-use strict;
-
-my $nobinonly      = "nobinonly";
-
-# List of dependencies
-my $dependencies = {
-  'cvs'       => '/usr/bin/cvs',
-  'mercurial' => '/usr/bin/hg',
-  'git'       => '/usr/bin/git',
-  'quilt'     => '/usr/bin/quilt',
-  'wget'      => '/usr/bin/wget',
-};
-
-############################################################################
-
-sub new {
-  my $class = shift;
-  my $conf  = shift;
-  my $opt   = shift;
-
-  my $self = {};
-
-  @{$self}{keys %$conf} = values %$conf;
-
-  $self->{'want_branch'} = $$opt{'branch'};
-  $self->{'want_listtags'} = 1 if $$opt{'list-tags'};
-  $self->{'want_tag'} = $$opt{'tag'};
-  $self->{'have_date'} = $$opt{'date'};
-  $self->{'preserve_vcs'} = $$opt{'preserve-vcs'};
-  $self->{'debug'} = $$opt{'debug'};
-
-  $self->{'want_branch'} = $$conf{'MOZCLIENT_BRANCH'}
-    if defined $$conf{'MOZCLIENT_BRANCH'} && !defined $self->{'want_branch'};
-
-  # The following options overwrite the conf files
-  $self->{'MOZCLIENT_EMBEDDED'} = 1 if $$opt{'embedded'};
-  $self->{'MOZ_CO_MODULE'} = $$opt{'modules'} if defined $$opt{'modules'};
-  if (defined $$opt{'local-branch'}) {
-    my $branch = $$opt{'local-branch'};
-    $self->{'local-branch'} = $branch;
-    $branch =~ s,/+$,,;
-    my ($repo, $dir) = $branch =~ m,(.*/)([^/]+)$,;
-    $self->{'MOZCLIENT_VCS_LOC'} = $repo;
-    $self->{'MOZCLIENT_PROJECT'} = $dir;
-  }
-
-  bless($self, $class);
-  $self;
-}
-
-sub vcs {
-  my $self = shift;
-
-  $self->{'MOZCLIENT_VCS'};
-}
-
-sub work_dir {
-  my $self = shift;
-
-  $self->{'work-dir'} = shift if @_;
-  $self->{'work-dir'};
-}
-
-sub debug {
-  my $self = shift;
-
-  $self->{'debug'} = shift if @_;
-  $self->{'debug'};
-}
-
-sub LOG  {
-  my $self = shift;
-  my $str = shift;
-
-  printf "LOG: $str\n", @_ if $self->debug;
-}
-
-sub LOG2 {
-  my $self = shift;
-  my $str = shift;
-
-  printf "$str\n", @_;
-}
-
-sub check_dependencies {
-  my $self = shift;
-
-  $self->LOG("MozClient::check_dependencies()");
-  my $missing = [];
-  map { push @$missing, $_ unless -x $$dependencies{$_}} keys %$dependencies;
-  carp "# Error: missing dependencies. Please install " .
-    (join ", ", @$missing) . "\n" if $#$missing >= 0;
-  1;
-}
-
-sub cleanup_dir {
-  my $self = shift;
-
-  if (-d $self->work_dir) {
-    $self->LOG("MozClient::cleanup_dir()");
-    $self->run_system("rm -rf " . $self->work_dir);
-  }
-}
-
-sub prepare_dir {
-  my $self = shift;
-
-  $self->LOG("MozClient::prepare_dir()");
-  $self->cleanup_dir();
-  $self->mkdir($self->work_dir, 0755);
-}
-
-sub run_system {
-  my $self = shift;
-
-  $self->LOG2("\$ %s", @_);
-  my $cmd = sprintf "%s", @_;
-  my $args = &main::_split_args($cmd);
-  my $ret = system(@$args);
-  $ret == 0 || confess "Can't run '$cmd': error code $ret";
-}
-
-sub run_shell {
-  my $self = shift;
-
-  $self->LOG2("\$ %s", @_);
-  my $cmd = shift;
-  return `$cmd`;
-}
-
-sub chdir {
-  my $self = shift;
-
-  $self->LOG2("\$ cd %s", @_);
-  my $dir = shift;
-  CORE::chdir($dir) || confess "Can't chdir($dir): $!";
-}
-
-sub unlink {
-  my $self = shift;
-
-  $self->LOG2("\$ rm %s", @_);
-  my $file = shift;
-
-  CORE::unlink($file) || confess "Can't unlink($file): $!";
-}
-
-sub mkdir {
-  my $self = shift;
-  my $dir  = shift;
-  my $mode = shift;
-  $self->LOG2("\$ mkdir %s", $dir);
-  CORE::mkdir($dir, $mode) || confess "Can't mkdir($dir, $mode): $!";
-}
-
-sub want_list_tags {
-  my $self = shift;
-
-  defined $self->{'want_listtags'} && $self->{'want_listtags'};
-}
-
-sub list_tags {
-  my $self = shift;
-
-  $self->LOG("MozClient::list_tags()");
-  confess "Error: list_tags() not supported for " . $self->vcs;
-}
-
-# Execute the command defined in MOZCLIENT_POSTCOCMD after the checkout
-sub do_post_co_commands {
-  my $self = shift;
-
-  $self->LOG("MozClient::do_post_co_commands()");
-  $self->chdir($self->work_dir);
-  $self->run_shell($self->{'MOZCLIENT_POSTCOCMD'});
-  $self->chdir("..");
-}
-
-sub get_client {
-  my $self = shift;
-
-  $self->LOG("MozClient::get_client()");
-  confess "Can't MozClient::get_client() for " . $self->vcs;
-}
-
-sub set_tag {
-  my $self = shift;
-
-  $self->LOG("MozClient::set_tag()");
-  confess "Can't MozClient::set_tag() for " . $self->vcs;
-}
-
-sub set_revdate {
-  my $self = shift;
-
-  $self->LOG("MozClient::set_revdate()");
-  confess "Can't MozClient::set_revdate() for " . $self->vcs;
-}
-
-sub convert_revdate {
-  my $self = shift;
-
-  $self->LOG("MozClient::convert_revdate()");
-  confess "Can't MozClient::convert_revdate() for " . $self->vcs;
-}
-
-sub do_dynamic_tag {
-  my $self = shift;
-
-  $self->LOG("MozClient::do_dynamic_tag()");
-  confess "Error: do_dynamic_tag() not supported for " . $self->vcs;
-}
-
-sub setup {
-  my $self = shift;
-
-  $self->LOG("MozClient::setup()");
-  $self->{'mozclient_date'} = "";
-  $self->{'moz_co_tag'} = "";
-
-  if (!defined $self->{'want_tag'} && defined $self->{'MOZCLIENT_DYNTAG'}) {
-    $self->do_dynamic_tag();
-  }
-
-  if (defined $self->{'want_tag'}) {
-    # We want a tag, we can either let mozclient compute the version or
-    # specify our own (using -t TAG=version)
-    if (defined $self->{'have_date'}) {
-      warn "Warning: can't use -d and -t together. Ignoring -d";
-      undef $self->{'have_date'};
-    }
-    $self->{'want_tag'} =~ m/([^=]*)(=?)(.*)/;
-    $self->{'ltag'} = $1;
-    $self->{'dtag'} = $3;
-    $self->set_tag($1);
-  }
-  else {
-    # we don't want a specific tag, so go for a date and possibly a branch
-    if (!defined $self->{'have_date'}) {
-      chomp($self->{'have_date'} = `$self->{'MOZCLIENT_GETDATE'}`);
-    }
-    $self->{'mozclient_date'} =
-      '-D "' . $self->convert_revdate($self->{'have_date'}) . '"';
-    $self->{'co_tag'} = '';
-    $self->{'co_tag'} =
-      "-r " . $self->{'want_branch'} if defined $self->{'want_branch'};
-  }
-}
-
-sub checkout {
-  my $self = shift;
-
-  $self->LOG("MozClient::checkout()");
-  confess "Can't MozClient::checkout() for " . $self->vcs;
-}
-
-sub nobin_cleanup {
-  my $self = shift;
-
-  $self->LOG("MozClient::nobin_cleanup()");
-
-  $self->chdir($self->work_dir . "/" . $self->{'MOZCLIENT_MOZDIRNAME'});
-  if (-e $self->{'MOZCLIENT_EXCLUDE_SCRIPT'}) {
-    my $cmd = sprintf "sh %s > REMOVED+${nobinonly}.txt 2>&1",
-      $self->{'MOZCLIENT_EXCLUDE_SCRIPT'};
-    $self->run_shell($cmd);
-  }
-  elsif (defined $INC[1] && $INC[1] =~ m,(.*/mozclient)/,) {
-    my $dir = $1;
-    $self->{'MOZCLIENT_EXCLUDE_SCRIPT'} =~ m,/([^/]*)$,;
-    my $file = $1;
-    if (-e "$dir/$file") {
-      my $cmd = sprintf "sh %s > REMOVED+${nobinonly}.txt 2>&1",
-        "$dir/$file";
-      $self->run_shell($cmd);
-    }
-    else {
-      $self->LOG("*warn* can't find $dir/$file");
-    }
-  }
-  else {
-    $self->LOG("*warn* can't find " . $self->{'MOZCLIENT_EXCLUDE_SCRIPT'});
-  }
-
-  # Run a package specific clean-up script, if any
-  my $pkg_script = $self->{'MOZCLIENT_EXCLUDE_SCRIPT'};
-  $pkg_script =~ m,/([^/]*)$,;
-  my $pkg = $self->{'MOZCLIENT_APPNAME'} . '-' . $1;
-  $pkg_script =~ s,(.*)/.*,$1/$pkg,;
-  $self->run_shell("sh $pkg_script >> REMOVED+${nobinonly}.txt 2>&1")
-    if -e $pkg_script;
-
-  # Remove the log if it's empty
-  $self->unlink("REMOVED+${nobinonly}.txt")
-    if -e "REMOVED+${nobinonly}.txt" && -z "REMOVED+${nobinonly}.txt";
-  $self->chdir("../..");
-}
-
-sub tar_exclude {
-  my $self = shift;
-
-  $self->LOG("MozClient::tar_exclude()");
-  # nothing
-  [];
-}
-
-sub pack {
-  my $self = shift;
-
-  $self->LOG("MozClient::pack()");
-
-  my $tar_exclude = "";
-  unless ($self->{'preserve_vcs'}) {
-    my $dirs = $self->tar_exclude();;
-    if (defined $self->{'MOZCLIENT_TAREXCLUDE'}) {
-      for my $item (@{$self->{'MOZCLIENT_TAREXCLUDE'}}) {
-	push @$dirs, "--exclude $item";
-      }
-    }
-    $tar_exclude = join " ", @$dirs;
-  }
-
-  my $tversion;
-  if (defined $self->{'want_tag'} &&
-      defined $self->{'dtag'} && length $self->{'dtag'} > 0) {
-    $tversion = $self->{'dtag'};
-  }
-  else {
-    $self->chdir($self->work_dir);
-    chomp($tversion = `$self->{'MOZCLIENT_GETVERSION'}`);
-    $tversion .= $self->{'MOZCLIENT_SEPARATOR'} . $self->{'MOZCLIENT_VCS'} .
-      $self->{'have_date'} unless defined $self->{'want_tag'};
-    $self->LOG2("\$ tversion=`" . $self->{'MOZCLIENT_GETVERSION'} .
-		"` # => $tversion");
-    $self->chdir("..");
-  }
-  my $version = $tversion;
-  $version .= "+${nobinonly}"
-    if -f $self->work_dir . "/" . $self->{'MOZCLIENT_MOZDIRNAME'} .
-          "/REMOVED+${nobinonly}.txt";
-  my $cmd = sprintf "rm -rf %s/%s-%s", $self->work_dir,
-    $self->{'MOZCLIENT_APPNAME'}, $version;
-  $self->run_system($cmd);
-  if ($self->{'MOZCLIENT_EMBEDDED'} || $self->{'MOZCLIENT_WANTMOZDIR'}) {
-    my $dir = sprintf "%s/%s-%s", $self->work_dir,
-      $self->{'MOZCLIENT_APPNAME'}, $version;
-    $self->mkdir($dir, 0755);
-  }
-  if ($self->{'MOZCLIENT_EMBEDDED'}) {
-    my $project = $self->{'MOZCLIENT_PROJECT'};
-    $project =~ s,/.*,,;
-    if ($self->{'MOZCLIENT_WANTMOZDIR'}) {
-      $self->chdir($self->work_dir);
-      my $cmd = sprintf "tar jcf %s-%s/%s-%s-source.tar.bz2 %s %s",
-        $self->{'MOZCLIENT_APPNAME'}, $version, $project, $tversion,
-        $tar_exclude, $self->{'MOZCLIENT_MOZDIRNAME'};
-      $self->run_system($cmd);
-      $self->chdir("..");
-    }
-    else { # Embedded tarball but without the toplevel mozilla dir
-      $self->chdir($self->work_dir . "/" . $self->{'MOZCLIENT_MOZDIRNAME'});
-      my $cmd = sprintf "tar jcf ../%s-%s/%s-%s-source.tar.bz2 %s .",
-        $self->{'MOZCLIENT_APPNAME'}, $version, $project, $tversion,
-        $tar_exclude;
-      $self->run_system($cmd);
-      $self->chdir("../..");
-    }
-  }
-  else {
-    my $cmd = sprintf "mv %s/%s %s/%s-%s/",
-      $self->work_dir, $self->{'MOZCLIENT_MOZDIRNAME'}, $self->work_dir,
-      $self->{'MOZCLIENT_APPNAME'}, $version;
-    $self->run_system("$cmd");
-  }
-  $self->unlink($self->{'MOZCLIENT_APPNAME'} . "_$version.orig.tar.gz")
-    if -f $self->{'MOZCLIENT_APPNAME'} . "_$version.orig.tar.gz";
-  $self->chdir($self->work_dir);
-  $cmd = sprintf "tar zcf ../%s_%s.orig.tar.gz %s %s-%s",
-    $self->{'MOZCLIENT_APPNAME'}, $version, $tar_exclude,
-    $self->{'MOZCLIENT_APPNAME'}, $version;
-  $self->run_shell($cmd);
-  $self->chdir("..");
-  $self->run_system("rm -rf " . $self->work_dir);
-  $self->run_system("ls -l " . $self->{'MOZCLIENT_APPNAME'} .
-	      "_$version.orig.tar.gz");
-}
-
-1;
diff --git a/src/mozclient/lightning-sunbird.conf b/src/mozclient/lightning-sunbird.conf
deleted file mode 100644
index d316851..0000000
--- a/src/mozclient/lightning-sunbird.conf
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright (c) 2007-2008 Fabien Tassin <fta@sofaraway.org>
-# Description: Project Sunbird 0.* (MOZILLA_1_8_BRANCH)
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-MOZCLIENT_APPNAME    = lightning-sunbird
-MOZCLIENT_PROJECT    = calendar
-MOZCLIENT_BRANCH     = MOZILLA_1_8_BRANCH
-MOZCLIENT_VCS        = cvs
-MOZCLIENT_VCS_LOC    = :pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot
-MOZCLIENT_FILE       = mozilla/calendar/sunbird/config/version.txt
-MOZCLIENT_GETVERSION = tail -1 mozilla/calendar/sunbird/config/version.txt | sed -e 's/pre//; s/\([ab]\)\([0-9]*\)/~\1\2/'
-MOZCLIENT_GETDATE    = wget -O - -q --read-timeout=10 --user-agent='' --tries=3 'http://bonsai.mozilla.org/cvsquery.cgi?treeid=default&module=CalendarClient&branch=MOZILLA_1_8_BRANCH&branchtype=match&dir=&file=&filetype=match&who=&whotype=match&sortby=Date&hours=2&date=week&mindate=&maxdate=&cvsroot=%2Fcvsroot' 2> /dev/null | grep "href='http://webtools" | head -1 | tr '<>' '@' | cut -d@ -f5 | tr -d ':-' | sed -e 's/&nbsp;/t/'
-MOZCLIENT_EMBEDDED   = 1
-MOZCLIENT_WANTMOZDIR = 1
diff --git a/src/mozclient/midbrowser.conf b/src/mozclient/midbrowser.conf
deleted file mode 100644
index f338861..0000000
--- a/src/mozclient/midbrowser.conf
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright (c) 2008 Fabien Tassin <fta@sofaraway.org>
-# Description: Project Midbrowser
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-MOZCLIENT_APPNAME    = midbrowser
-MOZCLIENT_PROJECT    = mobile-browser.git
-MOZCLIENT_FILE       = mozilla/midbrowser/config/version.txt
-MOZCLIENT_GETVERSION = sed -e 's/pre//; s/\([ab]\|rc\)\([0-9]*\)/~\1\2/' mozilla/midbrowser/config/version.txt
-MOZCLIENT_VCS        = git
-MOZCLIENT_VCS_LOC    = http://moblin.org/repos/projects/
-MOZCLIENT_GETDATE    = wget -O - -q --read-timeout=10 --user-agent='' --tries=3 'http://git.moblin.org/repos/?p=projects/mobile-browser.git;a=log' 2> /dev/null | grep -E '^(<a href="|<i>)' | grep -v a=summary | head -2 | perl -e '$m = { "Jan" => 1, "Feb" => 2, "Mar" => 3, "Apr" => 4, "May" => 5, "Jun" => 6, "Jul" => 7, "Aug" => 8, "Sep" => 9, "Oct" => 10, "Nov" => 11, "Dec" => 12 } ;  $a = <>; $a =~ m/.*?a=commit;h=(.{10})/; $rev = $1; $a = <>; $a =~ m/^<i>.*? \[\S+,\s+(\d+) (\S+) (\d+)/ && do { printf "%04d%02d%02dr%10s\n", $3, $$m{$2}, $1, $rev }; '
-MOZCLIENT_EMBEDDED   = 0
-MOZCLIENT_WANTMOZDIR = 0
diff --git a/src/mozclient/mozclient.pl b/src/mozclient/mozclient.pl
deleted file mode 100755
index 746062e..0000000
--- a/src/mozclient/mozclient.pl
+++ /dev/null
@@ -1,243 +0,0 @@
-#!/usr/bin/perl -w
-
-# Copyright (c) 2007-2008 Fabien Tassin <fta@sofaraway.org>
-# Description: The 'mozclient' module of mozilla-devscripts
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-############################################################################
-
-use strict;
-use Getopt::Long qw(:config no_auto_abbrev no_ignore_case
-		    require_order bundling);
-use Cwd 'abs_path';
-
-BEGIN {
-  my $conf_dir = "/usr/share/mozilla-devscripts/mozclient";
-  # We look for modules in ${conf_dir}/lib
-  # We can prefer another path by using '--conf-dir path' or '-c path'
-  unshift @INC, "$conf_dir/lib";
-
-  my @args = @ARGV;
-  while (1) {
-    my $arg = shift @args;
-    last unless defined $arg;
-    next unless $arg eq '-c' || $arg eq '--conf-dir';
-    my $path = shift @args;
-    die "Usage error: $arg needs an argument\n" unless defined $path;
-    unshift @INC, "$path/lib";
-    last;
-  }
-}
-
-$INC[0] =~ m,(.*)/lib$,;
-my $mozclient_dir  = abs_path($1);
-my $pkg_conf_dir   = "$mozclient_dir";
-my $patches_dir    = "$pkg_conf_dir/patches";
-my $work_dir       = "mozclient-tmp";
-
-my @conf_mandatory = qw(MOZCLIENT_APPNAME MOZCLIENT_FILE MOZCLIENT_GETVERSION
-			MOZCLIENT_GETDATE MOZCLIENT_VCS MOZCLIENT_VCS_LOC);
-my @conf_optional  = qw(MOZCLIENT_MODULES MOZCLIENT_PROJECT MOZCLIENT_BRANCH
-			MOZCLIENT_POSTCOCMD MOZCLIENT_EMBEDDED
-			MOZCLIENT_SEPARATOR MOZCLIENT_TAREXCLUDE
-			MOZCLIENT_WANTMOZDIR MOZCLIENT_MOZDIRNAME
-			MOZCLIENT_WANTPATCH
-			MOZCLIENT_DYNTAG MOZCLIENT_DYNTAG_FILES);
-my @conf_list      = qw(MOZCLIENT_FILE MOZCLIENT_TAREXCLUDE);
-
-my $defaults = {
-  'MOZCLIENT_SEPARATOR'      => '~',
-  'MOZCLIENT_EXCLUDE_SCRIPT' => "$pkg_conf_dir/remove.binonly.sh",
-  'MOZILLA_CLIENT'           => 'mozilla/client.mk',
-  'MOZCLIENT_PATCHES'        => "$patches_dir",
-  'MOZCLIENT_MOZDIRNAME'     => 'mozilla',
-};
-
-sub help {
-  print <<EOF;
-mozclient [-b branch] [-t tag] [-d YYYYMMDDtHHmm] project-name
-mozclient [-l] project-name
-  --conf-dir|-c dir    use dir as config directory
-  --list-tags|-l       list VCS tags
-  --branch|-b branch   checkout from a specific branch
-  --date|-d date       checkout by date (YYYYMMDDtHHmm)
-  --tag|-t tag         checkout using a tag
-  --tag|-t tag=ver     checkout using a tag, hard-coding the version
-  --preserve-vcs|-p    preserve VCS files
-  --embedded|-e        create an embedded tarball
-  --modules|-m mods    list of modules to fetch 
-  --local-branch|-L branch  use a local branch instead of the configured one
-  --debug|-D           increase debug level
-
- Examples:
-   mozclient.pl nspr
-    => nspr_4.7.2~beta+1.9~cvs20080516t2119.orig.tar.gz
-
-   mozclient.pl --date 20080101t0000 nspr
-    => nspr_4.7~beta+1.9b3~cvs20080101t0000.orig.tar.gz
-
-   mozclient.pl --tag FIREFOX_3_0rc1_RELEASE nspr
-    => nspr_4.7.1+1.9.orig.tar.gz
-
-   mozclient.pl --tag FIREFOX_3_0rc1_RELEASE=1.2.3 nspr
-    => nspr_1.2.3.orig.tar.gz
-EOF
-  exit(0);
-}
-
-sub _split_args {
-  my $str = shift;
-
-  # We want to split words and quoted strings by blanks
-  my @data;
-  while (length($str)) {
-    $str =~ m/^\s/ && do {
-      $str =~ s/^\s+//;
-      1;
-    } ||
-    $str =~ m/^'/ && do {
-      $str =~ s/^'(.*?)'//;
-      push @data, $1;
-      1;
-    } ||
-    $str =~ m/^"/ && do {
-      $str =~ s/^"(.*?)"//;
-      push @data, $1;
-      1;
-    } ||
-    $str =~ m/^\S+=".*?"/ && do {
-      $str =~ s/^(\S+)="(.*?)"//;
-       push @data, "$1=$2";
-      1;
-    } || do {
-      $str =~ s/^(\S+)//;
-      push @data, $1;
-    };
-  }
-  return \@data;
-}
-
-# Read the project conf file
-sub read_project_file {
-  my $pkg = shift;
-
-  my $file = sprintf "%s/%s.conf", $pkg_conf_dir, $pkg;
-  my $data = {};
-  open(CONF, "$file") || die "Can't open $file: $!\n";
-  while (defined (my $line = <CONF>)) {
-    $line =~ s/([^\\])#.*/$1/; # drop comments, but not \#
-    $line =~ s/(^\s+|\s+$)//;
-    next if $line =~ m/^#/;
-    next if $line =~ m/^\s*$/;
-    $line =~ m/^(\S+)\s*=\s*(.*)/;
-    $$data{$1} = defined $2 && length($2) ? $2 : undef;
-  }
-  close CONF;
-  # Check all mandatory keywords/variables are there
-  my $missing = [];
-  my $extra = [];
-  my $opts = {};
-  map { $$opts{$_} = 1 } @conf_mandatory, @conf_optional;
-  map { push @$extra, $_ unless defined $$opts{$_} } keys %$data;
-  map { push @$missing, $_ unless defined $$data{$_} } @conf_mandatory;
-  if ($#$extra >= 0) {
-    die "# Error in $file: unknown keywords found: " .
-      (join ", ", @$extra) . "\n";
-  }
-  if ($#$missing >= 0) {
-    die "# Error in $file: mandatory keywords missing: " .
-      (join ", ", @$missing) . "\n";
-  }
-  # Set default values
-  map { $$data{$_} = $$defaults{$_} unless defined $$data{$_} }
-    keys %$defaults;
-  # Transform into lists arguments that are supposed to be lists
-  map { $$data{$_} = _split_args($$data{$_}) if defined $$data{$_} }
-    @conf_list;
-
-  return $data;
-}
-
-############################################################################
-
-use MozClient::CVS;
-use MozClient::Mercurial;
-use MozClient::Subversion;
-use MozClient::Git;
-
-# Main
-my $opt = {};
-GetOptions($opt,
-	   'conf-dir|c=s',
-	   'debug|D+',
-	   'list-tags|l',
-	   'branch|b=s',
-	   'date|d=s',
-	   'tag|t=s',
-	   'embedded|e',
-	   'modules|m=s',
-	   'local-branch|L=s',
-	   'preserve-vcs|p') || &help();
-
-&help() unless $#ARGV >= 0;
-
-my $conf = &read_project_file(shift @ARGV);
-
-my $client;
-my $vcs = $$conf{'MOZCLIENT_VCS'};
-$vcs eq 'cvs' && do { $client = MozClient::CVS->new($conf, $opt);        1; } ||
-$vcs eq 'svn' && do { $client = MozClient::Subversion->new($conf, $opt); 1; } ||
-$vcs eq 'hg'  && do { $client = MozClient::Mercurial->new($conf, $opt);  1; } ||
-$vcs eq 'git' && do { $client = MozClient::Git->new($conf, $opt);        1; } ||
-do {
-  die "VCS '$$conf{'MOZCLIENT_VCS'}' not supported yet";
-};
-
-$client->work_dir($work_dir);
-$client->check_dependencies();
-$client->prepare_dir();
-
-if ($client->want_list_tags) {
-  $client->list_tags();
-  $client->cleanup_dir();
-  exit(0);
-}
-
-$client->setup();
-
-# We need the mozilla client if we want to fetch a project
-$client->get_client() if defined $client->{'MOZCLIENT_PROJECT'};
-
-# We also want to checkout using a date or a revision to avoid been
-# caught in mid-air with another commit, unless a tag is requested
-$client->set_revdate() unless defined $client->{'want_tag'};
-
-if (!defined $client->{'have_date'} && !defined $client->{'want_tag'}) {
-  die "Error: neither date nor tag found.  Did getdate failed ?";
-}
-
-# Finally do the real checkout
-$client->checkout();
-
-# Do post-co commands if we have to
-$client->do_post_co_commands() if defined $client->{'MOZCLIENT_POSTCOCMD'};
-
-# Remove binary only files and preserve a log file if we indeed removed
-# something. In case we didn't, drop the log file
-$client->nobin_cleanup();
-
-# Create the tarball
-$client->pack();
diff --git a/src/mozclient/nspr.conf b/src/mozclient/nspr.conf
deleted file mode 100644
index 070d6c0..0000000
--- a/src/mozclient/nspr.conf
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright (c) 2007-2008 Fabien Tassin <fta@sofaraway.org>
-# Project: nspr
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-MOZCLIENT_APPNAME    = nspr
-MOZCLIENT_PROJECT    = # null
-MOZCLIENT_VCS        = cvs
-MOZCLIENT_VCS_LOC    = :pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot
-MOZCLIENT_MODULES    = mozilla/nsprpub
-MOZCLIENT_FILE       = mozilla/nsprpub/pr/include/prinit.h
-MOZCLIENT_GETVERSION = ( grep -E '^\#define PR_VERSION' mozilla/nsprpub/pr/include/prinit.h | cut -d\" -f2 | tr 'A-Z' 'a-z' | sed -e 's/beta /beta/' -e 's/  */~/g' -e 's/$/+/' ; tail -1 mozilla/config/milestone.txt | sed -e 's/pre/~cvs/') | tr -d '\n'
-MOZCLIENT_GETDATE    = wget -O - -q --read-timeout=10 --user-agent='' --tries=3 'http://bonsai.mozilla.org/cvsquery.cgi?treeid=default&module=all&branch=HEAD&branchtype=match&dir=mozilla%2Fnsprpub&file=&filetype=match&who=&whotype=match&sortby=Date&hours=2&date=explicit&mindate=1177522884&maxdate=1588258884&cvsroot=%2Fcvsroot' 2> /dev/null | grep "href='http://webtools" | head -1 | tr '<>' '@' | cut -d@ -f5 | tr -d ':-' | sed -e 's/&nbsp;/t/'
-MOZCLIENT_WANTMOZDIR = 1
-MOZCLIENT_DYNTAG_FILES = mozilla/client.mk mozilla/config/milestone.txt
-MOZCLIENT_DYNTAG     = grep ^NSPR_CO_TAG mozilla/client.mk | awk '{ print $3 }'
diff --git a/src/mozclient/nss.conf b/src/mozclient/nss.conf
deleted file mode 100644
index 7a8f617..0000000
--- a/src/mozclient/nss.conf
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright (c) 2007-2008 Fabien Tassin <fta@sofaraway.org>
-# Project: nss
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-MOZCLIENT_APPNAME    = nss
-MOZCLIENT_PROJECT    = # null
-MOZCLIENT_VCS        = cvs
-MOZCLIENT_VCS_LOC    = :pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot
-MOZCLIENT_MODULES    = mozilla/dbm mozilla/security/coreconf mozilla/security/dbm mozilla/security/nss
-MOZCLIENT_FILE       = mozilla/security/nss/lib/nss/nss.h
-MOZCLIENT_GETVERSION = ( grep '^\#define NSS_VERSION' mozilla/security/nss/lib/nss/nss.h | cut -d'"' -f2 | sed -e 's,$,+,' ; tail -1 mozilla/config/milestone.txt | sed -e 's/pre/~cvs/') | tr -d '\n'
-MOZCLIENT_GETDATE     = wget -O - -q --read-timeout=10 --user-agent='' --tries=3 'http://bonsai.mozilla.org/cvsquery.cgi?treeid=NSS&module=all&branch=HEAD&branchtype=match&dir=mozilla%2Fdbm+mozilla%2Fsecurity%2Fnss+mozilla%2Fsecurity%2Fcoreconf+mozilla%2Fsecurity%2Fdbm&file=&filetype=match&who=&whotype=match&sortby=Date&hours=2&date=month&mindate=&maxdate=&cvsroot=%2Fcvsroot' 2> /dev/null | grep "href='http://webtools" | head -1 | tr '<>' '@' | cut -d@ -f5 | tr -d ':-' | sed -e 's/&nbsp;/t/'
-MOZCLIENT_WANTMOZDIR  = 1
-MOZCLIENT_DYNTAG_FILES = mozilla/client.mk mozilla/config/milestone.txt
-MOZCLIENT_DYNTAG     = grep ^NSS_CO_TAG mozilla/client.mk | awk '{ print $3 }'
diff --git a/src/mozclient/patches/series b/src/mozclient/patches/series
deleted file mode 100644
index 9ab520f..0000000
--- a/src/mozclient/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-xulbrowser_target.patch
diff --git a/src/mozclient/patches/xulbrowser_target.patch b/src/mozclient/patches/xulbrowser_target.patch
deleted file mode 100644
index 5355c88..0000000
--- a/src/mozclient/patches/xulbrowser_target.patch
+++ /dev/null
@@ -1,116 +0,0 @@
----
- mozilla/client.mk |   38 +++++++++++++++++++++++++++++++++++---
- 1 file changed, 35 insertions(+), 3 deletions(-)
-
-Index: mozclient-tmp/mozilla/client.mk
-===================================================================
---- mozclient-tmp.orig/mozilla/client.mk
-+++ mozclient-tmp/mozilla/client.mk
-@@ -55,16 +55,17 @@
- #   export CVSROOT=:pserver:username%somedomain.org@cvs.mozilla.org:/cvsroot
- # 
- # You must specify which products/modules you wish to checkout, with
- #   MOZ_CO_PROJECT and MOZ_CO_MODULE variables.
- #
- #   MOZ_CO_PROJECT possibilities include the following:
- #     suite (Seamonkey suite)
- #     browser (aka Firefox)
-+#     xulbrowser (aka Firefox using libxul from xulrunner)
- #     mail (aka Thunderbird)
- #     minimo (small browser for devices)
- #     composer (standalone composer, aka NVU)
- #     calendar (aka Sunbird, use this to build the calendar extensions also)
- #     xulrunner
- #     camino
- #     tamarin
- #
-@@ -104,16 +105,17 @@
- #                          MOZ_BUILD_PROJECTS
- #
- 
- AVAILABLE_PROJECTS = \
-   all \
-   suite \
-   toolkit \
-   browser \
-+  xulbrowser \
-   mail \
-   minimo \
-   composer \
-   calendar \
-   xulrunner \
-   camino \
-   necko \
-   tamarin \
-@@ -261,38 +263,68 @@
-   extensions/reporter                           \
-   extensions/spellcheck                         \
-   $(NULL)
- 
- BOOTSTRAP_suite :=                              \
-   $(BOOTSTRAP_toolkit)                          \
-   $(NULL)
- 
-+MODULES_NS_xulbrowser :=                        \
-+  $(MODULES_NS_necko)                           \
-+  $(NULL)
-+
- MODULES_NS_browser :=                           \
-   $(MODULES_NS_toolkit)                         \
-   $(NULL)
- 
-+MODULES_xulbrowser :=                           \
-+  mozilla/README                                \
-+  mozilla/config                                \
-+  mozilla/build                                 \
-+  mozilla/intl                                  \
-+  mozilla/modules/libpref                       \
-+  mozilla/tools/test-harness                    \
-+  mozilla/extensions                            \
-+  mozilla/toolkit                               \
-+  mozilla/xpinstall                             \
-+  mozilla/browser                               \
-+  mozilla/probes                                \
-+  mozilla/memory                                \
-+  mozilla/other-licenses/branding/firefox       \
-+  mozilla/other-licenses/7zstub/firefox         \
-+  $(NULL)
-+
- MODULES_browser :=                              \
-   $(MODULES_toolkit)                            \
-   mozilla/browser                               \
-   mozilla/other-licenses/branding/firefox       \
-   mozilla/other-licenses/7zstub/firefox         \
-   $(NULL)
- 
--LOCALES_browser :=                              \
--  $(LOCALES_toolkit)                            \
-+LOCALES_xulbrowser :=                           \
-   browser                                       \
-   extensions/reporter                           \
-   extensions/spellcheck                         \
-   other-licenses/branding/firefox               \
-   $(NULL)
- 
-+LOCALES_browser :=                              \
-+  $(LOCALES_toolkit)                            \
-+  $(LOCALES_xulbrowser)                         \
-+  $(NULL)
-+
-+BOOTSTRAP_xulbrowser :=                         \
-+  mozilla/browser/config/version.txt            \
-+  mozilla/browser/config/mozconfig              \
-+  $(NULL)
-+
- BOOTSTRAP_browser :=                            \
-   $(BOOTSTRAP_toolkit)                          \
--  mozilla/browser/config/mozconfig              \
-+  $(BOOTSTRAP_xulbrowser)                       \
-   $(NULL)
- 
- MODULES_NS_minimo :=                            \
-   $(MODULES_NS_toolkit)                         \
-   $(NULL)
- 
- MODULES_minimo :=                               \
-   $(MODULES_toolkit)                            \
diff --git a/src/mozclient/prism.conf b/src/mozclient/prism.conf
deleted file mode 100644
index 706d83b..0000000
--- a/src/mozclient/prism.conf
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright (c) 2008 Fabien Tassin <fta@sofaraway.org>
-# Description: Project prism
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-MOZCLIENT_APPNAME    = prism
-MOZCLIENT_PROJECT    = webrunner/trunk
-MOZCLIENT_VCS        = svn
-MOZCLIENT_VCS_LOC    = http://svn.mozilla.org/projects
-MOZCLIENT_FILE       = prism/confvars.sh
-MOZCLIENT_GETVERSION = grep ^MOZ_APP_VERSION= prism/confvars.sh | cut -d= -f2 | tr -d '\r'
-MOZCLIENT_GETDATE    = svn log --limit 1 http://svn.mozilla.org/projects/webrunner/ | grep ^r  | head -1 | sed -e 's/^r\([0-9]*\) | [^|]* | \([^ ]*\).*/\2r\1/' | tr -d -
-MOZCLIENT_SEPARATOR  = + # upstream only bumps the version at the end of the dev cycle
-MOZCLIENT_EMBEDDED   = 0
-MOZCLIENT_WANTMOZDIR = 1
-MOZCLIENT_MOZDIRNAME = prism
diff --git a/src/mozclient/remove.binonly.sh b/src/mozclient/remove.binonly.sh
deleted file mode 100644
index a502566..0000000
--- a/src/mozclient/remove.binonly.sh
+++ /dev/null
@@ -1,138 +0,0 @@
-#! /bin/sh
-
-rm -fv ./browser/app/apprunner-beos.rsrc
-rm -fv ./build/wince/shunt/build/shunt.vcb
-rm -fv ./build/wince/shunt/build/shunt.vco
-rm -fv ./config/*.pyc
-#rm -fv ./directory/c-sdk/ldap/examples/macintosh/asearch \(2i\).68k.u
-#rm -fv ./directory/c-sdk/ldap/examples/macintosh/asearch \(4i\).68k.u
-#rm -fv ./directory/c-sdk/ldap/examples/macintosh/asearch PPC.u
-# these are only files there; just do it quick and dirty because I don't understand how to fix the syntax it complains about: this does it:
-rm -fv ./directory/c-sdk/ldap/examples/macintosh/*.u
-rm -fv ./directory/c-sdk/ldap/libraries/macintosh/LDAPClient.mcp
-rm -fv ./modules/oji/tests/script/killer.exe
-rm -fv ./modules/plugin/samples/default/mac/NullPlugin.rsrc
-rm -fv ./modules/plugin/tools/sdk/samples/basic/mac/Basic Plugin.mcp
-rm -fv ./modules/plugin/tools/sdk/samples/basic/mac/Basic.rsrc
-rm -fv ./modules/plugin/tools/sdk/samples/scriptable/mac/Scriptable Plugin.mcp
-rm -fv ./modules/plugin/tools/sdk/samples/scriptable/mac/Scriptable PluginIDL.mcp
-rm -fv ./modules/plugin/tools/sdk/samples/scriptable/mac/Scriptable.rsrc
-rm -fv ./other-licenses/7zstub/firefox/7zSD.sfx
-rm -fv ./toolkit/mozapps/update/src/updater/macbuild/Contents/Resources/English.lproj/MainMenu.nib/keyedobjects.nib
-rm -fv ./toolkit/mozapps/update/src/updater/macbuild/Contents/PkgInfo
-rm -fv ./extensions/manticore/resources/manticore.psd
-rm -fv ./extensions/universalchardet/doc/UniversalCharsetDetection.doc
-rm -fv ./config/bin2rc.exe
-rm -fv ./config/makedep.exe
-rm -fv ./config/mangle.exe
-rm -fv ./config/mantomak.exe
-rm -fv ./embedding/browser/activex/src/pluginhostctrl/cab/redist/ATL.DLL
-rm -fv ./embedding/browser/activex/tests/vbrowse/browser.frx
-rm -fv ./embedding/browser/activex/tests/vbrowse/frmToolBar.frx
-rm -fv ./embedding/browser/cocoa/res/English.lproj/alert.nib/objects.nib
-rm -fv ./embedding/browser/powerplant/resources/cfmAlias.rsrc
-rm -fv ./embedding/browser/powerplant/resources/cfmAliasDebug.rsrc
-rm -fv ./embedding/minimo/mozconfig
-rm -fv ./embedding/qa/testembed/testembed.aps
-rm -fv ./embedding/tests/MSDotNETCSEmbed/MSDotNETCSEmbed.suo
-rm -fv ./embedding/tests/cocoaEmbed/res/English.lproj/MainMenu.nib/objects.nib
-rm -fv ./embedding/wrappers/DotNETEmbed/DotNETEmbed.snk
-rm -fv ./intl/unicharutil/tools/data/case.dat
-rm -fv ./intl/unicharutil/tools/data/cmbcl.dat
-rm -fv ./intl/unicharutil/tools/data/ctype.dat
-rm -fv ./intl/unicharutil/tools/data/decomp.dat
-rm -fv ./intl/unicharutil/tools/data/num.dat
-rm -fv ./js/src/fdlibm/fdlibm.mdp
-rm -fv ./js/src/js.mdp
-rm -fv ./js/src/liveconnect/jsj_nodl.c
-rm -fv ./plugin/oji/JEP/MRJPlugin.plugin/Contents/MacOS/MRJPlugin
-rm -fv ./plugin/oji/JEP/MRJPlugin.plugin/Contents/MacOS/MRJPlugin.jar
-rm -fv ./plugin/oji/JEP/MRJPlugin.plugin/Contents/Resources/MRJPlugin.rsrc
-rm -fv ./plugin/oji/JEP/JavaEmbeddingPlugin.bundle/Contents/MacOS/JavaEmbeddingPlugin
-rm -fv ./plugin/oji/JEP/JavaEmbeddingPlugin.bundle/Contents/Resources/Java/JavaEmbeddingPlugin.jar
-rm -fv ./plugin/oji/MRJ/plugin/Resources/Dialogs.rsrc
-rm -fv ./plugin/oji/MRJ/plugin/Resources/Strings.rsrc
-rm -fv ./plugin/oji/MRJ/plugin/Resources/Version.rsrc
-rm -fv ./plugin/oji/MRJ/plugin/MRJPlugin.jar
-rm -fv ./plugin/oji/MRJ/plugin/netscape.plugin.jar
-rm -fv ./plugin/oji/MRJ/plugin/Source/JMURLConnection
-rm -fv ./plugin/oji/MRJ/testing/ConsoleApplet/ConsoleApplet.mcp
-rm -fv ./plugin/oji/MRJ/testing/JSApplet/JSApplet.mcp
-rm -fv ./plugin/oji/MRJ/testing/SwingApplet/TestApplet.mcp
-rm -fv ./plugin/oji/MRJ/testing/TrivialApplet/MyApplet.mcp
-rm -fv ./plugin/oji/MRJCarbon/MRJSDK/JavaFrameworks/JavaEmbeddingLib
-rm -fv ./plugin/oji/MRJCarbon/plugin/MRJPlugin.jar
-rm -fv ./plugin/oji/MRJCarbon/plugin/Resources/Dialogs.rsrc
-rm -fv ./plugin/oji/MRJCarbon/plugin/Resources/Strings.rsrc
-rm -fv ./plugin/oji/MRJCarbon/plugin/Resources/Version.rsrc
-rm -fv ./xpcom/reflect/xptcall/tests/eVC4/XPTCInvoke_Testing.cpp
-rm -fv ./xpcom/tests/StringFactoringTests/StringTest.mcp
-rm -fv ./xpcom/typelib/xpidl/macplugin/compiler.rsrc
-rm -fv ./xpcom/typelib/xpidl/macplugin/linker.rsrc
-rm -fv ./xpcom/typelib/xpidl/macplugin/panel.rsrc
-rm -fv ./xpcom/typelib/xpidl/macplugin/version.rsrc
-rm -fv ./xpinstall/packager/mac/ASEncoder/build/ASEncoder.mcp
-rm -fv ./xpinstall/packager/mac/ASEncoder/rsrc/ASEncoder.rsrc
-rm -fv ./xpinstall/packager/mac/ASEncoder/src/ASEncoderUsage.script
-rm -fv ./xpinstall/test/pre_checkin.xpi
-rm -fv ./xpinstall/wizard/libxpnet/GUSI/lib/GUSI_Core.PPC.Lib
-rm -fv ./xpinstall/wizard/libxpnet/GUSI/lib/GUSI_ForeignThreads.PPC.Lib
-rm -fv ./xpinstall/wizard/libxpnet/GUSI/lib/GUSI_MPW.PPC.Lib
-rm -fv ./xpinstall/wizard/libxpnet/GUSI/lib/GUSI_MSL.PPC.Lib
-rm -fv ./xpinstall/wizard/libxpnet/GUSI/lib/GUSI_SIOUX.PPC.Lib
-rm -fv ./xpinstall/wizard/libxpnet/GUSI/lib/GUSI_Sfio.PPC.Lib
-rm -fv ./xpinstall/wizard/mac/rsrc/MIWCommon.rsrc
-rm -fv ./xpinstall/wizard/mac/rsrc/Mozilla.rsrc
-rm -fv ./xpinstall/wizard/os2/setuprsc/box_ch_d.bmp
-rm -fv ./xpinstall/wizard/os2/setuprsc/box_chec.bmp
-rm -fv ./xpinstall/wizard/os2/setuprsc/box_unch.bmp
-rm -fv ./gfx/cairo/libpixman/src/pixman-vc71.lib
-rm -fv ./gfx/src/mac/printerplugin/Resources/English.lproj/Localizable.strings
-rm -fv ./gfx/src/mac/nsMacGFX.rsrc
-rm -fv ./layout/doc/SpaceMgr_BlockReflSt_OD.sda
-rm -fv ./layout/doc/object_diagram_template.sda
-rm -fv ./layout/html/tests/block/bugs/RealSnow.jar
-rm -fv ./webshell/tests/viewer/mac/cfmAlias.rsrc
-rm -fv ./webshell/tests/viewer/mac/cfmAliasDebug.rsrc
-rm -fv ./webshell/tests/viewer/mac/viewer.ppob
-rm -fv ./webshell/tests/viewer/mac/viewer.rsrc
-rm -fv ./webshell/tests/viewer/mac/viewercarb.rsrc
-rm -fv ./webshell/tests/viewer/viewer-beos.rsrc
-rm -fv ./xpfe/bootstrap/appleevents/nsAppleEvents.rsrc
-rm -fv ./xpfe/bootstrap/apprunner-beos.rsrc
-rm -fv ./mailnews/mapi/old/tests/mapitest/mapitest.ncb
-rm -fv ./mailnews/mapi/old/tests/mapitest/mapitest.opt
-rm -fv ./toolkit/mozapps/installer/windows/nsis/Processes.dll
-rm -fv ./toolkit/mozapps/installer/windows/nsis/ShellLink.dll
-rm -fv ./toolkit/mozapps/installer/windows/nsis/nsProcess.dll
-rm -fv ./toolkit/mozapps/installer/windows/nsis/AppAssocReg.dll
-rm -fv ./toolkit/mozapps/installer/windows/nsis/UAC.dll
-rm -fv ./memory/jemalloc/ed.exe
-
-rm -fv ./toolkit/crashreporter/tools/win32/dump_syms.exe
-
-rm -fvr other-licenses/7zstub/
-rm -fv README/mozilla/README.os2
-
-rm -fv netwerk/protocol/ftp/doc/rfc959.txt
-rm -fv directory/c-sdk/ldap/docs/draft-ietf-ldapext-ldap-c-api-05.txt
-
-rm -fvr ./other-licenses/nsis/
-rm -fvr ./xpcom/tests/unit/data/SmallApp.app
-rm -fvr ./xpcom/tests/unit/data/presentation.key
-rm -fv ./embedding/browser/activex/tests/dbrowse/form.dcu
-rm -fv ./embedding/browser/activex/tests/dbrowse/form.dfm
-rm -fv ./toolkit/crashreporter/client/macbuild/Contents/Resources/crashreporter.icns
-rm -fv ./toolkit/crashreporter/client/macbuild/Contents/Resources/English.lproj/MainMenu.nib/keyedobjects.nib
-rm -fv ./toolkit/crashreporter/client/macbuild/Contents/Resources/English.lproj/MainMenuRTL.nib/keyedobjects.nib
-rm -fvr ./toolkit/crashreporter/google-breakpad/src/client/mac/
-rm -fvr ./toolkit/crashreporter/tools/win32/
-rm -fv ./toolkit/mozapps/update/updater/macbuild/Contents/Resources/updater.icns
-rm -fv ./toolkit/mozapps/update/updater/macbuild/Contents/Resources/English.lproj/MainMenu.nib/keyedobjects.nib
-rm -fv ./widget/src/cocoa/resources/MainMenu.nib/keyedobjects.nib
-rm -fvr ./build/mobile/sutagent/android/
-rm -fv ./build/package/mac_osx/mozilla.dsstore
-rm -fv ./toolkit/crashreporter/google-breakpad/src/tools/windows/binaries/dump_syms.exe
-rm -fv ./toolkit/crashreporter/google-breakpad/src/tools/windows/binaries/symupload.exe
-rm -fv ./toolkit/mozapps/update/test/unit/data/partial_in_use_win_after.exe
-rm -fv ./toolkit/mozapps/update/test/unit/data/partial_in_use_win_before.exe
diff --git a/src/mozclient/seamonkey-2.0-remove.binonly.sh b/src/mozclient/seamonkey-2.0-remove.binonly.sh
deleted file mode 100644
index e8a0388..0000000
--- a/src/mozclient/seamonkey-2.0-remove.binonly.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-
-# We have a mozilla dir containing mozilla-central, so we must call the main
-# remove.binonly.sh in it
-SCRIPT=`echo $0 | sed -e 's,/[^/]*-\(remove.binonly.sh\),/\1,'`
-
-echo "\$ cd mozilla" >&2
-cd mozilla
-
-echo "\$ sh $SCRIPT" >&2
-sh $SCRIPT >> ../REMOVED+nobinonly.txt 2>&1
diff --git a/src/mozclient/seamonkey-2.0.conf b/src/mozclient/seamonkey-2.0.conf
deleted file mode 100644
index 13388be..0000000
--- a/src/mozclient/seamonkey-2.0.conf
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright (c) 2007-2008 Fabien Tassin <fta@sofaraway.org>
-# Description: Project SeaMonkey 2.0
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-MOZCLIENT_APPNAME    = seamonkey-2.0
-MOZCLIENT_PROJECT    = comm-central
-MOZCLIENT_VCS        = hg
-MOZCLIENT_VCS_LOC    = http://hg.mozilla.org/
-MOZCLIENT_POSTCOCMD  = cd mozilla && python client.py checkout
-MOZCLIENT_FILE       = mozilla/suite/config/version.txt
-MOZCLIENT_GETVERSION = tail -1 mozilla/suite/config/version.txt | sed -e 's/pre//; s/\([ab]\)\([0-9]*\)/~\1\2/'
-MOZCLIENT_GETDATE    = wget -O - -q --read-timeout=10 --user-agent='' --tries=3 http://hg.mozilla.org/index.cgi/comm-central/log 2> /dev/null | grep cite | head -1 | sed -e 's,.*</cite>,,' | perl -e '$m = { "Jan" => 1, "Feb" => 2, "Mar" => 3, "Apr" => 4, "May" => 5, "Jun" => 6, "Jul" => 7, "Aug" => 8, "Sep" => 9, "Oct" => 10, "Nov" => 11, "Dec" => 12 } ; $a = <>; $a =~ m/^ - \S+,\s+(\d+) (\S+) (\d+) \S+ \S+ - rev (\d+)/ && do { printf "%04d%02d%02dr%d\n", $3, $$m{$2}, $1, $4 }; '
-MOZCLIENT_WANTMOZDIR = 1
-MOZCLIENT_TAREXCLUDE = CVS .cvsignore
diff --git a/src/mozclient/thunderbird-2.0.conf b/src/mozclient/thunderbird-2.0.conf
deleted file mode 100644
index 4ccf185..0000000
--- a/src/mozclient/thunderbird-2.0.conf
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright (c) 2007-2008 Fabien Tassin <fta@sofaraway.org>
-# Description: Project Thunderbird 2.0
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-MOZCLIENT_APPNAME    = thunderbird
-MOZCLIENT_PROJECT    = mail
-MOZCLIENT_VCS        = cvs
-MOZCLIENT_VCS_LOC    = :pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot
-MOZCLIENT_BRANCH     = MOZILLA_1_8_BRANCH
-MOZCLIENT_FILE       = mozilla/mail/config/version.txt
-MOZCLIENT_GETVERSION = tail -1 mozilla/mail/config/version.txt | sed -e 's/pre//; s/\([ab]\)\([0-9]*\)/~\1\2/'
-MOZCLIENT_GETDATE    = wget -O - -q --read-timeout=10 --user-agent='' --tries=3 'http://bonsai.mozilla.org/cvsquery.cgi?treeid=default&module=all&branch=MOZILLA_1_8_0_BRANCH&branchtype=match&dir=&file=&filetype=match&who=&whotype=match&sortby=Date&hours=2&date=explicit&mindate=2007-12-01+00%3A00%3A00&maxdate=2017-12-10+00%3A00%3A00&cvsroot=%2Fcvsroot' 2> /dev/null | grep "href='http://webtools" | head -1 | tr '<>' '@' | cut -d@ -f5 | tr -d ':-' | sed -e 's/&nbsp;/t/'
-MOZCLIENT_EMBEDDED   = 1
-MOZCLIENT_WANTMOZDIR = 1
diff --git a/src/mozclient/thunderbird-3.0-remove.binonly.sh b/src/mozclient/thunderbird-3.0-remove.binonly.sh
deleted file mode 100644
index e8a0388..0000000
--- a/src/mozclient/thunderbird-3.0-remove.binonly.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-
-# We have a mozilla dir containing mozilla-central, so we must call the main
-# remove.binonly.sh in it
-SCRIPT=`echo $0 | sed -e 's,/[^/]*-\(remove.binonly.sh\),/\1,'`
-
-echo "\$ cd mozilla" >&2
-cd mozilla
-
-echo "\$ sh $SCRIPT" >&2
-sh $SCRIPT >> ../REMOVED+nobinonly.txt 2>&1
diff --git a/src/mozclient/thunderbird-3.0.conf b/src/mozclient/thunderbird-3.0.conf
deleted file mode 100644
index 76fe6aa..0000000
--- a/src/mozclient/thunderbird-3.0.conf
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright (c) 2007-2008 Fabien Tassin <fta@sofaraway.org>
-# Description: Project Thunderbird 3.0
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-MOZCLIENT_APPNAME    = thunderbird-3.0
-MOZCLIENT_PROJECT    = comm-central
-MOZCLIENT_VCS        = hg
-MOZCLIENT_VCS_LOC    = http://hg.mozilla.org/
-MOZCLIENT_POSTCOCMD  = cd mozilla && python client.py checkout
-MOZCLIENT_FILE       = mozilla/mail/config/version.txt
-MOZCLIENT_GETVERSION = tail -1 mozilla/mail/config/version.txt | sed -e 's/pre//; s/\([ab]\)\([0-9]*\)/~\1\2/'
-MOZCLIENT_GETDATE    = wget -O - -q --read-timeout=10 --user-agent='' --tries=3 http://hg.mozilla.org/index.cgi/comm-central/log 2> /dev/null | grep cite | head -1 | sed -e 's,.*</cite>,,' | perl -e '$m = { "Jan" => 1, "Feb" => 2, "Mar" => 3, "Apr" => 4, "May" => 5, "Jun" => 6, "Jul" => 7, "Aug" => 8, "Sep" => 9, "Oct" => 10, "Nov" => 11, "Dec" => 12 } ; $a = <>; $a =~ m/^ - \S+,\s+(\d+) (\S+) (\d+) \S+ \S+ - rev (\d+)/ && do { printf "%04d%02d%02dr%d\n", $3, $$m{$2}, $1, $4 }; '
-# MOZCLIENT_EMBEDDED   = 1
-MOZCLIENT_WANTMOZDIR = 1
-MOZCLIENT_TAREXCLUDE = CVS .cvsignore
diff --git a/src/mozclient/xulrunner-1.8.conf b/src/mozclient/xulrunner-1.8.conf
deleted file mode 100644
index 3d62d12..0000000
--- a/src/mozclient/xulrunner-1.8.conf
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright (c) 2008 Fabien Tassin <fta@sofaraway.org>
-# Description: Project XULRunner 1.8
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-MOZCLIENT_APPNAME    = xulrunner
-MOZCLIENT_PROJECT    = xulrunner
-MOZCLIENT_VCS        = cvs
-MOZCLIENT_VCS_LOC    = :pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot
-MOZCLIENT_BRANCH     = MOZILLA_1_8_BRANCH
-MOZCLIENT_FILE       = mozilla/config/milestone.txt
-MOZCLIENT_GETVERSION = tail -1 mozilla/config/milestone.txt | sed -e 's/pre//; s/\([ab]\)\([0-9]*\)/~\1\2/'
-MOZCLIENT_GETDATE    = wget -O - -q --read-timeout=10 --user-agent='' --tries=3 'http://bonsai.mozilla.org/cvsquery.cgi?treeid=default&module=SeaMonkeyBrowser&branch=MOZILLA_1_8_BRANCH&branchtype=match&dir=&file=&filetype=match&who=&whotype=match&sortby=Date&hours=2&date=week&mindate=&maxdate=&cvsroot=%2Fcvsroot' 2> /dev/null | grep "href='http://webtools" | head -1 | tr '<>' '@' | cut -d@ -f5 | tr -d ':-' | sed -e 's/&nbsp;/t/'
-MOZCLIENT_WANTMOZDIR = 0
diff --git a/src/mozclient/xulrunner-1.9.1.conf b/src/mozclient/xulrunner-1.9.1.conf
deleted file mode 100644
index b986b04..0000000
--- a/src/mozclient/xulrunner-1.9.1.conf
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright (c) 2008 Fabien Tassin <fta@sofaraway.org>
-# Description: Project XULRunner 1.9.1
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-MOZCLIENT_APPNAME    = xulrunner-1.9.1
-MOZCLIENT_PROJECT    = mozilla-central
-MOZCLIENT_FILE       = mozilla/config/milestone.txt
-MOZCLIENT_GETVERSION = tail -1 mozilla/config/milestone.txt | sed -e 's/pre//; s/\([ab]\)\([0-9]*\)/~\1\2/'
-MOZCLIENT_VCS        = hg
-MOZCLIENT_VCS_LOC    = http://hg.mozilla.org/
-#MOZCLIENT_POSTCOCMD  = cd mozilla && python client.py checkout
-MOZCLIENT_GETDATE    = wget -O - -q --read-timeout=10 --user-agent='' --tries=3 http://hg.mozilla.org/index.cgi/mozilla-central/log 2> /dev/null | grep cite | head -1 | sed -e 's,.*</cite>,,' | perl -e '$m = { "Jan" => 1, "Feb" => 2, "Mar" => 3, "Apr" => 4, "May" => 5, "Jun" => 6, "Jul" => 7, "Aug" => 8, "Sep" => 9, "Oct" => 10, "Nov" => 11, "Dec" => 12 } ; $a = <>; $a =~ m/^ - \S+,\s+(\d+) (\S+) (\d+) \S+ \S+ - rev (\d+)/ && do { printf "%04d%02d%02dr%d\n", $3, $$m{$2}, $1, $4 }; '
-MOZCLIENT_EMBEDDED  = 1
-MOZCLIENT_WANTMOZDIR = 1
diff --git a/src/mozclient/xulrunner-1.9.conf b/src/mozclient/xulrunner-1.9.conf
deleted file mode 100644
index caa4eeb..0000000
--- a/src/mozclient/xulrunner-1.9.conf
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright (c) 2007-2008 Fabien Tassin <fta@sofaraway.org>
-# Project: xulrunner-1.9
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-MOZCLIENT_APPNAME    = xulrunner-1.9
-MOZCLIENT_PROJECT    = xulrunner
-MOZCLIENT_VCS        = cvs
-MOZCLIENT_VCS_LOC    = :pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot
-MOZCLIENT_FILE       = mozilla/config/milestone.txt
-MOZCLIENT_GETVERSION = tail -1 mozilla/config/milestone.txt | sed -e 's/pre//; s/\([ab]\)\([0-9]*\)/~\1\2/'
-MOZCLIENT_GETDATE    = wget -O - -q --read-timeout=10 --user-agent='' --tries=3 'http://bonsai.mozilla.org/cvsquery.cgi?treeid=default&module=SeaMonkeyBrowser&branch=HEAD&branchtype=match&dir=&file=&filetype=match&who=&whotype=match&sortby=Date&hours=2&date=week&mindate=&maxdate=&cvsroot=%2Fcvsroot' 2> /dev/null | grep "href='http://webtools" | head -1 | tr '<>' '@' | cut -d@ -f5 | tr -d ':-' | sed -e 's/&nbsp;/t/'
-MOZCLIENT_WANTMOZDIR = 1
diff --git a/src/mozclient/xulrunner-2.0.conf b/src/mozclient/xulrunner-2.0.conf
deleted file mode 100644
index f28a24a..0000000
--- a/src/mozclient/xulrunner-2.0.conf
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright (c) 2008 Fabien Tassin <fta@sofaraway.org>
-# Description: Project XULRunner 2.0
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-MOZCLIENT_APPNAME    = xulrunner-2.0
-MOZCLIENT_PROJECT    = mozilla-central
-MOZCLIENT_FILE       = mozilla/config/milestone.txt
-MOZCLIENT_GETVERSION = tail -1 mozilla/config/milestone.txt | sed -e 's/pre//; s/\([ab]\)\([0-9]*\)/~\1\2/'
-MOZCLIENT_VCS        = hg
-MOZCLIENT_VCS_LOC    = http://hg.mozilla.org/
-MOZCLIENT_POSTCOCMD  = cd mozilla && python client.py checkout
-MOZCLIENT_GETDATE    = wget -O - -q --read-timeout=10 --user-agent='' --tries=3 http://hg.mozilla.org/index.cgi/mozilla-central/log 2> /dev/null | grep cite | head -1 | sed -e 's,.*</cite>,,' | perl -e '$m = { "Jan" => 1, "Feb" => 2, "Mar" => 3, "Apr" => 4, "May" => 5, "Jun" => 6, "Jul" => 7, "Aug" => 8, "Sep" => 9, "Oct" => 10, "Nov" => 11, "Dec" => 12 } ; $a = <>; $a =~ m/^ - \S+,\s+(\d+) (\S+) (\d+) \S+ \S+ - rev (\d+)/ && do { printf "%04d%02d%02dr%d\n", $3, $$m{$2}, $1, $4 }; '
-MOZCLIENT_EMBEDDED  = 1
-MOZCLIENT_WANTMOZDIR = 1
diff --git a/src/nspr.mk.in b/src/nspr.mk.in
deleted file mode 100644
index 1653856..0000000
--- a/src/nspr.mk.in
+++ /dev/null
@@ -1,22 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-
-# Copyright (c) 2007-2008 Fabien Tassin <fta@sofaraway.org>
-# Description: Project NSPR
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-MOZCLIENT_PROJECTNAME := nspr
-
-include mozclient.mk.in
diff --git a/src/nss.mk.in b/src/nss.mk.in
deleted file mode 100644
index a56fef0..0000000
--- a/src/nss.mk.in
+++ /dev/null
@@ -1,22 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-
-# Copyright (c) 2007-2008 Fabien Tassin <fta@sofaraway.org>
-# Description: Project NSS
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-MOZCLIENT_PROJECTNAME := nss
-
-include mozclient.mk.in
diff --git a/src/prism.mk.in b/src/prism.mk.in
deleted file mode 100644
index 935fd42..0000000
--- a/src/prism.mk.in
+++ /dev/null
@@ -1,23 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-
-# Copyright (c) 2008 Fabien Tassin <fta@sofaraway.org>
-# Description: Project Prism
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-MOZCLIENT_PROJECTNAME := prism
-
-include mozclient.mk.in
-include xulapp.mk.in
diff --git a/src/seamonkey-2.0.mk.in b/src/seamonkey-2.0.mk.in
deleted file mode 100644
index fcdb673..0000000
--- a/src/seamonkey-2.0.mk.in
+++ /dev/null
@@ -1,38 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-
-# Copyright (c) 2007 Fabien Tassin <fta@sofaraway.org>
-# Description: Project SeaMonkey 2.0
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-MOZCLIENT_PROJECTNAME := seamonkey-2.0
-
-include mozclient.mk.in
-
-COMPARE_FILTER_IN    := sed \
-	-e 's,^usr/lib/seamonkey-2.0/chrome/icons/default/venkman-.*,,' \
-	-e 's,^usr/lib/seamonkey-2.0/extensions/{f13b157f-b174-47e7-a34d-4815ddfdfeb8}.*,,' \
-	$(NULL)
-COMPARE_FILTER_OUT   := sed \
-	-e 's,^DEBIAN/.*,,' \
-	-e 's,^usr/lib/debug/.*,,' \
-	-e 's,^usr/lib/mime/packages/.*,,' \
-	-e 's,^usr/share/doc/.*,,' \
-	-e 's,^usr/share/applications/.*,,' \
-	-e 's,^usr/share/menu/.*,,' \
-	-e 's,^usr/share/pixmaps/.*,,' \
-	$(NULL)
-
-include compare.mk.in
diff --git a/src/setup.py b/src/setup.py
deleted file mode 100644
index 9dbd571..0000000
--- a/src/setup.py
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/usr/bin/python
-
-import os
-import re
-
-from distutils.core import setup
-
-# look/set what version we have
-changelog = "../debian/changelog"
-if os.path.exists(changelog):
-    head = open(changelog).readline()
-    match = re.compile(".*\((.*)\).*").match(head)
-    if match:
-        version = match.group(1)
-
-scripts = [
-    'dh_xul-ext',
-    'install-xpi',
-    'xpi-pack',
-    'xpi-repack',
-    'xpi-unpack',
-    'moz-version',
-]
-
-if __name__ == '__main__':
-    setup(name='mozilla-devscripts',
-          version=version,
-          url='https://launchpad.net/mozilla-devscripts',
-          scripts=scripts,
-          py_modules=['moz_version'],
-    )
diff --git a/src/thunderbird-2.0.mk.in b/src/thunderbird-2.0.mk.in
deleted file mode 100644
index 1e1a01f..0000000
--- a/src/thunderbird-2.0.mk.in
+++ /dev/null
@@ -1,22 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-
-# Copyright (c) 2007-2008 Fabien Tassin <fta@sofaraway.org>
-# Description: Project Thunderbird 2.0
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-MOZCLIENT_PROJECTNAME := thunderbird-2.0
-
-include mozclient.mk.in
diff --git a/src/thunderbird-3.0.mk.in b/src/thunderbird-3.0.mk.in
deleted file mode 100644
index dc9c231..0000000
--- a/src/thunderbird-3.0.mk.in
+++ /dev/null
@@ -1,45 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-
-# Copyright (c) 2007-2008 Fabien Tassin <fta@sofaraway.org>
-# Description: Project Thunderbird 3.0
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-MOZCLIENT_PROJECTNAME := thunderbird-3.0
-
-include mozclient.mk.in
-
-COMPARE_FILTER_PRE_IN := sed \
-	-e 's,foo,foo,' \
-	$(NULL)
-
-COMPARE_FILTER_PRE_OUT := sed \
-	-e 's,^usr/lib/thunderbird-3.0[^/]*/,,' \
-	-e 's,^usr/share/pixmaps/.*,,' \
-	$(NULL)
-
-COMPARE_FILTER_IN    := sed \
-	-e 's,foo,foo,' \
-	$(NULL)
-
-COMPARE_FILTER_OUT   := sed \
-	-e 's,^DEBIAN/.*,,' \
-	-e 's,^usr/lib/debug/.*,,' \
-	-e 's,^usr/share/doc/.*,,' \
-	-e 's,^usr/share/menu/.*,,' \
-	-e 's,^usr/share/applications/.*,,' \
-	$(NULL)
-
-include compare.mk.in
diff --git a/src/xulapp.mk.in b/src/xulapp.mk.in
deleted file mode 100644
index c0fce31..0000000
--- a/src/xulapp.mk.in
+++ /dev/null
@@ -1,35 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-
-# Copyright (c) 2007-2008 Fabien Tassin <fta@sofaraway.org>
-# Description: build system for xulrunner applications
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-#####################################################################
-
-DEBIAN_XUL_VER ?= $(shell xulrunner-1.9 --gre-version)
-
-pre-build:: build-system.stamp
-
-build-system.stamp:
-	tar zxf /usr/lib/xulrunner-devel-$(DEBIAN_XUL_VER)/sdk/build-system.tar.gz
-	touch $@
-
-clean::
-	rm -f build-system.stamp
-	# Drop build-system files, and files/dirs generated during the build but
-	# outside of the xulapp tree
-	rm -rf config build toolkit nsprpub extensions memory netwerk probes xpcom testing tools services
-	rm -f Makefile.in configure.in aclocal.m4 allmakefiles.sh config.* configure mozilla-config.h confdefs.h a.out
diff --git a/src/xulrunner-1.8.mk.in b/src/xulrunner-1.8.mk.in
deleted file mode 100644
index 30ced26..0000000
--- a/src/xulrunner-1.8.mk.in
+++ /dev/null
@@ -1,22 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-
-# Copyright (c) 2008 Fabien Tassin <fta@sofaraway.org>
-# Description: Project XULRunner 1.8
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-MOZCLIENT_PROJECTNAME := xulrunner-1.8
-
-include mozclient.mk.in
diff --git a/src/xulrunner-1.9.1.mk.in b/src/xulrunner-1.9.1.mk.in
deleted file mode 100644
index 0396ee5..0000000
--- a/src/xulrunner-1.9.1.mk.in
+++ /dev/null
@@ -1,47 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-
-# Copyright (c) 2008 Fabien Tassin <fta@sofaraway.org>
-# Description: Project XULRunner 1.9.1
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-MOZCLIENT_PROJECTNAME := xulrunner-1.9.1
-
-include mozclient.mk.in
-
-COMPARE_FILTER_PRE_IN	= sed \
-	-e 's,foo,foo,' \
-	$(NULL)
-
-COMPARE_FILTER_PRE_OUT	= sed \
-	-e 's,^usr/share/idl/.*,,' \
-	-e 's,^usr/include/.*,,' \
-	-e 's,^usr/lib/pkgconfig/.*,,' \
-	-e 's,^usr/lib/xulrunner-devel.*,,' \
-	-e 's,^usr/lib/xulrunner-1.9.1[^/]*/,,' \
-	-e 's,^etc/gre.d/.*,,' \
-	$(NULL)
-
-COMPARE_FILTER_IN	= sed \
-	-e 's,usr/lib/xulrunner-[^/]*/extensions,usr/lib/xulrunner-addons/extensions,' \
-	-e 's,usr/lib/xulrunner-[^/]*/plugins,usr/lib/xulrunner-addons/plugins,' \
-	$(NULL)
-
-COMPARE_FILTER_OUT	= sed \
-	-e 's,^DEBIAN/.*,,' \
-	-e 's,^usr/share/doc/.*,,' \
-	$(NULL)
-
-include compare.mk.in
diff --git a/src/xulrunner-1.9.mk.in b/src/xulrunner-1.9.mk.in
deleted file mode 100644
index 41faf5c..0000000
--- a/src/xulrunner-1.9.mk.in
+++ /dev/null
@@ -1,47 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-
-# Copyright (c) 2007-2008 Fabien Tassin <fta@sofaraway.org>
-# Description: Project XULRunner 1.9
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-MOZCLIENT_PROJECTNAME := xulrunner-1.9
-
-include mozclient.mk.in
-
-COMPARE_FILTER_PRE_IN	= sed \
-	-e 's,foo,foo,' \
-	$(NULL)
-
-COMPARE_FILTER_PRE_OUT	= sed \
-	-e 's,^usr/share/idl/.*,,' \
-	-e 's,^usr/include/.*,,' \
-	-e 's,^usr/lib/pkgconfig/.*,,' \
-	-e 's,^usr/lib/xulrunner-devel.*,,' \
-	-e 's,^usr/lib/xulrunner-1.9[^/]*/,,' \
-	-e 's,^etc/gre.d/.*,,' \
-	$(NULL)
-
-COMPARE_FILTER_IN	= sed \
-	-e 's,usr/lib/xulrunner-[^/]*/extensions,usr/lib/xulrunner-addons/extensions,' \
-	-e 's,usr/lib/xulrunner-[^/]*/plugins,usr/lib/xulrunner-addons/plugins,' \
-	$(NULL)
-
-COMPARE_FILTER_OUT	= sed \
-	-e 's,^DEBIAN/.*,,' \
-	-e 's,^usr/share/doc/.*,,' \
-	$(NULL)
-
-include compare.mk.in
diff --git a/src/xulrunner-2.0.mk.in b/src/xulrunner-2.0.mk.in
deleted file mode 100644
index 6e41cba..0000000
--- a/src/xulrunner-2.0.mk.in
+++ /dev/null
@@ -1,47 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-
-# Copyright (c) 2008 Fabien Tassin <fta@sofaraway.org>
-# Description: Project XULRunner 2.0
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-MOZCLIENT_PROJECTNAME := xulrunner-2.0
-
-include mozclient.mk.in
-
-COMPARE_FILTER_PRE_IN	= sed \
-	-e 's,foo,foo,' \
-	$(NULL)
-
-COMPARE_FILTER_PRE_OUT	= sed \
-	-e 's,^usr/share/idl/.*,,' \
-	-e 's,^usr/include/.*,,' \
-	-e 's,^usr/lib/pkgconfig/.*,,' \
-	-e 's,^usr/lib/xulrunner-devel.*,,' \
-	-e 's,^usr/lib/xulrunner-2.0[^/]*/,,' \
-	-e 's,^etc/gre.d/.*,,' \
-	$(NULL)
-
-COMPARE_FILTER_IN	= sed \
-	-e 's,usr/lib/xulrunner-[^/]*/extensions,usr/lib/xulrunner-addons/extensions,' \
-	-e 's,usr/lib/xulrunner-[^/]*/plugins,usr/lib/xulrunner-addons/plugins,' \
-	$(NULL)
-
-COMPARE_FILTER_OUT	= sed \
-	-e 's,^DEBIAN/.*,,' \
-	-e 's,^usr/share/doc/.*,,' \
-	$(NULL)
-
-include compare.mk.in