Merge branch 'debian' of ssh://ray.cslab.ece.ntua.gr/repos/archip into debian

Conflicts:
	debian/control

diff --cc debian/control
index 06c8597,bccbf55..51bfad4
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -27,12 -20,6 +27,10 @@@ Depends: ${misc:Depends}, ${python:Depe
  Description:  Provides archipelago infrastructure
   Extended Description here
  
 +Package: archipelago-dbg
 +Architecture: amd64
 +Depends: ${misc:Depends}, archipelago(=${binary:Version})
- Description:  Provides archipelago infrastructure
-  Extended Description here
 +
  Package: archipelago-ganeti
  Architecture: any
  Depends: ${misc:Depends}, ${python:Depends}, archipelago(=${binary:Version})