[Pkg-xfce-commits] r2400 - in desktop/trunk/exo/debian: . patches

[ncommander-guest at alioth.debian.org]

Author: ncommander-guest
Date: 2008-10-16 06:10:10 +0000 (Thu, 16 Oct 2008)
New Revision: 2400

Added:
   desktop/trunk/exo/debian/patches/04_fix_broken_regexp.patch
Modified:
   desktop/trunk/exo/debian/changelog
   desktop/trunk/exo/debian/control
   desktop/trunk/exo/debian/patches/series
Log:
* Merged exo patches from Ubuntu
* debian/patches:
  - 04_fix_broken_regex.patch added, adds ^ and $ to url expressions to prevent exo 
    from mistaking a directory as an e-mail address and opening the 
    wrong helper application. Xfce Bug #4330. LP: #262125.
* debian/control:
  - Added myself as an upload

Modified: desktop/trunk/exo/debian/changelog
===================================================================
--- desktop/trunk/exo/debian/changelog	2008-10-15 17:13:20 UTC (rev 2399)
+++ desktop/trunk/exo/debian/changelog	2008-10-16 06:10:10 UTC (rev 2400)
@@ -1,3 +1,15 @@
+exo (0.3.4-9) UNRELEASED; urgency=low
+
+  * Merged exo patches from Ubuntu
+  * debian/patches:
+    - 04_fix_broken_regex.patch added, adds ^ and $ to url expressions to prevent exo 
+      from mistaking a directory as an e-mail address and opening the 
+      wrong helper application. Xfce Bug #4330. LP: #262125.
+  * debian/control:
+    - Added myself as an upload
+
+ -- Michael Casadevall <sonicmctails at gmail.com>  Thu, 16 Oct 2008 01:54:15 -0400
+
 exo (0.3.4-8) experimental; urgency=low
 
   * debian/patches:

Modified: desktop/trunk/exo/debian/control
===================================================================
--- desktop/trunk/exo/debian/control	2008-10-15 17:13:20 UTC (rev 2399)
+++ desktop/trunk/exo/debian/control	2008-10-16 06:10:10 UTC (rev 2400)
@@ -1,7 +1,7 @@
 Source: exo
 Priority: optional
 Maintainer: Debian Xfce Maintainers <pkg-xfce-devel at lists.alioth.debian.org>
-Uploaders: Emanuele Rocca <ema at debian.org>, Simon Huggins <huggie at earth.li>, Yves-Alexis Perez <corsac at debian.org>
+Uploaders: Emanuele Rocca <ema at debian.org>, Simon Huggins <huggie at earth.li>, Yves-Alexis Perez <corsac at debian.org>, Michael Casadevall <sonicmctails at gmail.com> 
 Build-Depends: debhelper (>= 5.0.0), libxfcegui4-dev (>= 4.4.2), liburi-perl, xfce4-mcs-manager-dev, chrpath, libhal-storage-dev [!hurd-i386], libnotify-dev, quilt
 Standards-Version: 3.8.0
 Section: libs

Added: desktop/trunk/exo/debian/patches/04_fix_broken_regexp.patch
===================================================================
--- desktop/trunk/exo/debian/patches/04_fix_broken_regexp.patch	                        (rev 0)
+++ desktop/trunk/exo/debian/patches/04_fix_broken_regexp.patch	2008-10-16 06:10:10 UTC (rev 2400)
@@ -0,0 +1,25 @@
+Index: exo-0.3.4/exo/exo-url.c
+===================================================================
+--- exo-0.3.4.orig/exo/exo-url.c	2008-10-02 09:51:44.000000000 -0300
++++ exo-0.3.4/exo/exo-url.c	2008-10-02 09:52:05.000000000 -0300
+@@ -56,14 +56,14 @@
+ #define PASSCHARS       "-A-Za-z0-9,?;.:/!%$^*&~\"#'"
+ #define HOSTCHARS       "-A-Za-z0-9"
+ #define USER            "[" USERCHARS "]+(:["PASSCHARS "]+)?"
+-#define MATCH_BROWSER1  "((file|https?|ftps?)://(" USER "@)?)[" HOSTCHARS ".]+(:[0-9]+)?" \
+-                        "(/[-A-Za-z0-9_$.+!*(),;:@&=?/~#%]*[^]'.}>) \t\r\n,\\\"])?"
+-#define MATCH_BROWSER2  "(www|ftp)[" HOSTCHARS "]*\\.[" HOSTCHARS ".]+(:[0-9]+)?" \
+-                        "(/[-A-Za-z0-9_$.+!*(),;:@&=?/~#%]*[^]'.}>) \t\r\n,\\\"])?"
++#define MATCH_BROWSER1  "^((file|https?|ftps?)://(" USER "@)?)[" HOSTCHARS ".]+(:[0-9]+)?" \
++                        "(/[-A-Za-z0-9_$.+!*(),;:@&=?/~#%]*[^]'.}>) \t\r\n,\\\"])?$"
++#define MATCH_BROWSER2  "^(www|ftp)[" HOSTCHARS "]*\\.[" HOSTCHARS ".]+(:[0-9]+)?" \
++                        "(/[-A-Za-z0-9_$.+!*(),;:@&=?/~#%]*[^]'.}>) \t\r\n,\\\"])?$"
+ #if !defined(__GLIBC__)
+-#define MATCH_MAILER    "[a-z0-9][a-z0-9_.-]*@[a-z0-9][a-z0-9-]*(\\.[a-z0-9][a-z0-9-]*)+"
++#define MATCH_MAILER    "^[a-z0-9][a-z0-9_.-]*@[a-z0-9][a-z0-9-]*(\\.[a-z0-9][a-z0-9-]*)+$"
+ #else
+-#define MATCH_MAILER    "\\<[a-z0-9][a-z0-9_.-]*@[a-z0-9][a-z0-9-]*(\\.[a-z0-9][a-z0-9-]*)+\\>"
++#define MATCH_MAILER    "^\\<[a-z0-9][a-z0-9_.-]*@[a-z0-9][a-z0-9-]*(\\.[a-z0-9][a-z0-9-]*)+\\>$"
+ #endif
+ 
+ 

Modified: desktop/trunk/exo/debian/patches/series
===================================================================
--- desktop/trunk/exo/debian/patches/series	2008-10-15 17:13:20 UTC (rev 2399)
+++ desktop/trunk/exo/debian/patches/series	2008-10-16 06:10:10 UTC (rev 2400)
@@ -1,3 +1,4 @@
 01_exo-alt-eject.patch
 02_exo-open.1.patch
 03_libexo-teardown-crypto-on-eject.patch
+04_fix_broken_regexp.patch