DEB: use _base folder for a distro instead of specific distros (squeeze and maverick).

Signed-off-by: Michele Calgaro <[email protected]>

20 files changed, 983 insertions, 0 deletions

diff --git a/ubuntu/_base/applications/wlassistant/debian/README.Debian b/ubuntu/_base/applications/wlassistant/debian/README.Debian
new file mode 100644
index 000000000..b0302c211
--- /dev/null
+++ b/ubuntu/_base/applications/wlassistant/debian/README.Debian
@@ -0,0 +1,107 @@
+Debian kde-extras Team
+----------------------
+
+1. Contacts
+-----------
+
+General help requests
+	<[email protected]>	mailing list
+	#debian-kde			on irc
+
+Packaging queries
+	<[email protected]>  mailing list
+	#debian-qt-kde			  on irc
+
+Maintainers
+	<[email protected]>	mailing list
+
+
+2. Subversion repository
+------------------------
+  
+You can browse it only at:
+
+http://svn.debian.org/wsvn/pkg-kde/kde-extras/
+
+To "checkout" the repository use these commands:
+
+	$ svn co svn+ssh://${ALIOTH_USERNAME}@svn.debian.org/svn/pkg-kde/kde-extras
+
+Authorized SSH keys are controlled at https://alioth.debian.org/account/
+
+The repository layout is:
+
+- packagename/
+� � - trunk/
+� � - branches/
+� � - tags/
+��������- 0.7.2-1/
+��������- 0.7.2-2/
+��������- 0.7.2-2ubuntu1/
+��������- 0.7.2-2ubuntu2/
+��������- 0.7.2-2ubuntu3/
+��������- 0.8.0/
+��������...
+
+If only one version of the package is available at the time, development must 
+be made at trunk/ dir, copying the dir to tags/'pkg-version' each time a new 
+release is made.
+
+When, at some point, the need to have two different versions at the same time 
+arises (for example, if we need a version to be in unstable and a different one
+to be in experimental), experimental development will be made in trunk/ and 
+if a new unstable package needs to be cooked, copying 
+tag/'latest_version_in_sid' to tag/'latest_version_in_sid'+1 will make the
+trick.
+
+3. Using svn-buildpackage
+--------------------------
+
+Packages with an upstream tarball will require you to set the mergeWithUpstream
+property first (from the package root) so that svn-buildpackage will look for
+the .orig.tar.gz in the ../tarballs directory.
+	
+	% svn propset mergeWithUpstream 1 debian
+
+Please note that this only works for packages which have only the debian/
+directory committed. Consequently, you must use CDBS's simple-patchsys.mk or
+dpatch to modify the upstream sources.
+
+After you have finished and committed your Debian patches via
+	
+	% svn commit [PACKAGE]
+
+as well as copying the orig.tar.gz to ../tarballs/ if necessary, you may build
+your package with the following commands:
+
+	% svn-buildpackage --svn-ignore-new -rfakeroot
+
+Please, don't commit tarballs/ or build-area/ directories to SVN.
+
+4. Tarballs and Build-area directories
+------------------------------------
+
+During pkg development before uploaded to debian the tarballs can be found at:
+
+	http://pkg-kde.alioth.debian.org/kde-extra/orig.tar.gz/
+
+You need to place those dirs in the parent directory of the one from which you're 
+running svn-buildpackage. Usually this means placing tarballs/ and build-area/ dirs 
+in 'pkgname'/ dir, at the same level as trunk/
+
+If you want to compile inside one version in tags/ dir, you'll need to place those
+dirs inside that dir. Of course the easiest and cleanest way of doing it is 
+by making a symlink of those dirs inside tags/ dir.
+
+5. Using svn-inject
+-------------------
+
+To inject a new package into the Debian KDE Extras svn archive you should use svn-inject(1)
+as follows:
+
+        svn-inject -o <package>.dsc svn+ssh://${ALIOTH_USERNAME}@svn.debian.org/svn/pkg-kde/kde-extras
+
+Type in your alioth password a few hundred times :-) and your package should be
+uploaded to the archive.  Note you will also need to manually copy the
+package.orig.tar.gz to your tarballs directory.  The -o option is important as
+this ensures that we 'Only keep modified files under SVN control'
diff --git a/ubuntu/_base/applications/wlassistant/debian/cdbs/debian-qt-kde.mk b/ubuntu/_base/applications/wlassistant/debian/cdbs/debian-qt-kde.mk
new file mode 100644
index 000000000..68dca1718
--- /dev/null
+++ b/ubuntu/_base/applications/wlassistant/debian/cdbs/debian-qt-kde.mk
@@ -0,0 +1,111 @@
+ifndef _cdbs_bootstrap
+_cdbs_scripts_path ?= /usr/lib/cdbs
+_cdbs_rules_path ?= /usr/share/cdbs/1/rules
+_cdbs_class_path ?= /usr/share/cdbs/1/class
+endif
+
+ifndef _cdbs_class_debian-qt-kde
+_cdbs_class_debian-qt-kde := 1
+
+# Note: This _must_ be included before autotools.mk, or it won't work.
+common-configure-arch common-configure-indep:: debian/stamp-cvs-make
+debian/stamp-cvs-make:
+	touch debian/stamp-cvs-make
+
+include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
+
+ifndef _cdbs_rules_patchsys_quilt
+DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
+
+DEB_KDE_ENABLE_FINAL := yes
+DEB_INSTALL_DOCS_ALL :=
+
+DEB_DH_MAKESHLIBS_ARGS_ALL := -V
+DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
+
+ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+    cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
+    ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
+        cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
+    else
+        cdbs_kde_enable_final =
+    endif
+endif
+
+common-build-arch:: debian/stamp-man-pages
+debian/stamp-man-pages:
+	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
+	for f in $$(find debian/man -name '*.sgml'); do \
+		docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
+	done
+	for f in $$(find debian/man -name '*.man'); do \
+		soelim -I debian/man $$f \
+		> debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
+	done
+	touch debian/stamp-man-pages
+
+common-binary-indep::
+	( set -e; \
+	tmpf=`mktemp debian/versions.XXXXXX`; \
+	perl debian/cdbs/versions.pl >$$tmpf; \
+	for p in $(DEB_INDEP_PACKAGES); do \
+	    cat $$tmpf >>debian/$$p.substvars; \
+	done; \
+	rm -f $$tmpf )
+
+common-binary-arch::
+	( set -e; \
+	tmpf=`mktemp debian/versions.XXXXXX`; \
+	perl debian/cdbs/versions.pl >$$tmpf; \
+	for p in $(DEB_ARCH_PACKAGES); do \
+	    cat $$tmpf >>debian/$$p.substvars; \
+	done; \
+	rm -f $$tmpf )
+
+clean::
+	rm -rf debian/man/out
+	-rmdir debian/man
+	rm -f debian/stamp-man-pages
+	rm -rf debian/shlibs-check
+
+$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
+	if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
+	if test -e debian/$(cdbs_curpkg).lintian; then \
+		install -p -D -m644 debian/$(cdbs_curpkg).lintian \
+			debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
+	fi
+	if test -e debian/$(cdbs_curpkg).presubj; then \
+		install -p -D -m644 debian/$(cdbs_curpkg).presubj \
+			debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
+	fi
+
+binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
+	set -e; \
+	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
+		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
+		echo Building $$pkg HTML docs...; \
+		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
+	done
+	for pkg in $(DOC_HTML_PRUNE) ; do \
+	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+	done
+
+clean::
+	rm -f debian/stamp-cvs-make
+
+endif
+
+#common-build-indep:: debian/stamp-kde-apidox
+#debian/stamp-kde-apidox:
+#	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
+#	touch $@
+#
+#common-install-indep:: common-install-kde-apidox
+#common-install-kde-apidox::
+#	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR))
+#
+#clean::
+#	rm -f debian/stamp-kde-apidox
diff --git a/ubuntu/_base/applications/wlassistant/debian/cdbs/kde.mk b/ubuntu/_base/applications/wlassistant/debian/cdbs/kde.mk
new file mode 100644
index 000000000..f5d237249
--- /dev/null
+++ b/ubuntu/_base/applications/wlassistant/debian/cdbs/kde.mk
@@ -0,0 +1,89 @@
+# -*- mode: makefile; coding: utf-8 -*-
+# Copyright © 2003 Christopher L Cheney <[email protected]>
+# Description: A class for KDE packages; sets KDE environment variables, etc
+#
+# 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., 59 Temple Place, Suite 330, Boston, MA
+# 02111-1307 USA.
+
+_cdbs_scripts_path ?= /usr/lib/cdbs
+_cdbs_rules_path ?= /usr/share/cdbs/1/rules
+_cdbs_class_path ?= /usr/share/cdbs/1/class
+
+ifndef _cdbs_class_kde
+_cdbs_class_kde := 1
+
+# for dh_icons
+CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
+
+include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
+
+ifdef _cdbs_tarball_dir
+DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
+else
+DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
+endif
+
+# include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
+
+export kde_cgidir  = \$${libdir}/cgi-bin
+export kde_confdir = \$${sysconfdir}/trinity
+export kde_htmldir = \$${datadir}/doc/tde/HTML
+
+ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
+	cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
+endif
+
+ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
+	cdbs_kde_enable_final =
+	cdbs_kde_enable_debug = --enable-debug=yes
+else
+	cdbs_kde_enable_debug = --disable-debug
+endif
+
+ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
+	cdbs_kde_enable_debug = --enable-debug=full
+endif
+
+cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
+
+DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/"
+DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+
+$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
+	if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
+
+cleanbuilddir::
+	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
+
+common-build-arch common-build-indep:: debian/stamp-kde-apidox
+debian/stamp-kde-apidox:
+#	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
+	touch $@
+
+common-install-arch common-install-indep:: common-install-kde-apidox
+common-install-kde-apidox::
+#	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR))
+
+clean::
+	rm -f debian/stamp-kde-apidox
+
+# This is a convenience target for calling manually.  It's not part of
+# the build process.
+buildprep: clean apply-patches
+	$(MAKE) -f admin/Makefile.common dist
+	debian/rules clean
+
+endif
diff --git a/ubuntu/_base/applications/wlassistant/debian/cdbs/versions.pl b/ubuntu/_base/applications/wlassistant/debian/cdbs/versions.pl
new file mode 100644
index 000000000..1b110f7af
--- /dev/null
+++ b/ubuntu/_base/applications/wlassistant/debian/cdbs/versions.pl
@@ -0,0 +1,19 @@
+#!/usr/bin/env perl
+
+use strict;
+use warnings;
+
+my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
+my ($version3, $version3_next);
+my ($version2, $version2_next);
+
+($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
+($version2 = $version3) =~ s/\.[^.]+$//;
+
+($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
+($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
+
+print "TDE-Version3=$version3\n";
+print "TDE-Version2=$version2\n";
+print "TDE-Next-Version3=$version3_next\n";
+print "TDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/_base/applications/wlassistant/debian/changelog b/ubuntu/_base/applications/wlassistant/debian/changelog
new file mode 100644
index 000000000..5eed797ea
--- /dev/null
+++ b/ubuntu/_base/applications/wlassistant/debian/changelog
@@ -0,0 +1,52 @@
+wlassistant-trinity (0.5.7-2~0ubuntu3) karmic; urgency=low
+
+  * Karmic rebuild
+
+ -- Timothy Pearson <[email protected]>  Thu, 02 Jul 2009 16:08:00 -0600
+
+wlassistant-trinity (0.5.7-2~0ubuntu2) intrepid; urgency=low
+
+  * Moved to /opt/trinity
+
+ -- Timothy Pearson <[email protected]>  Tue, 17 Mar 2009 15:13:00 -0600
+
+wlassistant-trinity (0.5.7-2~0ubuntu1) intrepid; urgency=low
+
+  * Added -trinity suffix
+
+ -- Timothy Pearson <[email protected]>  Mon, 05 Jan 2009 21:15:00 -0600
+
+wlassistant (0.5.7-2) unstable; urgency=low
+
+  * Fix clean target: cleanbuilddir common-configure-arch::
+  * Remove Depends: tdelibs-bin - proper depends are pulled in via shlibs
+    - wlassistant uninstallable after tdelibs(4:3.5.7.dfsg.1-4) (Closes:
+    #437413)
+  * Move to Applications/Network/Monitoring:
+    - lintian fix menu-item-uses-apps-section
+
+ -- Mark Purcell <[email protected]>  Sun, 12 Aug 2007 17:00:41 +0100
+
+wlassistant (0.5.7-1) unstable; urgency=low
+
+  * New upstream release
+  * Robust get-orig-source target
+  * Remove obsolete debian/TODO
+
+ -- Mark Purcell <[email protected]>  Mon, 23 Apr 2007 21:54:31 +1000
+
+wlassistant (0.5.6-1) unstable; urgency=low
+
+  * New upstream release
+  * New maintainer. (Closes: #410619: O: wlassistant -- KDE frontend for
+    wireless network connection - Debian Bug report logs)
+    - Debian KDE Extras Team <[email protected]>
+
+ -- Debian KDE Extras Team <[email protected]>  Sun, 18 Feb 2007 20:44:57 +0000
+
+wlassistant (0.5.5-1) unstable; urgency=low
+
+  * Initial release. (Closes: #322874)
+
+ -- Stan Vasilyev <[email protected]>  Sat, 18 Feb 2006 14:10:18 -0800
+
diff --git a/ubuntu/_base/applications/wlassistant/debian/compat b/ubuntu/_base/applications/wlassistant/debian/compat
new file mode 100644
index 000000000..7f8f011eb
--- /dev/null
+++ b/ubuntu/_base/applications/wlassistant/debian/compat
@@ -0,0 +1 @@
+7
diff --git a/ubuntu/_base/applications/wlassistant/debian/control b/ubuntu/_base/applications/wlassistant/debian/control
new file mode 100644
index 000000000..b7bd04cb6
--- /dev/null
+++ b/ubuntu/_base/applications/wlassistant/debian/control
@@ -0,0 +1,22 @@
+Source: wlassistant-trinity
+Section: tde
+Priority: optional
+Maintainer: Timothy Pearson <[email protected]>
+Uploaders: Achim Bohnet <[email protected]>, Mark Purcell <[email protected]>
+Build-Depends: debhelper (>= 7.0.50~), quilt, cmake, cdbs, tdelibs14-trinity-dev, net-tools, wireless-tools, libiw-dev
+Standards-Version: 3.8.4
+
+Package: wlassistant-trinity
+Architecture: any
+Depends: kicker-trinity, net-tools, wireless-tools, menu, ${shlibs:Depends}
+Replaces: wlassistant-kde3 (<< 4:14.0.0~), wlassistant-trinity (<< 4:14.0.0~)
+Breaks: wlassistant-kde3 (<< 4:14.0.0~), wlassistant-trinity (<< 4:14.0.0~)
+Recommends: dhcp3-client | dhcp-client | dhcpcd
+Description: User friendly TDE frontend for wireless network connection [Trinity]
+ Wireless Assistant scans for wireless access points and displays link quality,
+ encryption and other useful information. When user wants to connect to a
+ network, Wireless Assistant opens up its wizards and guides the user through
+ Wi-Fi settings. After a successful connection is made the settings are
+ remembered so next time the user won't have to enter them again.
+ .
+  Homepage: http://wlassistant.sourceforge.net/
diff --git a/ubuntu/_base/applications/wlassistant/debian/copyright b/ubuntu/_base/applications/wlassistant/debian/copyright
new file mode 100644
index 000000000..5179772ff
--- /dev/null
+++ b/ubuntu/_base/applications/wlassistant/debian/copyright
@@ -0,0 +1,25 @@
+This package was debianized by Stan Vasilyev <[email protected]>
+and Achim Bohnet <[email protected]> on Thu, 11 Aug 2005 23:31:05 -0700.
+
+It was downloaded from http://wlassistant.sf.net/
+
+Copyright (C) 2005 by Pawel Nawrocki <[email protected]>
+
+License:
+
+     This program is free software; you can redistribute it and/or modify
+     it under the terms of the GNU General Public License as published by
+     the Free Software Foundation; either version 2 of the License, or
+     (at your option) any later version.
+
+     This program is distributed in the hope that it will be useful, 
+     but WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+     GNU General Public License for more details.
+
+     You should have received a copy of the GNU General Public License
+     along with this program; if not, write to the Free Software Foundation,
+     Inc., 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA 
+
+  On Debian GNU/Linux systems, the complete text of the GNU General
+  Public License can be found in the /usr/share/common-licenses/GPL file.
diff --git a/ubuntu/_base/applications/wlassistant/debian/patches/series b/ubuntu/_base/applications/wlassistant/debian/patches/series
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/ubuntu/_base/applications/wlassistant/debian/patches/series
diff --git a/ubuntu/_base/applications/wlassistant/debian/rules b/ubuntu/_base/applications/wlassistant/debian/rules
new file mode 100755
index 000000000..13db5ab65
--- /dev/null
+++ b/ubuntu/_base/applications/wlassistant/debian/rules
@@ -0,0 +1,30 @@
+#!/usr/bin/make -f
+
+# Set LD_LIBRARY_PATH to the installed library directory to allow dh_shlibdeps to function
+# Also include the main Trinity path
+ifeq ("$(LD_LIBRARY_PATH)", "")
+LD_LIBRARY_PATH=debian/tmp/opt/trinity/lib
+else
+LD_LIBRARY_PATH += :debian/tmp/opt/trinity/lib
+endif
+export LD_LIBRARY_PATH
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/cmake.mk
+#include /usr/share/cdbs/1/rules/patchsys-quilt.mk
+include /usr/share/cdbs/1/rules/utils.mk
+include debian/cdbs/debian-qt-kde.mk
+
+DEB_KDE_APIDOX := yes
+
+CXXFLAGS := -DSMB_CTX_FLAG_USE_KERBEROS -DSMB_CTX_FLAG_FALLBACK_AFTER_KERBEROS -g -Wall $(DEB_OPT_FLAG)
+
+DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" -DCONFIG_INSTALL_DIR="/etc/trinity" -DSYSCONF_INSTALL_DIR="/etc/trinity" -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/" -DAUTODETECT_QT_DIRS="ON" -DCMAKE_VERBOSE_MAKEFILE="ON" -DBUILD_ALL="ON" -DCMAKE_SKIP_RPATH="OFF" \
+-DCMAKE_BUILD_TYPE=RelWithDebInfo
+
+DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
+                               && echo xz || echo bzip2)
+
+# Honour "parallel=N" option of DEB_BUILD_OPTIONS.  Comment out to
+# never build in parallel, regardless of DEB_BUILD_OPTIONS.
+DEB_BUILD_PARALLEL = true
diff --git a/ubuntu/_base/applications/wlassistant/debian/source/format b/ubuntu/_base/applications/wlassistant/debian/source/format
new file mode 100644
index 000000000..163aaf8d8
--- /dev/null
+++ b/ubuntu/_base/applications/wlassistant/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/ubuntu/_base/applications/wlassistant/debian/source/options b/ubuntu/_base/applications/wlassistant/debian/source/options
new file mode 100644
index 000000000..72f1f5450
--- /dev/null
+++ b/ubuntu/_base/applications/wlassistant/debian/source/options
@@ -0,0 +1,6 @@
+# Use xz instead of gzip
+compression = "xz"
+compression-level = 9
+
+# Don't run differences
+diff-ignore = .*
diff --git a/ubuntu/_base/applications/wlassistant/debian/watch b/ubuntu/_base/applications/wlassistant/debian/watch
new file mode 100644
index 000000000..42304de6e
--- /dev/null
+++ b/ubuntu/_base/applications/wlassistant/debian/watch
@@ -0,0 +1,3 @@
+version=3
+
+http://sf.net/wlassistant/wlassistant-(.*)\.tar\.bz2	debian	svn-upgrade
diff --git a/ubuntu/_base/applications/wlassistant/debian/wlassistant-16.xpm b/ubuntu/_base/applications/wlassistant/debian/wlassistant-16.xpm
new file mode 100644
index 000000000..fcaa89b00
--- /dev/null
+++ b/ubuntu/_base/applications/wlassistant/debian/wlassistant-16.xpm
@@ -0,0 +1,166 @@
+/* XPM */
+static char *wlassistant-16[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 144 2",
+"   c black",
+".  c #000101",
+"X  c #010101",
+"o  c #000303",
+"O  c #030000",
+"+  c #020202",
+"@  c #010606",
+"#  c #040505",
+"$  c gray2",
+"%  c #060606",
+"&  c #070707",
+"*  c #010800",
+"=  c #020E00",
+"-  c #0A0202",
+";  c #0F0000",
+":  c #09020A",
+">  c #0C050D",
+",  c gray3",
+"<  c #090909",
+"1  c #090A08",
+"2  c gray4",
+"3  c #0B0B0B",
+"4  c #0C0C0C",
+"5  c gray5",
+"6  c #0E0E0E",
+"7  c gray6",
+"8  c #031000",
+"9  c #051C00",
+"0  c #0F1010",
+"q  c #110000",
+"w  c #101010",
+"e  c #111111",
+"r  c #121012",
+"t  c gray7",
+"y  c #121313",
+"u  c #131313",
+"i  c gray8",
+"p  c #141515",
+"a  c #151515",
+"s  c #161616",
+"d  c gray9",
+"f  c #161919",
+"g  c #171919",
+"h  c #191919",
+"j  c #191A1A",
+"k  c gray10",
+"l  c #1B1B1B",
+"z  c #1B1D1D",
+"x  c gray11",
+"c  c #1D1C1C",
+"v  c #1D1D1D",
+"b  c #1E1C1E",
+"n  c gray12",
+"m  c #062200",
+"M  c #072C00",
+"N  c #083000",
+"B  c #093600",
+"V  c #0A3E00",
+"C  c #280000",
+"Z  c #330000",
+"A  c #3B0202",
+"S  c #3D0202",
+"D  c #3E0000",
+"F  c #202020",
+"G  c gray13",
+"H  c #222222",
+"J  c #222323",
+"K  c #232323",
+"L  c #222424",
+"P  c gray14",
+"I  c #252525",
+"U  c gray15",
+"Y  c #272727",
+"T  c #282727",
+"R  c #282828",
+"E  c gray16",
+"W  c #2A2A2A",
+"Q  c gray17",
+"!  c #2C2C2C",
+"~  c #2D2D2D",
+"^  c gray18",
+"/  c #302F2F",
+"(  c #313131",
+")  c #323232",
+"_  c #303434",
+"`  c gray21",
+"'  c #383939",
+"]  c gray23",
+"[  c #3F3F3F",
+"{  c #0E5400",
+"}  c #0F5E00",
+"|  c #106200",
+" . c #116600",
+".. c #116800",
+"X. c #116A00",
+"o. c #156E04",
+"O. c #127000",
+"+. c #157E00",
+"@. c #177E06",
+"#. c #197507",
+"$. c #267D15",
+"%. c #3F4040",
+"&. c #480000",
+"*. c #520000",
+"=. c #5D0000",
+"-. c #690000",
+";. c #404141",
+":. c #444545",
+">. c #464646",
+",. c #474646",
+"<. c #474448",
+"1. c #484848",
+"2. c #484949",
+"3. c gray29",
+"4. c #4A4B4B",
+"5. c #4C4C4C",
+"6. c #505252",
+"7. c gray37",
+"8. c gray44",
+"9. c #7B7B7B",
+"0. c #158000",
+"q. c #168800",
+"w. c #1AA000",
+"e. c #1CA800",
+"r. c #1DAB01",
+"t. c #1FB901",
+"y. c #348325",
+"u. c #378E26",
+"i. c #22B909",
+"p. c #2BC71B",
+"a. c #23D600",
+"s. c #25D103",
+"d. c #30C812",
+"f. c #25E200",
+"g. c #26FB03",
+"h. c #2AF802",
+"j. c #3AFF25",
+"k. c #4FDC34",
+"l. c #53F034",
+"z. c #62FF43",
+"x. c #868686",
+"c. c #9A9B9B",
+"v. c #ADACAC",
+"b. c None",
+/* pixels */
+"b.b.b.e 5 , , & , 4 & 5 & b.b.b.",
+"b.b.e 5 & w x G R U i , , , b.b.",
+"b.i 5 , G G h G x h P P e , & b.",
+"h e & U h G ;.%.' ] R l G & 5   ",
+"h , G x / ;.f 0 x L ' R l x , , ",
+"i e U U >.@ b.0.o.b.F ;.x P 5 e ",
+"e U G >.f [email protected] b.h ' x h e ",
+"e ( T 4., -.i.j.g. .1 6.5.G F e ",
+"e R U 4.p S +.a.e.V e c.7.F G u ",
+"f U U >.G b.m X.{ * b.v.4.G G h ",
+"h i ^ R _ ; } +.|   b.x.x ( i x ",
+"h e R R o b.o.w.q.= b.5.( Q h u ",
+"r x i i   b.#.d.r.9 b.b.4.u G   ",
+"b.i h   - b.$.l.s.N b.b.b.h < b.",
+"b.b.,   b.b.y.z.h.{   b., &   b.",
+"b.b.b.b.b.=.u.k.f.X.  b.b.b.b.b."
+};
diff --git a/ubuntu/_base/applications/wlassistant/debian/wlassistant-trinity.dirs b/ubuntu/_base/applications/wlassistant/debian/wlassistant-trinity.dirs
new file mode 100644
index 000000000..110a71185
--- /dev/null
+++ b/ubuntu/_base/applications/wlassistant/debian/wlassistant-trinity.dirs
@@ -0,0 +1 @@
+opt/trinity/share/applications/tde
diff --git a/ubuntu/_base/applications/wlassistant/debian/wlassistant-trinity.docs b/ubuntu/_base/applications/wlassistant/debian/wlassistant-trinity.docs
new file mode 100644
index 000000000..8fa4b0c87
--- /dev/null
+++ b/ubuntu/_base/applications/wlassistant/debian/wlassistant-trinity.docs
@@ -0,0 +1,4 @@
+doc/AUTHORS
+doc/NEWS
+doc/README
+doc/TODO
diff --git a/ubuntu/_base/applications/wlassistant/debian/wlassistant-trinity.install b/ubuntu/_base/applications/wlassistant/debian/wlassistant-trinity.install
new file mode 100644
index 000000000..7465386d3
--- /dev/null
+++ b/ubuntu/_base/applications/wlassistant/debian/wlassistant-trinity.install
@@ -0,0 +1,3 @@
+debian/wlassistant.xpm     /opt/trinity/share/pixmaps/
+debian/wlassistant-16.xpm  /opt/trinity/share/pixmaps/
+
diff --git a/ubuntu/_base/applications/wlassistant/debian/wlassistant-trinity.manpage b/ubuntu/_base/applications/wlassistant/debian/wlassistant-trinity.manpage
new file mode 100644
index 000000000..28b6283c0
--- /dev/null
+++ b/ubuntu/_base/applications/wlassistant/debian/wlassistant-trinity.manpage
@@ -0,0 +1,44 @@
+.TH "wlassistant" "1" "0.5.5" "Pawel Nawrocki <[email protected]>" "net"
+.SH "NAME"
+.LP 
+Wireless Assistant
+.SH "SYNTAX"
+.LP 
+wlassistant [Qt\-options] [TDE\-options]
+
+Generic options:
+  \-\-help                    Show help about options
+  \-\-help\-qt                 Show Qt specific options
+  \-\-help\-tde                Show TDE specific options
+  \-\-help\-all                Show all options
+  \-\-author                  Show author information
+  \-v, \-\-version             Show version information
+  \-\-license                 Show license information
+  \-\-                        End of options
+.SH "DESCRIPTION"
+.LP 
+Wireless Assistant is a full\-featured TDE application with an intuitive interface. It scans for wireless access points and displays link quality, encryption and other useful information. When user wants to connect to a  network, Wireless Assistant opens up its wizards and guides the user through Wi\-Fi settings. After a successful connection is made the settings are remembered so next time the user won't have to enter them again. 
+
+Unlike other similar applications, Wireless Assistant requires virtually no  configuration, it is ready to use right after installation. Features include WEP  encryption, automatic (DHCP) and manual configuration, hidden ESSIDs and more.
+
+Main Features:
+
+\- Managed Networks Support
+
+\- WEP Encryption Support
+
+\- Not Broadcasted ("hidden") ESSIDs Support
+
+\- Per Network (AP) Configuration Profiles
+
+\- Automatic (DHCP, both dhcpcd and dhclient) and manual configuration options.
+
+The program uses wireless\-tools, route, ifconfig, dhcpcd/dhclient as its backends so they need to be installed.
+.SH "EXAMPLES"
+.LP 
+To run this program type:
+.LP 
+sudo wlassistant
+.SH "AUTHORS"
+.LP 
+Pawel Nawrocki <[email protected]>
diff --git a/ubuntu/_base/applications/wlassistant/debian/wlassistant-trinity.menu b/ubuntu/_base/applications/wlassistant/debian/wlassistant-trinity.menu
new file mode 100644
index 000000000..9e7286512
--- /dev/null
+++ b/ubuntu/_base/applications/wlassistant/debian/wlassistant-trinity.menu
@@ -0,0 +1,10 @@
+?package(wlassistant-trinity):\
+        needs="X11"\
+        section="Applications/Network/Monitoring"\
+        hints="TDE"\
+        icon32x32="/opt/trinity/share/pixmaps/wlassistant.xpm"\
+        icon16x16="/opt/trinity/share/pixmaps/wlassistant-16.xpm"\
+        title="wlassistant"\
+        command="/opt/trinity/bin/tdesu -X -c /opt/trinity/bin/wlassistant"
+
+
diff --git a/ubuntu/_base/applications/wlassistant/debian/wlassistant.xpm b/ubuntu/_base/applications/wlassistant/debian/wlassistant.xpm
new file mode 100644
index 000000000..d1f52cbe8
--- /dev/null
+++ b/ubuntu/_base/applications/wlassistant/debian/wlassistant.xpm
@@ -0,0 +1,289 @@
+/* XPM */
+static char *wlassistant[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 251 2",
+"   c black",
+".  c #010000",
+"X  c #010101",
+"o  c #000200",
+"O  c #020000",
+"+  c #030000",
+"@  c #020202",
+"#  c gray1",
+"$  c #000401",
+"%  c #000601",
+"&  c #050000",
+"*  c #040404",
+"=  c gray2",
+"-  c #060606",
+";  c #070707",
+":  c #000C02",
+">  c #000E03",
+",  c #090000",
+"<  c #0A0000",
+"1  c gray3",
+"2  c #090909",
+"3  c gray4",
+"4  c #0B0B0B",
+"5  c #0C0C0C",
+"6  c gray5",
+"7  c #0E0E0E",
+"8  c gray6",
+"9  c #001003",
+"0  c #001404",
+"q  c #001604",
+"w  c #001805",
+"e  c #001A05",
+"r  c #001E06",
+"t  c #110000",
+"y  c #120000",
+"u  c #140000",
+"i  c #150000",
+"p  c #160000",
+"a  c #180000",
+"s  c #1B0000",
+"d  c #1C0000",
+"f  c #1E0000",
+"g  c #101010",
+"h  c #111111",
+"j  c gray7",
+"k  c #131313",
+"l  c gray8",
+"z  c #151515",
+"x  c #161616",
+"c  c gray9",
+"v  c #181818",
+"b  c #191919",
+"n  c gray10",
+"m  c #1B1B1B",
+"M  c gray11",
+"N  c #1D1D1D",
+"B  c #1E1E1E",
+"V  c gray12",
+"C  c #002006",
+"Z  c #002407",
+"A  c #002607",
+"S  c #003209",
+"D  c #00360A",
+"F  c #00380B",
+"G  c #2B0000",
+"H  c #2E0000",
+"J  c #320000",
+"K  c #202020",
+"L  c gray13",
+"P  c #222222",
+"I  c #232323",
+"U  c gray14",
+"Y  c #252525",
+"T  c gray15",
+"R  c #272727",
+"E  c #282828",
+"W  c gray16",
+"Q  c #2A2A2A",
+"!  c gray17",
+"~  c #2C2C2C",
+"^  c #2D2D2D",
+"/  c gray18",
+"(  c #2F2F2F",
+")  c gray19",
+"_  c #313131",
+"`  c #323232",
+"'  c gray20",
+"]  c #343434",
+"[  c #353535",
+"{  c gray21",
+"}  c #373737",
+"|  c gray22",
+" . c #393939",
+".. c #3A3A3A",
+"X. c gray23",
+"o. c #3C3C3C",
+"O. c gray24",
+"+. c #3E3E3E",
+"@. c #3F3F3F",
+"#. c #00420C",
+"$. c #00440D",
+"%. c #00460D",
+"&. c #00480E",
+"*. c #004C0E",
+"=. c #004E0F",
+"-. c #00500F",
+";. c #00520F",
+":. c #005410",
+">. c #005610",
+",. c #015711",
+"<. c #005811",
+"1. c #005A11",
+"2. c #005C11",
+"3. c #005E12",
+"4. c #006012",
+"5. c #006212",
+"6. c #026214",
+"7. c #006413",
+"8. c #006A14",
+"9. c #006C14",
+"0. c #006E15",
+"q. c #007015",
+"w. c #007416",
+"e. c #007616",
+"r. c #037318",
+"t. c #007817",
+"y. c #4E0000",
+"u. c #4F0000",
+"i. c #500000",
+"p. c #520000",
+"a. c #530000",
+"s. c #5A0000",
+"d. c #5B0000",
+"f. c #5E0000",
+"g. c #5F0000",
+"h. c #610000",
+"j. c #640000",
+"k. c gray25",
+"l. c #414141",
+"z. c gray26",
+"x. c #444444",
+"c. c gray27",
+"v. c #464646",
+"b. c #484848",
+"n. c #494949",
+"m. c gray29",
+"M. c #4C4C4C",
+"N. c gray30",
+"B. c #4E4E4E",
+"V. c gray31",
+"C. c #535353",
+"Z. c gray33",
+"A. c #555555",
+"S. c #565656",
+"D. c gray34",
+"F. c #585858",
+"G. c #5A5A5A",
+"H. c #5B5B5B",
+"J. c #5D5D5D",
+"K. c #5F5F5F",
+"L. c #606060",
+"P. c gray38",
+"I. c #626262",
+"U. c gray39",
+"Y. c #646464",
+"T. c #686868",
+"R. c DimGray",
+"E. c gray42",
+"W. c #6D6D6D",
+"Q. c gray43",
+"!. c #6F6F6F",
+"~. c gray44",
+"^. c #717171",
+"/. c #727272",
+"(. c gray45",
+"). c #797979",
+"_. c gray48",
+"`. c #7B7B7B",
+"'. c #7C7C7C",
+"]. c gray49",
+"[. c #7E7E7E",
+"{. c #008018",
+"}. c #008619",
+"|. c #00881A",
+" X c #008C1A",
+".X c #00941C",
+"XX c #00961C",
+"oX c #00981D",
+"OX c #009A1D",
+"+X c #009C1D",
+"@X c #009E1E",
+"#X c #008A20",
+"$X c #0B8722",
+"%X c #1C9C34",
+"&X c #00A01E",
+"*X c #00A21E",
+"=X c #00A41F",
+"-X c #00A820",
+";X c #00AA20",
+":X c #00AC20",
+">X c #00B422",
+",X c #00B622",
+"<X c #07B528",
+"1X c #00B823",
+"2X c #0FB92F",
+"3X c #2FA746",
+"4X c #2DAF46",
+"5X c #3EBA55",
+"6X c #00C024",
+"7X c #00C425",
+"8X c #01C526",
+"9X c #00CC26",
+"0X c #00D428",
+"qX c #00D829",
+"wX c #00DA29",
+"eX c #0ED433",
+"rX c #00E62B",
+"tX c #00EC2C",
+"yX c #00E436",
+"uX c #00F22E",
+"iX c #01F32F",
+"pX c #00F42E",
+"aX c #00FA2F",
+"sX c #00FC2F",
+"dX c #01FF31",
+"fX c #02FE3E",
+"gX c #16E43D",
+"hX c #11FF3E",
+"jX c #03FF44",
+"kX c #17F140",
+"lX c #17FF43",
+"zX c #1BFD46",
+"xX c #3AE45A",
+"cX c #25FF63",
+"vX c #35F16E",
+"bX c #45CD5E",
+"nX c #5BFB79",
+"mX c #47FB82",
+"MX c #66FE9C",
+"NX c #70FE8A",
+"BX c #74FE8E",
+"VX c #76FE8F",
+"CX c #78FE91",
+"ZX c #868686",
+"AX c gray53",
+"SX c #898989",
+"DX c gray56",
+"FX c #939393",
+"GX c gray59",
+"HX c #9B9B9B",
+"JX c None",
+/* pixels */
+"JXJXJXJXJXJXJXJXJXJX4 4 8 8 8 8 8 8 8 4 -   JXJXJXJXJXJXJXJXJXJX",
+"JXJXJXJXJXJXJXJX4 8 8 8 -           * * 8 8 8 - JXJXJXJXJXJXJXJX",
+"JXJXJXJXJXJX4 k k 4       4 k 8 8 JXJXk     4 k 8   JXJXJXJXJXJX",
+"JXJXJXJXJX8 k 8 *     n Q { k.O.X.| / { 8 JX    8 8 - JXJXJXJXJX",
+"JXJXJXJXk l 4     k X.X./ U n l k n U / X.' 8 JX  4 l - JXJXJXJX",
+"JXJXJXl l 4     / v.E 8                 8 U O.L JXJX4 l - JXJXJX",
+"JXJXl l 8     { O.k     V b.R.Y.K.J.X.l JX  k X.Q   JX8 k   JXJX",
+"JXJXl k     { X.1   l N.!.J.O.' ' O.D.R.l.8 JX- X./     l k   JX",
+"JXl n - - { l.4   L W.D.V             V A.K.l JX4 O.L   - n -   ",
+"JXn k   l N.k   L [.O.        JXJXJXJX    O.W.l JXk l.4 JXk k   ",
+"n V     v./   n /.O.    JXJXJXJXJXJXJXJXJX  l.K.- JX{ /   - n - ",
+"n n   V m.8   A.K.-   JXJXJXJXa.u.JXJXJXJXJX- J.O.  k v.- JXV 8 ",
+"V 8   ' X.  n [.V   JXJXJX<[email protected] JXJXJXJX/ W.8 JXO.L   k n ",
+"L - 8 m./   C.R.    JXJX<.#XvXcXdXwX0.: JXJXJX  /.U   ' '   4 V ",
+"L - l A.L   `.v.    JXJX7.yXMXmXaXrX&XS   JXJXJXW.O.  { X.  4 L ",
+"L - l A.n   `.X.  JXJXJXe.iXjXfXpXwX X$.  JXJXJX/.N.  { O.  4 U ",
+"U * k A.V   `.o.  JXJXJX2.0XiXtXwX;X0.D     JXJX`.N.  X.l.  4 U ",
+"U $ JXZ.L   /.N.  JXJXJXC |.6X1XOXq.<.0   JXJXJXZXO.  O.O.  4 Q ",
+"Q 4 JXN.]   m./.    JXJXJXA 4.0.4.;.r     JXJXJXSXU   O.X.  n U ",
+"Q 8   O.l.  n ZXU   JXJXJXJX*.e.0.D     JXJXJXDX`.8 k A.U   ' V ",
+"V L   k D.k JXC./.1 JXJXJXJX7.|.t.&.  JXJXJXGXFXv.  V K.-   ' k ",
+"4 / * JXN.O.  k U.k   JXJX6.e..X}.2.$   JXJX[.W.-   N.O.  l / - ",
+"JXU n   l K.v JX      JXJX>.}.;XXXq.:   JXJXJX    X.Y.8   / L   ",
+"JXk ) 1 JX{ H.8 JXJXJXJXJX:.OX1X=X{.w   JXJXJXJXv.K.Q   k { 8   ",
+"JXJXU U     X.l   JXJXJXJX>.2X7X>X.XA   JXJXJXJX/.X.  4 X.L     ",
+"JXJX1 ' V         JXJXJXJX6.xXeX6X:XS   JXJXJXJXJX    U / -   JX",
+"JXJXJX8 { v   JXJXJXJXJXJXr.nXgX9X6X$.  JXJXJXJXJXJXX.{ 4     JX",
+"JXJXJXJXl n   JXJXJXJXJXJX$XNXkXwX0X4.  JXJXJXJXJXJX/ k     JXJX",
+"JXJXJXJX      JXJXJXJXJX*.%XVXzXtXrX{.$   JXJXJXJXJX      JXJXJX",
+"JXJXJXJXJXJXJXJXJXJXJXJX;.4XVXlXaXpX@X:   JXJXJXJXJXJXJXJXJXJXJX",
+"JXJXJXJXJXJXJXJXJXJXJXJX;.bXCXhXdXdX7Xq   JXJXJXJXJXJXJXJXJXJXJX",
+"JXJXJXJXJXJXJXJXJXJXJXJX2.3X5X<X>X>X&XA   JXJXJXJXJXJXJXJXJXJXJX"
+};