[Pkg-xfce-commits] r2409 - in desktop/branches/svn-snapshots/exo/debian: . patches

[ncommander-guest at alioth.debian.org]

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

Added:
   desktop/branches/svn-snapshots/exo/debian/patches/
   desktop/branches/svn-snapshots/exo/debian/patches/04_fix_broken_regexp.patch
   desktop/branches/svn-snapshots/exo/debian/patches/series
Modified:
   desktop/branches/svn-snapshots/exo/debian/changelog
   desktop/branches/svn-snapshots/exo/debian/control
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
  - Added quilt as a build-dep

Modified: desktop/branches/svn-snapshots/exo/debian/changelog
===================================================================
--- desktop/branches/svn-snapshots/exo/debian/changelog	2008-10-16 06:31:45 UTC (rev 2408)
+++ desktop/branches/svn-snapshots/exo/debian/changelog	2008-10-16 06:32:01 UTC (rev 2409)
@@ -1,5 +1,6 @@
 exo (0.3.91-1) UNRELEASED; urgency=low
 
+  [ Yves-Alexis Perez ]
   [ Xfce 4.6 Alpha “Pinkie”]
   * new upstream alpha release.
   * debian/libexo-0.3-0.shlibs: update shlibs version accordingly.
@@ -21,6 +22,17 @@
     - update shlibs for Fuzzy.
   * debian/rules:
     - stop messing with config.{guess,sub}.
+  
+  [ Michael Casadevall ]
+  [ Xfce 4.6 Beta 1 “Tuco-Tuco”]
+  * 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
+    - Added quilt as a build-dep
 
  -- Yves-Alexis Perez <corsac at debian.org>  Thu, 16 Oct 2008 08:21:02 +0200
 

Modified: desktop/branches/svn-snapshots/exo/debian/control
===================================================================
--- desktop/branches/svn-snapshots/exo/debian/control	2008-10-16 06:31:45 UTC (rev 2408)
+++ desktop/branches/svn-snapshots/exo/debian/control	2008-10-16 06:32:01 UTC (rev 2409)
@@ -1,8 +1,8 @@
 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>
-Build-Depends: debhelper (>= 5.0.0), libxfcegui4-dev (>= 4.5.91), liburi-perl, chrpath, libhal-storage-dev [!hurd-i386], libnotify-dev
+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.5.91), liburi-perl, chrpath, libhal-storage-dev [!hurd-i386], libnotify-dev, quilt
 Standards-Version: 3.8.0
 Section: libs
 Homepage: http://libexo.os-cillation.com/

Added: desktop/branches/svn-snapshots/exo/debian/patches/04_fix_broken_regexp.patch
===================================================================
--- desktop/branches/svn-snapshots/exo/debian/patches/04_fix_broken_regexp.patch	                        (rev 0)
+++ desktop/branches/svn-snapshots/exo/debian/patches/04_fix_broken_regexp.patch	2008-10-16 06:32:01 UTC (rev 2409)
@@ -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
+ 
+ 

Added: desktop/branches/svn-snapshots/exo/debian/patches/series
===================================================================
--- desktop/branches/svn-snapshots/exo/debian/patches/series	                        (rev 0)
+++ desktop/branches/svn-snapshots/exo/debian/patches/series	2008-10-16 06:32:01 UTC (rev 2409)
@@ -0,0 +1 @@
+04_fix_broken_regexp.patch