diff -Nru x2godesktopsharing-3.0.1.4/debian/bzr-builder.manifest x2godesktopsharing-3.0.1.5/debian/bzr-builder.manifest --- x2godesktopsharing-3.0.1.4/debian/bzr-builder.manifest 2011-11-25 12:57:09.000000000 +0000 +++ x2godesktopsharing-3.0.1.5/debian/bzr-builder.manifest 2012-02-23 03:40:40.000000000 +0000 @@ -1,2 +1,2 @@ -# bzr-builder format 0.3 deb-version {debupstream}-0~67 -lp:~x2go/x2go/x2godesktopsharing-trunk revid:git-v1:a690be5601d3c174e75cfd969b6f5c7486644c60 +# bzr-builder format 0.3 deb-version {debupstream}-0~69 +lp:~x2go/x2go/x2godesktopsharing_master revid:git-v1:3faf29061e1775e6a0fb5d68fa66e5d804d4e393 diff -Nru x2godesktopsharing-3.0.1.4/debian/changelog x2godesktopsharing-3.0.1.5/debian/changelog --- x2godesktopsharing-3.0.1.4/debian/changelog 2011-11-25 12:57:09.000000000 +0000 +++ x2godesktopsharing-3.0.1.5/debian/changelog 2012-02-23 03:40:40.000000000 +0000 @@ -1,10 +1,16 @@ -x2godesktopsharing (3.0.1.4-0~67~natty1) UNRELEASED; urgency=low +x2godesktopsharing (3.0.1.5-0~69~natty1) natty; urgency=low * Auto build. - -- x2go Fri, 25 Nov 2011 12:57:09 +0000 + -- x2go Thu, 23 Feb 2012 03:40:40 +0000 -x2godesktopsharing (3.0.1.4-0~x2go1) UNRELEASED; urgency=low +x2godesktopsharing (3.0.1.5-0~x2go1) UNRELEASED; urgency=low + + * Continue development... + + -- Mike Gabriel Wed, 22 Feb 2012 15:13:53 +0100 + +x2godesktopsharing (3.0.1.4-0~x2go1) unstable; urgency=low * New upstream version (3.0.1.4): - Always use /tmp for lock and session sharing socket @@ -12,7 +18,7 @@ - Pass username of user who requests desktop sharing to x2gostartagent. * Depend on x2goserver (>=3.0.99.9). - -- Mike Gabriel Fri, 25 Nov 2011 11:42:04 +0100 + -- Mike Gabriel Wed, 22 Feb 2012 15:00:54 +0100 x2godesktopsharing (3.0.1.3-0~x2go1) unstable; urgency=low diff -Nru x2godesktopsharing-3.0.1.4/sharetray.cpp x2godesktopsharing-3.0.1.5/sharetray.cpp --- x2godesktopsharing-3.0.1.4/sharetray.cpp 2011-11-25 12:57:09.000000000 +0000 +++ x2godesktopsharing-3.0.1.5/sharetray.cpp 2012-02-23 03:40:40.000000000 +0000 @@ -35,7 +35,7 @@ #include #define STAT_ACT_COUNT 10 -#define VERSION "3.0.1.4" +#define VERSION "3.0.1.5" //needed to not get an undefined reference to static members int ShareTray::sigkeybintFd[2]; diff -Nru x2godesktopsharing-3.0.1.4/VERSION.x2godesktopsharing x2godesktopsharing-3.0.1.5/VERSION.x2godesktopsharing --- x2godesktopsharing-3.0.1.4/VERSION.x2godesktopsharing 2011-11-25 12:57:09.000000000 +0000 +++ x2godesktopsharing-3.0.1.5/VERSION.x2godesktopsharing 2012-02-23 03:40:40.000000000 +0000 @@ -1 +1 @@ -3.0.1.4 +3.0.1.5