4 files changed, 16 insertions, 20 deletions
diff --git a/debian/changelog b/debian/changelog
index 680a3a0..d948eca 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,20 +1,14 @@
-remote-login-service (1.0.0-0ubuntu3+x2go2~0ubuntu14.04.1) trusty; urgency=medium
+remote-login-service-x2go (1.0.0-0x2go1) UNRELEASED; urgency=medium
 
+  * Add SERVER_NAME env var support.
+  * Add X2Go support to RLS.
+  * Provide via ppa:x2go/ppa and ppa:x2go/stable on Launchpad.
   * debian/rules:
     + Build using dh_autoreconf.
   * debian/control:
     + Add B-Ds: dh-autoreconf, libgtest-dev, python. Enable the testsuite at build
       time.
 
- -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de>  Mon, 03 Nov 2014 12:08:02 +0100
-
-remote-login-service (1.0.0-0ubuntu3+x2go1~0ubuntu14.04.1) trusty; urgency=medium
-
-  * Non-maintainer upload.
-  * Add SERVER_NAME env var support.
-  * Add X2Go support to RLS.
-  * Provide via ppa:x2go/ppa and ppa:x2go/stable on Launchpad.
-
  -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de>  Sun, 02 Nov 2014 21:36:41 +0100
 
 remote-login-service (1.0.0-0ubuntu3) raring; urgency=low
diff --git a/debian/control b/debian/control
index 570356a..d80a14b 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,7 @@
-Source: remote-login-service
+Source: remote-login-service-x2go
 Section: misc
 Priority: extra
-Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+Maintainer: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
 Build-Depends: dbus-test-runner,
                debhelper (>= 9),
                intltool (>= 0.35.0), 
@@ -17,13 +17,16 @@ Build-Depends: dbus-test-runner,
                python,
                python3,
 Standards-Version: 3.9.3
-Homepage: http://launchpad.net/remote-login-service/
-Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/remote-login-service/trunk
+Homepage: http://www.x2go.org
+Vcs-Git: git://code.x2go.org/remote-login-service-x2go.git
+Vcs-Browser: http://code.x2go.org/gitweb?p=remote-login-service-x2go.git;a=summary
 
-Package: remote-login-service
+Package: remote-login-service-x2go
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
+Breaks: remote-login-service
+Replaces: remote-login-service
 Recommends: thin-client-config-agent
 Description: Service to track the remote servers to use
  A small service to take the various sources for the remote
diff --git a/debian/copyright b/debian/copyright
index 8fb575a..bc03453 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,13 +1,15 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: remote-login-service
-Source: http://launchpad.net/remote-login-service
+Upstream-Name: remote-login-service-x2go
+Source: http://code.x2go.org/gitweb?p=remote-login-service.with-x2go.git;a=summary
 
 Files: *
 Copyright: 2012, Canonical Ltd.
+           2012-2014, Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
 License: GPL-3
 
 Files: debian/*
 Copyright: 2012, Canonical Ltd.
+           2012-2014, Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
 License: GPL-3
 
 License: GPL-3
@@ -25,4 +27,3 @@ License: GPL-3
  .
  On Debian systems, the complete text of the GNU General
  Public License version 3 can be found in "/usr/share/common-licenses/GPL-3".
-
diff --git a/debian/watch b/debian/watch
deleted file mode 100644
index 6adcdd7..0000000
--- a/debian/watch
+++ /dev/null
@@ -1,2 +0,0 @@
-version=3
-http://launchpad.net/remote-login-service/+download .*/remote-login-service-(.+)\.tar\.gz