[Pkg-remote-commits] [x2goclient] 02/03: Merge tag 'debian/3.99.2.1-1' into squeeze-backports

[Mike Gabriel]

This is an automated email from the git hooks/post-receive script.

sunweaver pushed a commit to annotated tag debian/3.99.2.1-1_bpo60+1
in repository x2goclient.

commit b41914dd3991c9ea5db30636e42f8d1ebc329e64
Merge: 68a5f6e 09bc458
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed Jul 4 09:47:28 2012 +0200

    Merge tag 'debian/3.99.2.1-1' into squeeze-backports
    
    Debian release 3.99.2.1-1
    
    Conflicts:
    	debian/changelog

 Makefile                                           |    8 +-
 VERSION                                            |    2 +-
 debian/changelog                                   |   22 +-
 debian/copyright                                   |   25 +-
 debian/patches/001_hardening-x2goclient.patch      |   19 +
 .../002_remove-encoding-from-desktop-entry.patch   |   10 +
 .../003_fix-spelling-error-authentication.patch    |  181 +
 debian/patches/series                              |    3 +
 debian/rules                                       |    5 +
 debian/upstream/changelog                          |   80 +-
 debian/watch                                       |    2 +-
 debian/x2goclient.docs                             |    2 -
 debian/x2goplugin.docs                             |    1 +
 desktop/x2goclient.desktop                         |    2 +-
 icons/128x128/unity.png                            |  Bin 0 -> 17622 bytes
 icons/16x16/unity.png                              |  Bin 0 -> 1410 bytes
 icons/32x32/unity.png                              |  Bin 0 -> 2984 bytes
 icons/64x64/unity.png                              |  Bin 0 -> 7241 bytes
 onmainwindow.cpp                                   | 8090 +++++++++++++++++++-
 onmainwindow.h                                     |    3 +
 onmainwindow_part2.cpp                             | 2577 -------
 onmainwindow_part3.cpp                             | 2510 ------
 onmainwindow_part4.cpp                             | 2861 -------
 onmainwindow_privat.h                              |    1 +
 resources.rcc                                      |    1 +
 sessionbutton.cpp                                  |   16 +
 sessionbutton.h                                    |    2 +-
 sessionwidget.cpp                                  |    6 +
 sessionwidget.h                                    |    2 +-
 sshmasterconnection.cpp                            |   19 +-
 svg/unity.svg                                      |    8 +
 version.h                                          |    3 +-
 x2goclient.pro                                     |   34 +-
 x2goclient_de.ts                                   |   73 +-
 x2goclient_nb_no.ts                                |  741 +-
 x2goclient_sv.ts                                   |   65 +-
 x2goplugin.rc                                      |   10 +-
 37 files changed, 8939 insertions(+), 8445 deletions(-)

diff --cc debian/changelog
index de6f708,e590b75..dfbbc7f
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,23 +1,29 @@@
- x2goclient (3.99.2.0-1~bpo60+1) squeeze-backports; urgency=low
++x2goclient (3.99.2.1-1~bpo60+1) squeeze-backports; urgency=low
 +
 +  * Rebuild for squeeze-backports.
 +
 + -- Reinhard Tartler <siretart at tauware.de>  Tue, 08 May 2012 21:02:15 +0200
 +
+ x2goclient (3.99.2.1-1) unstable; urgency=low
+ 
+   * New upstream release.
+   * Adapt watch file rule to upstream tarball naming scheme changes.
+   * Use dpkg-buildflags to harden x2goclient and libx2goplugin.so.
+   * Add patch: 001_hardening-x2goclient.patch, make upstream Makefile
+     draw in QMAKE_* variables for build flags.
+   * Add patch: 002_remove-encoding-from-desktop-entry.patch, encoding keys in
+     .desktop files have become deprecated (FreeDesktop.org).
+   * Add patch: 003_fix-spelling-error-authentication.patch, fix the spelling
+     of the word authentication.
+   * Also add upstream changelog to bin:package x2goplugin.
+   * Do not ship html version of man page anymore
+   * Drop AUTHORS file from x2goclient's doc folder.
+   * Drop AUTHORS file from x2goplugin's doc folder.
+   * Update /debian/copyright: fix licensing years, add license for
+     Makefile.docupload.
+ 
+  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Sat, 09 Jun 2012 14:43:31 +0200
+ 
  x2goclient (3.99.2.0-1) unstable; urgency=low
  
    * New upstream release.

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-remote/x2goclient.git