[debian-edu-commits] debian-edu/pkg-team/ 145/159: easy typo fix

[Dominik George]

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

natureshadow-guest pushed a commit to branch master
in repository xrdp.

commit 8bb340f461bc2534fd26e4748ea58a670b818b25
Author: mirabilos <tg at mirbsd.org>
Date:   Wed Sep 2 16:59:46 2015 +0200

    easy typo fix
---
 changelog               |  3 +-
 patches/misc-fixes.diff | 82 +++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 84 insertions(+), 1 deletion(-)

diff --git a/changelog b/changelog
index 30073c0..74b3725 100644
--- a/changelog
+++ b/changelog
@@ -5,8 +5,9 @@ xrdp (0.9.0~git20150902-1~beta1) teckids; urgency=high
   * Clean up a now-obsolete conffile from xrdp 0.6
   * Document the /tmp/.xrdp/ issue and precreate it from sysvinit script
   * Fix permissions to connect to xorgxrdp server from xrdp daemon
+  * Correct misspelling of “doesn’t”
 
- -- Thorsten Glaser <thorsten.glaser at teckids.org>  Wed, 02 Sep 2015 16:54:22 +0200
+ -- Thorsten Glaser <thorsten.glaser at teckids.org>  Wed, 02 Sep 2015 16:59:36 +0200
 
 xrdp (0.9.0~git20150901+dfsg-1~beta1) teckids; urgency=medium
 
diff --git a/patches/misc-fixes.diff b/patches/misc-fixes.diff
index 88b659f..9afcdf1 100644
--- a/patches/misc-fixes.diff
+++ b/patches/misc-fixes.diff
@@ -28,6 +28,17 @@
  
  .SH ENVIRONMENT
  .TP
+--- a/libxrdp/libxrdp.c
++++ b/libxrdp/libxrdp.c
+@@ -1074,7 +1074,7 @@ libxrdp_query_channel(struct xrdp_sessio
+ }
+ 
+ /*****************************************************************************/
+-/* returns a zero based index of the channel, -1 if error or it dosen't
++/* returns a zero based index of the channel, -1 if error or it doesn't
+    exist */
+ int EXPORT_CC
+ libxrdp_get_channel_id(struct xrdp_session *session, char *name)
 --- a/libxrdp/xrdp_mcs.c
 +++ b/libxrdp/xrdp_mcs.c
 @@ -183,7 +183,7 @@ xrdp_mcs_recv(struct xrdp_mcs *self, str
@@ -39,6 +50,17 @@
          }
  
          break;
+--- a/rdp/rdp_orders.c
++++ b/rdp/rdp_orders.c
+@@ -1435,7 +1435,7 @@ rdp_orders_process_orders(struct rdp_ord
+ }
+ 
+ /*****************************************************************************/
+-/* returns pointer, it might return bmpdata if the data dosen't need to
++/* returns pointer, it might return bmpdata if the data doesn't need to
+    be converted, else it mallocs it.  The calling function must free
+    it if needed */
+ char *APP_CC
 --- a/sesman/chansrv/chansrv_fuse.c
 +++ b/sesman/chansrv/chansrv_fuse.c
 @@ -60,6 +60,9 @@ char g_fuse_clipboard_path[256] = ""; /*
@@ -112,6 +134,55 @@
                  }
  
                  log_message(LOG_LEVEL_DEBUG, "aborting connection...");
+--- a/xorg/X11R7.6/rdp/rdpPolyFillRect.c
++++ b/xorg/X11R7.6/rdp/rdpPolyFillRect.c
+@@ -188,7 +188,7 @@ rdpPolyFillRect(DrawablePtr pDrawable, G
+                      pGC->alu == GXnoop ||
+                      pGC->alu == GXand ||
+                      pGC->alu == GXcopy /*||
+-                     pGC->alu == GXxor*/)) /* todo, why dosen't xor work? */
++                     pGC->alu == GXxor*/)) /* todo, why doesn't xor work? */
+             {
+                 draw_item_add_fill_region(pDirtyPriv, fill_reg, pGC->fgPixel,
+                                           pGC->alu);
+@@ -210,7 +210,7 @@ rdpPolyFillRect(DrawablePtr pDrawable, G
+                      pGC->alu == GXnoop ||
+                      pGC->alu == GXand ||
+                      pGC->alu == GXcopy /*||
+-                     pGC->alu == GXxor*/)) /* todo, why dosen't xor work? */
++                     pGC->alu == GXxor*/)) /* todo, why doesn't xor work? */
+             {
+                 rdpup_set_fgcolor(pGC->fgPixel);
+                 rdpup_set_opcode(pGC->alu);
+@@ -253,7 +253,7 @@ rdpPolyFillRect(DrawablePtr pDrawable, G
+                          pGC->alu == GXnoop ||
+                          pGC->alu == GXand ||
+                          pGC->alu == GXcopy /*||
+-                         pGC->alu == GXxor*/)) /* todo, why dosen't xor work? */
++                         pGC->alu == GXxor*/)) /* todo, why doesn't xor work? */
+                 {
+                     LLOGLN(10, ("rdpPolyFillRect: 3"));
+                     draw_item_add_fill_region(pDirtyPriv, &clip_reg,
+@@ -280,7 +280,7 @@ rdpPolyFillRect(DrawablePtr pDrawable, G
+                          pGC->alu == GXnoop ||
+                          pGC->alu == GXand ||
+                          pGC->alu == GXcopy /*||
+-                         pGC->alu == GXxor*/)) /* todo, why dosen't xor work? */
++                         pGC->alu == GXxor*/)) /* todo, why doesn't xor work? */
+                 {
+                     rdpup_set_fgcolor(pGC->fgPixel);
+                     rdpup_set_opcode(pGC->alu);
+--- a/xorg/X11R7.6/rdp/rdpmain.c
++++ b/xorg/X11R7.6/rdp/rdpmain.c
+@@ -590,7 +590,7 @@ rdpScreenInit(int index, ScreenPtr pScre
+ /******************************************************************************/
+ /* this is the first function called, it can be called many times
+    returns the number or parameters processed
+-   if it dosen't apply to the rdp part, return 0 */
++   if it doesn't apply to the rdp part, return 0 */
+ int
+ ddxProcessArgument(int argc, char **argv, int i)
+ {
 --- a/xorgxrdp/configure.ac
 +++ b/xorgxrdp/configure.ac
 @@ -9,7 +9,7 @@ AC_PROG_CC
@@ -173,6 +244,17 @@
              memset(&set, 0, sizeof(set));
              set.rules = "base";
              set.model = "pc104";
+--- a/xrdp/lang.c
++++ b/xrdp/lang.c
+@@ -267,7 +267,7 @@ get_keymaps(int keylayout, struct xrdp_k
+             if (g_memcmp(lkeymap, keymap, sizeof(struct xrdp_keymap)) != 0)
+             {
+                 log_message(LOG_LEVEL_WARNING,
+-                            "local keymap file for 0x%4.4x found and dosen't match "
++                            "local keymap file for 0x%4.4x found and doesn't match "
+                             "built in keymap, using local keymap file", keylayout);
+             }
+ 
 --- a/xrdp/xrdp.h
 +++ b/xrdp/xrdp.h
 @@ -381,6 +381,8 @@ int APP_CC

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/pkg-team/xrdp.git