tags 570348 + pending thanks Dear maintainer,
I've prepared an NMU for gmrun (versioned as 0.9.2-2.1) and uploaded it to DELAYED/3. Please feel free to tell me if I should delay it longer. Regards. -- /"\ ASCII Ribbon : GPG-Key ID: 0xD49AE731 \ / Campaign : CaCert Assurer X against HTML : Debian Developer / \ in eMails : http://www.debian.org/ http://www.christoph-egger.org/
diff -Nru gmrun-0.9.2/debian/changelog gmrun-0.9.2/debian/changelog --- gmrun-0.9.2/debian/changelog 2010-02-16 08:04:47.000000000 +0100 +++ gmrun-0.9.2/debian/changelog 2010-07-17 19:05:43.000000000 +0200 @@ -1,3 +1,11 @@ +gmrun (0.9.2-2.1) unstable; urgency=low + + * Non-maintainer upload. + * Use patch from Rafael Cunha de Almeida to build using glibc's alphasort + (Closes: #570348) + + -- Christoph Egger <christ...@debian.org> Sat, 17 Jul 2010 19:03:47 +0200 + gmrun (0.9.2-2) unstable; urgency=low * New maintainer upload (Closes: #568989) diff -Nru gmrun-0.9.2/debian/control gmrun-0.9.2/debian/control --- gmrun-0.9.2/debian/control 2010-02-16 23:44:15.000000000 +0100 +++ gmrun-0.9.2/debian/control 2010-07-17 19:02:53.000000000 +0200 @@ -2,7 +2,7 @@ Section: x11 Priority: optional Maintainer: Alexandre De Dommelin <adedomme...@tuxz.net> -Build-Depends: debhelper (>= 7), libgtk2.0-dev, libpopt-dev, libc6-dev (>= 2.10.2-2) +Build-Depends: debhelper (>= 7), libgtk2.0-dev, libpopt-dev Standards-Version: 3.8.4 Homepage: http://sourceforge.net/projects/gmrun/ diff -Nru gmrun-0.9.2/debian/patches/60-fix_gtkcompletionline.patch gmrun-0.9.2/debian/patches/60-fix_gtkcompletionline.patch --- gmrun-0.9.2/debian/patches/60-fix_gtkcompletionline.patch 2010-02-03 08:28:09.000000000 +0100 +++ gmrun-0.9.2/debian/patches/60-fix_gtkcompletionline.patch 2010-07-17 19:02:53.000000000 +0200 @@ -1,11 +1,11 @@ # Description: Fixes FTBFS -# Author: Brian M. Carlson <sand...@crustytoothpaste.ath.cx> +# Author: Rafael Cunha de Almeida <raf...@kontesti.me> Index: gmrun-0.9.2/src/gtkcompletionline.cc =================================================================== ---- gmrun-0.9.2.orig/src/gtkcompletionline.cc 2010-02-03 12:35:27.879769704 +0800 -+++ gmrun-0.9.2/src/gtkcompletionline.cc 2010-02-03 12:35:45.837755945 +0800 -@@ -374,10 +374,7 @@ +--- gmrun-0.9.2.orig/src/gtkcompletionline.cc 2010-03-07 14:53:19.000000000 +0000 ++++ gmrun-0.9.2/src/gtkcompletionline.cc 2010-03-07 14:53:53.000000000 +0000 +@@ -374,30 +374,6 @@ return 0; } @@ -13,7 +13,44 @@ - const struct dirent** a = (const struct dirent**)va; - const struct dirent** b = (const struct dirent**)vb; - -+int my_alphasort(const struct dirent** a, const struct dirent** b) { - const char* s1 = (*a)->d_name; - const char* s2 = (*b)->d_name; +- const char* s1 = (*a)->d_name; +- const char* s2 = (*b)->d_name; +- +- int l1 = strlen(s1); +- int l2 = strlen(s2); +- int result = strcmp(s1, s2); +- +- if (result == 0) return 0; +- +- if (l1 < l2) { +- int res2 = strncmp(s1, s2, l1); +- if (res2 == 0) return -1; +- } else { +- int res2 = strncmp(s1, s2, l2); +- if (res2 == 0) return 1; +- } +- +- return result; +-} +- + static void + generate_execs() + { +@@ -405,7 +381,7 @@ + for (StrSet::iterator i = path.begin(); i != path.end(); i++) { + struct dirent **eps; +- int n = scandir(i->c_str(), &eps, select_executables_only, my_alphasort); ++ int n = scandir(i->c_str(), &eps, select_executables_only, alphasort); + if (n >= 0) { + for (int j = 0; j < n; j++) { + execs.insert(eps[j]->d_name); +@@ -505,7 +481,7 @@ + dirlist.clear(); + struct dirent **eps; + prefix = filename; +- n = scandir(dest.c_str(), &eps, select_executables_only, my_alphasort); ++ n = scandir(dest.c_str(), &eps, select_executables_only, alphasort); + if (n >= 0) { + for (int j = 0; j < n; j++) { + { diff -Nru gmrun-0.9.2/debian/patches/debian-changes-0.9.2-2.1 gmrun-0.9.2/debian/patches/debian-changes-0.9.2-2.1 --- gmrun-0.9.2/debian/patches/debian-changes-0.9.2-2.1 1970-01-01 01:00:00.000000000 +0100 +++ gmrun-0.9.2/debian/patches/debian-changes-0.9.2-2.1 2010-07-17 19:08:40.000000000 +0200 @@ -0,0 +1,76 @@ +Description: Upstream changes introduced in version 0.9.2-2.1 + This patch has been created by dpkg-source during the package build. + Here's the last changelog entry, hopefully it gives details on why + those changes were made: + . + gmrun (0.9.2-2.1) unstable; urgency=low + . + * Non-maintainer upload. + * Use patch from Rafael Cunha de Almeida to build using glibc's alphasort + (Closes: #570348) + . + The person named in the Author field signed this changelog entry. +Author: Christoph Egger <christ...@debian.org> +Bug-Debian: http://bugs.debian.org/570348 + +--- +The information above should follow the Patch Tagging Guidelines, please +checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here +are templates for supplementary fields that you might want to add: + +Origin: <vendor|upstream|other>, <url of original patch> +Bug: <url in upstream bugtracker> +Bug-Debian: http://bugs.debian.org/<bugnumber> +Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber> +Forwarded: <no|not-needed|url proving that it has been forwarded> +Reviewed-By: <name and email of someone who approved the patch> +Last-Update: <YYYY-MM-DD> + +--- gmrun-0.9.2.orig/src/gtkcompletionline.cc ++++ gmrun-0.9.2/src/gtkcompletionline.cc +@@ -374,6 +374,27 @@ select_executables_only(const struct dir + return 0; + } + ++int my_alphasort(const struct dirent** a, const struct dirent** b) { ++ const char* s1 = (*a)->d_name; ++ const char* s2 = (*b)->d_name; ++ ++ int l1 = strlen(s1); ++ int l2 = strlen(s2); ++ int result = strcmp(s1, s2); ++ ++ if (result == 0) return 0; ++ ++ if (l1 < l2) { ++ int res2 = strncmp(s1, s2, l1); ++ if (res2 == 0) return -1; ++ } else { ++ int res2 = strncmp(s1, s2, l2); ++ if (res2 == 0) return 1; ++ } ++ ++ return result; ++} ++ + static void + generate_execs() + { +@@ -381,7 +402,7 @@ generate_execs() + + for (StrSet::iterator i = path.begin(); i != path.end(); i++) { + struct dirent **eps; +- int n = scandir(i->c_str(), &eps, select_executables_only, alphasort); ++ int n = scandir(i->c_str(), &eps, select_executables_only, my_alphasort); + if (n >= 0) { + for (int j = 0; j < n; j++) { + execs.insert(eps[j]->d_name); +@@ -481,7 +502,7 @@ generate_dirlist(const char *what) + dirlist.clear(); + struct dirent **eps; + prefix = filename; +- n = scandir(dest.c_str(), &eps, select_executables_only, alphasort); ++ n = scandir(dest.c_str(), &eps, select_executables_only, my_alphasort); + if (n >= 0) { + for (int j = 0; j < n; j++) { + { diff -Nru gmrun-0.9.2/debian/patches/series gmrun-0.9.2/debian/patches/series --- gmrun-0.9.2/debian/patches/series 2010-02-04 15:00:20.000000000 +0100 +++ gmrun-0.9.2/debian/patches/series 2010-07-17 19:05:49.000000000 +0200 @@ -8,3 +8,4 @@ 80-selectoption.patch 90-window_placement.patch 100-gmrunrc.patch +debian-changes-0.9.2-2.1
signature.asc
Description: Digital signature
