| /trunk/debian/patches/01_master.in.dpatch |
|---|
| 8,8 → 8,8 |
| diff -urNad trunk~/lib/master.pike.in trunk/lib/master.pike.in |
| --- trunk~/lib/master.pike.in 2007-01-01 01:28:04.000000000 +0100 |
| +++ trunk/lib/master.pike.in 2007-10-02 14:04:02.000000000 +0200 |
| @@ -1111,6 +1111,14 @@ |
| add_module_path("¤lib_prefix¤/modules"); |
| @@ -2094,6 +2094,14 @@ |
| add_module_path("#lib_prefix#/modules"); |
| #endif |
| + // Debian paths |
| 20,6 → 20,6 |
| + add_module_path("/usr/local/share/pike/site_pike"); |
| + add_module_path("/usr/local/share/pike"+__REAL_MAJOR__+"."+__REAL_MINOR__+"/site_pike"); |
| + |
| #if "¤include_prefix¤"[0]!='¤' |
| include_prefix = "¤include_prefix¤"; |
| #if "#cflags# "[0]!='#' |
| cflags = "#cflags#"; |
| #endif |
| /trunk/debian/patches/07_dynamic_module_makefile.in-libgcc.dpatch |
|---|
| 5,9 → 5,9 |
| ## DP: Figure out LIBGCC name. |
| @DPATCH@ |
| diff -urNad pike7.8-7.8.116~/src/modules/dynamic_module_makefile.in pike7.8-7.8.116/src/modules/dynamic_module_makefile.in |
| --- pike7.8-7.8.116~/src/modules/dynamic_module_makefile.in 2008-01-10 20:22:27.000000000 -0400 |
| +++ pike7.8-7.8.116/src/modules/dynamic_module_makefile.in 2009-05-04 22:13:11.000000000 -0300 |
| diff -urNad trunk~/src/modules/dynamic_module_makefile.in trunk/src/modules/dynamic_module_makefile.in |
| --- trunk~/src/modules/dynamic_module_makefile.in 2008-01-11 01:22:27.000000000 +0100 |
| +++ trunk/src/modules/dynamic_module_makefile.in 2009-08-16 21:49:11.000000000 +0200 |
| @@ -2,6 +2,7 @@ |
| # $Id: dynamic_module_makefile.in,v 1.124 2008/01/11 00:22:27 grubba Exp $ |
| # |
| /trunk/debian/patches/10_misplaced_MAXPATHLEN.dpatch |
|---|
| 5,12 → 5,12 |
| ## DP: Move reserve MAXPATHLEN definition up. |
| @DPATCH@ |
| --- pike7.6-7.6.112.orig/src/modules/files/efuns.c 2007-07-24 23:08:26.932458000 +0000 |
| +++ pike7.6-7.6.112/src/modules/files/efuns.c 2007-07-24 23:09:58.626801000 +0000 |
| @@ -106,6 +106,10 @@ |
| diff -urNad pike7.8-7.8.316~/src/modules/files/efuns.c pike7.8-7.8.316/src/modules/files/efuns.c |
| --- pike7.8-7.8.316~/src/modules/files/efuns.c 2009-08-15 01:01:23.000000000 +0200 |
| +++ pike7.8-7.8.316/src/modules/files/efuns.c 2009-08-15 01:02:21.000000000 +0200 |
| @@ -109,6 +109,10 @@ |
| #endif |
| #endif /* __NT__ */ |
| +#ifndef MAXPATHLEN |
| +#define MAXPATHLEN 32768 |
| 19,7 → 19,7 |
| struct array *encode_stat(PIKE_STAT_T *s) |
| { |
| struct array *a; |
| @@ -1113,9 +1117,6 @@ |
| @@ -1443,9 +1447,6 @@ |
| size*=2; |
| } while (size < 10000); |
| #else |
| /trunk/debian/patches/02_smartlink_rpath.dpatch |
|---|
| 5,10 → 5,10 |
| ## DP: Make smartlink not use -rpath |
| @DPATCH@ |
| --- 7.7.orig/bin/smartlink 2006-03-19 18:01:51.000000000 +0100 |
| +++ 7.7/bin/smartlink 2006-08-09 02:07:32.940847999 +0200 |
| @@ -162,9 +162,8 @@ if test x$# != x0 ; then |
| diff -urNad trunk~/bin/smartlink trunk/bin/smartlink |
| --- trunk~/bin/smartlink 2008-08-19 13:51:08.000000000 +0200 |
| +++ trunk/bin/smartlink 2009-08-16 17:18:26.000000000 +0200 |
| @@ -162,9 +162,8 @@ |
| LDOPTS="$LDOPTS -R$RPATH" |
| ;; |
| Linux\ 2.*) |
| 20,9 → 20,10 |
| ;; |
| UnixWare\ 7.*) |
| if test x$LINKING != xno -a "x$RPATH" != x ; then |
| --- 7.7.orig/src/smartlink.c 2006-08-09 01:30:57.000000000 +0200 |
| +++ 7.7/src/smartlink.c 2006-08-09 02:07:32.940847999 +0200 |
| @@ -151,7 +151,7 @@ int main(int argc, char **argv) |
| diff -urNad trunk~/src/smartlink.c trunk/src/smartlink.c |
| --- trunk~/src/smartlink.c 2008-08-19 17:57:34.000000000 +0200 |
| +++ trunk/src/smartlink.c 2009-08-16 17:18:26.000000000 +0200 |
| @@ -160,7 +160,7 @@ |
| full_rpath = rpath; |
| #ifdef USE_Wl |
| 31,7 → 32,7 |
| #elif defined(USE_Wl_R) |
| strcat(rpath, "-Wl,-R"); |
| #elif defined(USE_R) |
| @@ -293,7 +293,7 @@ int main(int argc, char **argv) |
| @@ -310,7 +310,7 @@ |
| } |
| rpath_in_use |= add_path(rpath, ld_lib_path); |
| } |
| 40,7 → 41,7 |
| if (rpath_in_use) { |
| /* Delete the terminating ':' */ |
| rpath[strlen(rpath) - 1] = 0; |
| @@ -340,6 +340,7 @@ int main(int argc, char **argv) |
| @@ -357,6 +357,7 @@ |
| #error Unknown method |
| #endif |
| } |
| /trunk/debian/changelog |
|---|
| 12,8 → 12,9 |
| fixed upstream, so this patch now instead does that with share_prefix |
| and modifies install.pike to use it. The rest of the package is not |
| quite ready though, so the patch is disabled for now. |
| * Refresh all other patches. |
| -- Magnus Holmgren <holmgren@debian.org> Sat, 22 Aug 2009 20:53:28 +0200 |
| -- Magnus Holmgren <holmgren@debian.org> Sun, 23 Aug 2009 17:49:41 +0200 |
| pike7.8 (7.8.116-1) experimental; urgency=low |