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

[Mike Gabriel]

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

sunweaver pushed a commit to branch debian/squeeze/backports
in repository x2goclient.

commit 429c1472372b60c664d947673be536e2551ffbfe
Merge: 3d78ad4 5fccd7a
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Tue Mar 26 06:32:52 2013 +0100

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

 .gitignore                                         |    1 +
 debian/README.source                               |   45 +
 debian/changelog                                   |   54 +-
 debian/control                                     |   10 +-
 debian/copyright                                   |    2 +-
 debian/examples/x2goplugin.html                    |   47 +
 debian/icons/128x128/x2go.png                      |  Bin 0 -> 6085 bytes
 debian/icons/128x128/x2goclient.png                |  Bin 0 -> 19158 bytes
 debian/icons/128x128/x2gosession.png               |  Bin 0 -> 9324 bytes
 debian/icons/16x16/x2go.png                        |  Bin 0 -> 854 bytes
 debian/icons/16x16/x2goclient.png                  |  Bin 0 -> 949 bytes
 debian/icons/32x32/x2goclient.png                  |  Bin 0 -> 2675 bytes
 debian/icons/48x48/x2goclient.png                  |  Bin 0 -> 4817 bytes
 debian/icons/64x64/x2goclient.png                  |  Bin 0 -> 7095 bytes
 debian/icons/x2goclient.xpm                        |  280 +++
 debian/patches/001_hardening-x2goclient.patch      |    4 +-
 .../patches/004_allow-login-to-non-sh-users.patch  |   71 +
 debian/patches/005_xinerama-for-non-sh-users.patch |   23 +
 debian/patches/006_fix-x2goplugin.patch            |   51 +
 debian/patches/007_fix-desktop-file-version.patch  |   14 +
 debian/patches/series                              |    4 +
 debian/rules                                       |   13 +-
 debian/source/include-binaries                     |    8 +
 debian/svg/x2go-logo-colored.svg                   |  926 +++++++++
 debian/svg/x2go-logo-rotated.svg                   | 2021 ++++++++++++++++++++
 debian/svg/x2go-logo.svg                           |  341 ++++
 debian/svg/x2go-mascot.svg                         |  372 ++++
 debian/x2goclient.install                          |   14 +-
 debian/x2goplugin.examples                         |    1 +
 29 files changed, 4285 insertions(+), 17 deletions(-)

diff --cc debian/changelog
index 323e5a9,f0e571b..6d7a4be
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,54 +1,60 @@@
+ x2goclient (3.99.2.1-5) unstable; urgency=low
+ 
+   * /debian/rules:
+     + Undo replacing of /svg/x2gologo.svg. (Closes: #693710).
+ 
+  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Mon, 04 Mar 2013 06:03:26 +0100
+ 
+ x2goclient (3.99.2.1-4) unstable; urgency=low
+ 
+   * /debian/007_fix-desktop-file-version.patch:
+     - Add missing patch header.
+ 
+  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Sat, 19 Jan 2013 11:35:40 +0100
+ 
+ x2goclient (3.99.2.1-3) unstable; urgency=low
+ 
+   * /debian/README.source (new):
+     + Add information about upstream changelog.
+     + Add information about the icon update and replacement mechanism.
+   * Replace some faulty icons by icons from an icon update set provided by
+     upstream. This fixes bad icon visibility on desktops that use a dark theme.
+     (Closes: #693710).
+   * /debian/source/include-binaries (new):
+     + Explicitly allow to-be-updated-during-build PNG files in /debian folder.
+   * /debian/rules:
+     + Cleanup build cruft during clean: x2goclient_*.qm files.
+   * Add patch: 007_fix-desktop-file-version.patch. Wrong usage of field,
+     originally contains upstream version. Replacing that with the version
+     of the desktop file format in use (i.e. 1.0).
+ 
+  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Sat, 19 Jan 2013 11:06:05 +0100
+ 
+ x2goclient (3.99.2.1-2) unstable; urgency=low
+ 
+   * /debian/copyright:
+     + Set copyright format to v1.0.
+   * /debian/control:
+     + Orthographical and grammatical fixes in description texts.
+   * Fix patch: 001_hardening-x2goclient.patch, provide CPPFLAGS for
+     QMAKE_CFLAGS, as well. Provide CPPFLAGS first.
+   * Add patches: 004_allow-login-to-non-sh-users.patch and
+     005_xinerama-for-non-sh-users.patch. Fix x2goclient for users that use
+     a non-sh shell (e.g. like tcsh) on the X2Go Server. (Closes: #682839).
+   * Add patch: 006_fix-x2goplugin.patch. Fixes host name resolving when
+     client is run in X2Go Plugin mode.  Fixes session crashes directly
+     after session startup. Let the plugin tolerate whitespace at the beginning
+     of session profile configs. (Closes: #692555, #696524, #696529).
+   * Add example file: x2goplugin.html.
+ 
+  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Sat, 22 Dec 2012 21:36:55 +0100
+ 
 +x2goclient (3.99.2.1-1~bpo60+1) squeeze-backports; urgency=low
 +
 +  * Rebuild for squeeze-backports.
 +
 + -- Reinhard Tartler <siretart at tauware.de>  Wed, 04 Jul 2012 09:53:47 +0200
 +
  x2goclient (3.99.2.1-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