Merge lp:~virtualbricks/virtualbrick/virtualbricks-0.5 into lp:virtualbrick/0.x

[Francesco Apollonio]

now the installation procedure is fully compatible with debian packets.

=== added directory 'debian'
=== renamed directory 'debian' => 'debian.moved'
=== added file 'debian/changelog'
--- debian/changelog	1970-01-01 00:00:00 +0000
+++ debian/changelog	2012-01-13 20:33:24 +0000
@@ -0,0 +1,73 @@
+virtualbricks (0.5-5) unstable; urgency=low
+
+  * Renamed the package; after the decision of the VNM project team
+    (http://sourceforge.net/projects/virtualnetmgr/) and the qemulator
+    developer to merge the projects, the project now is called
+    virtualbricks.
+  * Fixed all the files involved in the renaming.
+  * Switch to dpkg-source 3.0 (quilt) format.
+  * debian/control: changed the email of the maintainer field. 
+  * debian/control: bumped standards version to 3.9.2. 
+  * debian/control: added a qemulator dummy bin transition package.
+  * debian/copyright: updated the copyright information.
+  * added virtualbricks.install.
+  * fixed watch file.
+  * Made the transition to dh_python2. (Closes: #617047)
+  * debian/control: removed build-dep on patchutils. 
+  * debian/control: changed suggess from python-gnome2-extras to
+    python-eggtrayicon (thanks to Bilal Akhtar <[e-mail]>)
+  * Fixed typos. (Closes: #594581, 546152) 
+  * added debian/copyright_hints. 
+
+ -- Francesco Namuri <[e-mail]>  Sun, 08 Jan 2012 13:06:24 +0100
+
+qemulator (0.5-3.2) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Replace the libmagickcore2-extra build-dependency with the new
+    libmagickcore-extra virtual package.  (Closes: #573973)
+
+ -- Adam D. Barratt <[e-mail]>  Fri, 19 Mar 2010 18:28:15 +0000
+
+qemulator (0.5-3.1) unstable; urgency=low
+
+  * Non-maintainer upload
+  * Add libmagickcore2-extra as build-depends since imagemagick has
+    reorganised the plugin packages (thanks to Stuart Prescott)
+    (Closes: #560604)
+
+ -- Steffen Joeris <[e-mail]>  Wed, 23 Dec 2009 22:19:35 +0100
+
+qemulator (0.5-3) unstable; urgency=low
+
+  * debian/patches/fix_python_dir.patch: fixed to avoid patching of
+    usr/bin/qemulator symlink. (Closes: #442717)
+  * debian/copyright: fixed email of author.
+  * debian/menu: updated to fit to new debian menu structure.
+
+ -- Francesco Namuri <[e-mail]>  Sun, 16 Sep 2007 21:23:56 +0200
+
+qemulator (0.5-2) unstable; urgency=low
+
+  * debian/rules: added rules to fit to the debian python policy.
+  * debian/copyright: fixed some typos.
+  * debian/docs: removed "README".
+  * debian/control: made some changes to fit to the debian python policy.
+  * debian/control: added dependency on python-glade2. (Closes: #434542)
+  * Added debian/watch.
+  * Moved arch-indep python files to /usr/share/qemulator.
+  * Added debian/patches/fix_python_dir.patch to fix calls to old python
+    directory, see previous entry.
+  * Include debian/links to generate the link from
+    /usr/share/qemulator/qemulator.py to /usr/bin/qemulator
+
+ -- Francesco Namuri <[e-mail]>  Sun, 29 Jul 2007 16:47:00 +0200
+
+qemulator (0.5-1) unstable; urgency=low
+
+  * Initial release. (Closes: #429818: ITP: qemulator -- it's a free
+    solution for easy setup and management of qemu - Debian Bug report
+    logs)
+
+ -- Francesco Namuri <[e-mail]>  Wed, 20 Jun 2007 16:11:22 +0200
+

=== added file 'debian/compat'
--- debian/compat	1970-01-01 00:00:00 +0000
+++ debian/compat	2012-01-13 20:33:24 +0000
@@ -0,0 +1,1 @@
+5

=== added file 'debian/control'
--- debian/control	1970-01-01 00:00:00 +0000
+++ debian/control	2012-01-13 20:33:24 +0000
@@ -0,0 +1,30 @@
+Source: virtualbricks
+Section: otherosfs
+Priority: extra
+Maintainer: Francesco Namuri <[e-mail]>
+X-Python-Version: >= 2.4
+Build-Depends: cdbs (>=0.4.90~), debhelper (>= 5.0.38), imagemagick,  libmagickcore-extra, python (>= 2.6.6-3~)
+Standards-Version: 3.9.2
+
+Package: virtualbricks
+Architecture: all
+Depends: ${misc:Depends}, ${python:Depends}, python-gtk2, python-glade2, libglade2-0, python-pygraphviz, python-imaging, vde2
+Recommends: qemu, gksu, vde2-cryptcab
+Suggests: python-eggtrayicon, kvm-qemu
+Homepage: http://virtualbricks.eu/
+Provides: qemulator
+Replaces: qemulator (<< 0.5-4)
+Breaks: qemulator (<< 0.5-4)
+Description: is a Virtualization suite for qemu/kvm VMs and vde2 networks
+ Virtualbricks is a fully featured virtualization suite and a complete GUI to
+ manage Qemu/KVM and Virtual Distributed Ethernet. It provides easy but
+ detailed device configuration interface, programmable control of the running
+ processes and a graphical interactive view of the virtual network topology.
+
+Package: qemulator
+Depends: virtualbricks, ${misc:Depends}
+Architecture: all
+Section: oldlibs
+Description: transitional dummy package to virtualbriks
+ This is a transitional package to virtualbricks, and can be safely removed
+ after the installation is complete.

=== added file 'debian/copyright'
--- debian/copyright	1970-01-01 00:00:00 +0000
+++ debian/copyright	2012-01-13 20:33:24 +0000
@@ -0,0 +1,35 @@
+This package was debianized by Francesco Namuri <[e-mail]> on
+Wed, 20 Jun 2007 15:54:55 +0200.
+
+It was downloaded from http://qemulator.createweb.de/
+
+Upstream Author: 
+
+    Rainer Haage <[e-mail]>
+
+Copyright: 
+
+    Copyright © 2006 Raineer Haage
+    Copyright © 2011 Carlo Caini, Daniele Lacamera, Francesco Apollonio,
+                     Pierre-Louis Bonicoli, Simone Abbati
+
+License:
+
+    This package is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, version 2.
+ 
+    This package 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 package; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+
+On Debian systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL-2'.
+
+The Debian packaging is © 2011, Francesco Namuri <[e-mail]> and
+is licensed under the GPL, see above.

=== added file 'debian/copyright_hints'
=== added file 'debian/dirs'
--- debian/dirs	1970-01-01 00:00:00 +0000
+++ debian/dirs	2012-01-13 20:33:24 +0000
@@ -0,0 +1,1 @@
+usr/bin

=== added file 'debian/menu'
--- debian/menu	1970-01-01 00:00:00 +0000
+++ debian/menu	2012-01-13 20:33:24 +0000
@@ -0,0 +1,6 @@
+?package(virtualbricks):needs="X11"\
+	section="Applications/Emulators"\
+	title="Virtualbricks"\
+	longtitle="a solution for easy setup and management of qemu"\
+	icon="virtualbricks.xpm"\
+	command="/usr/bin/virtualbricks"

=== added file 'debian/rules'
--- debian/rules	1970-01-01 00:00:00 +0000
+++ debian/rules	2012-01-13 20:33:24 +0000
@@ -0,0 +1,13 @@
+#!/usr/bin/make -f
+
+DEB_PYTHON2_MODULE_PACKAGES = virtualbricks
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/utils.mk
+include /usr/share/cdbs/1/class/python-distutils.mk
+
+DEB_INSTALL_MANPAGES_virtualbricks = debian/virtualbricks.1
+
+install/virtualbricks::
+	mkdir -p debian/virtualbricks/usr/share/pixmaps/
+	cp share/vb_32x32.xpm debian/virtualbricks/usr/share/pixmaps/virtualbricks.xpm

=== added directory 'debian/source'
=== added file 'debian/source/format'
--- debian/source/format	1970-01-01 00:00:00 +0000
+++ debian/source/format	2012-01-13 20:33:24 +0000
@@ -0,0 +1,1 @@
+3.0 (quilt)

=== added file 'debian/stamp-patched'
=== added file 'debian/virtualbricks.1'
--- debian/virtualbricks.1	1970-01-01 00:00:00 +0000
+++ debian/virtualbricks.1	2012-01-13 20:33:24 +0000
@@ -0,0 +1,50 @@
+.\"Created with GNOME Manpages Editor Wizard
+.\"http://sourceforge.net/projects/gmanedit2
+.TH virtualbricks 1 "December 4, 2011" "" ""
+
+.SH NAME
+virtualbricks \- an all in one virtualisation solution
+
+.SH SYNOPSIS
+.B virtualbricks
+.RI [ options ]
+.br
+
+.SH DESCRIPTION
+.B virtualbricks
+Virtualization suite for qemu/kvm virtual machines and vde2 networks
+
+.PP
+\fBvirtualbricks\fP is a fully featured virtualization suite and a complete GUI to manage
+Qemu/KVM and Virtual Distributed Ethernet. It provides easy but detailed device 
+configuration interface, programmable control of the running processes and a 
+graphical interactive view of the virtual network topology.
+
+.SH OPTIONS
+.B
+.IP -nogui
+starts 
+.B virtualbricks
+in no GUI mode, only the command line interpreter.
+
+.B
+.IP -server
+starts 
+.B virtualbricks
+in server mode. Require root privileges.
+
+.B
+.IP -noterm
+starts 
+.B virtualbricks
+in GUI only mode, no command line.
+
+.SH "SEE ALSO"
+.BR qemu (1).
+
+.SH "AUTHOR"
+virtualbricks was written by Daniele Lacamera <[e-mail]>, Francesco Apollonio <[e-mail]> and others. From an idea by Carlo Caini. The codebase is inherited from Qemulator by Rainer Haage <qemulator\[e-mail]>. See "copyright".
+
+.PP
+This manual page was written by Francesco Namuri <[e-mail]>,
+for the Debian project (but may be used by others).

=== added file 'debian/virtualbricks.install'
--- debian/virtualbricks.install	1970-01-01 00:00:00 +0000
+++ debian/virtualbricks.install	2012-01-13 20:33:24 +0000
@@ -0,0 +1,1 @@
+debian/tmp/usr/

=== added file 'debian/watch'
--- debian/watch	1970-01-01 00:00:00 +0000
+++ debian/watch	2012-01-13 20:33:24 +0000
@@ -0,0 +1,4 @@
+version=3
+
+http://qemulator.createweb.de/plugins/downloads/ \
+dodownload.php\?file=Qemulator-(.*)\.tar\.gz

=== modified file 'setup.py'
--- setup.py	2012-01-10 20:39:30 +0000
+++ setup.py	2012-01-13 20:33:24 +0000
@@ -19,7 +19,12 @@
 Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 """
 
+<<<<<<< TREE
 CURRENT_VERSION="1.0"
+=======
+CURRENT_VERSION="0.6"
+CURRENT_MICRO_VERSION="350"
+>>>>>>> MERGE-SOURCE
 SUPPORTED_LANGS = ['it','nl','fr','de','es']
 
 from distutils.core import setup
@@ -34,15 +39,27 @@
 
 
 glade = open('share/virtualbricks.template.glade','r').read()
-micro = open('.bzr/branch/last-revision','r').read().split(' ')[0]
+try:
+	micro = open('.bzr/branch/last-revision','r').read().split(' ')[0]
+except:
+	micro = CURRENT_MICRO_VERSION
+
 if micro == '':
-	micro = '000'
+	micro = CURRENT_MICRO_VERSION
 
 virtualbricks_version=CURRENT_VERSION+'.'+micro
 
-open('/tmp/virtualbricks.glade.step1','w+').write(re.sub('___VERSION___', virtualbricks_version, glade))
-glade = open('/tmp/virtualbricks.glade.step1','r').read()
-open('share/virtualbricks.glade','w+').write(re.sub('__IMAGES_PATH__', sys.prefix + '/share', glade))
+<<<<<<< TREE
+open('/tmp/virtualbricks.glade.step1','w+').write(re.sub('___VERSION___', virtualbricks_version, glade))
+glade = open('/tmp/virtualbricks.glade.step1','r').read()
+open('share/virtualbricks.glade','w+').write(re.sub('__IMAGES_PATH__', sys.prefix + '/share', glade))
+=======
+print "Setup Virtualbricks " + virtualbricks_version
+
+open('/tmp/virtualbricks.glade.step1','w+').write(re.sub('___VERSION___', virtualbricks_version, glade))
+glade = open('/tmp/virtualbricks.glade.step1','r').read()
+open('share/virtualbricks.glade','w+').write(re.sub('__IMAGES_PATH__', sys.prefix + '/share', glade))
+>>>>>>> MERGE-SOURCE
 
 
 
@@ -85,6 +102,7 @@
 	package_dir = {'': '.'}
 	)
 
+print "Cleaning..",
 #Remove compiled l10n files
 for d in tempdirs:
 	try:
@@ -95,3 +113,10 @@
 	except:
 		print "Not critical error while removing: %s(.virtualbricks.mo)" %d
 		continue
+
+#Remove .glade file created in setup process
+try:
+	os.unlink('share/virtualbricks.glade')
+	print "Done"
+except:
+	print "Not critical error while removing glade file"

=== added file 'share/vb_32x32.xpm'
--- share/vb_32x32.xpm	1970-01-01 00:00:00 +0000
+++ share/vb_32x32.xpm	2012-01-13 20:33:24 +0000
@@ -0,0 +1,87 @@
+/* XPM */
+static char * vb_32x32_xpm[] = {
+"32 32 52 1",
+" 	c None",
+".	c #CB4343",
+"+	c #CA4343",
+"@	c #CB4444",
+"#	c #CB4848",
+"$	c #CB4747",
+"%	c #C1CCCC",
+"&	c #C1CBCB",
+"*	c #CA5252",
+"=	c #C95A5A",
+"-	c #C96060",
+";	c #CA5151",
+">	c #CA4A4A",
+",	c #C94D4D",
+"'	c #C95959",
+")	c #C77373",
+"!	c #C96363",
+"~	c #CA4C4C",
+"{	c #CA4545",
+"]	c #CA4444",
+"^	c #CA4E4E",
+"/	c #CA5454",
+"(	c #C95252",
+"_	c #CA5050",
+":	c #CA4D4D",
+"<	c #CA5353",
+"[	c #CB4242",
+"}	c #C95151",
+"|	c #CA4F4F",
+"1	c #CA4747",
+"2	c #C95858",
+"3	c #CB4646",
+"4	c #CA4646",
+"5	c #CA4848",
+"6	c #C95656",
+"7	c #CB4545",
+"8	c #CA5555",
+"9	c #CA5656",
+"0	c #C95555",
+"a	c #CA4B4B",
+"b	c #C95F5F",
+"c	c #CB4141",
+"d	c #C95454",
+"e	c #CB4040",
+"f	c #CA5757",
+"g	c #CA5959",
+"h	c #C95B5B",
+"i	c #C95C5C",
+"j	c #CA5858",
+"k	c #C86666",
+"l	c #C96161",
+"m	c #CA4949",
+"                                ",
+"                                ",
+"                     .+.....+.  ",
+"                     .@@@@@@@@  ",
+"                      +@@@@@++  ",
+"   @@@@@@+@                     ",
+"   .+....++                     ",
+"   ###$$###            %&       ",
+"   ***=-;*;         >,'))!=~    ",
+"   {{]^/+{]         ]].(_.{]    ",
+"   ...:<[..         ..[}|[..    ",
+"   11$;2311         4536/7].    ",
+"   /88//88<       .{_98/8;      ",
+"   [[[[[[[[       ]..[[[[.      ",
+"   ...[[...       .[.....@      ",
+"   ^|^*0^|^       |0^^|a]       ",
+"   ^|^2b:|:     .]<-:^|~        ",
+"   ..[~*c..     +.1/c...        ",
+"   [[c~de[[     [[#8e.].        ",
+"   fgghiggf   +7gghij<          ",
+"   {{{{{{{{  @.@{{{{{]          ",
+"   @.......  .......]]          ",
+"   {{{44{{4  {{{{{{]..          ",
+"   9jf-k9fl~[~fjjjf^            ",
+"   [[ca*ee/>..[[[[[.            ",
+"   @+.:<cc/m[[..@++@            ",
+"   @@[;'^^'<|_~]@@+             ",
+"       :::^^:^~                 ",
+"       ........                 ",
+"       +@@@@@@@                 ",
+"                                ",
+"                                "};

=== renamed file 'share/vb_32x32.xpm' => 'share/vb_32x32.xpm.moved'
=== modified file 'share/virtualbricks.desktop'
--- share/virtualbricks.desktop	2011-11-27 20:55:46 +0000
+++ share/virtualbricks.desktop	2012-01-13 20:33:24 +0000
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Version=0.4
+Version=0.5
 Name=Virtualbricks
 Comment=Manage your virtual network and virtual machines
 Exec=virtualbricks