Subversion Repositories pike

Compare Revisions

Ignore whitespace Rev 181 → Rev 147

/branches/7.8-stable/debian/changelog
1,93 → 1,3
pike7.8 (7.8.700-7) unstable; urgency=low
 
* Correct the Replaces and Breaks declarations related to moving
Tools.PV (Closes: #711593).
* Also move compatibility Image module to pike7.8-image.
* Modify package descriptions noting what modules are in each package
and that the Postgres module is deprecated.
* Update Vcs-Browser URL.
* Actually apply undefined_htons.patch.
 
-- Magnus Holmgren <holmgren@debian.org> Sat, 08 Jun 2013 20:15:11 +0200
 
pike7.8 (7.8.700-6) unstable; urgency=low
 
* hurd.patch: Add mach/message.h to one more place in src/configure and
add HAVE_MACH_MESSAGE_H to src/machine.h.in.
* nettle_crypt_md5_buffer_size.patch (new): Nette.MD5: passwd array was
too small.
* pcre_info_obsolete.patch (new): Stop using the long-obsolete
pcre_info(), which was just recently removed from the headers but
remains in the library.
* undefined_htons.patch (mew): Include the necessary header file
declaring htons() in Protocols.DNS_SD.
 
-- Magnus Holmgren <holmgren@debian.org> Sat, 08 Jun 2013 01:56:51 +0200
 
pike7.8 (7.8.700-5) unstable; urgency=low
 
* Build-depend on libtiff-dev rather than libtiff4-dev (Closes: #708365).
* Move Tools.PV from -core to -gtk and make -gtk depend on -image, since
Tools.PV requires both but is too small to make its own package
(Closes: #711060).
* hurd.patch (new): Make Pike build on Debian GNU/Hurd.
 
-- Magnus Holmgren <holmgren@debian.org> Thu, 06 Jun 2013 22:53:05 +0200
 
pike7.8 (7.8.700-4) unstable; urgency=low
 
* reg_enum_conflict.patch: The conflict is with an enum, so we have to
rename our enum constants (really Closes: #708366). Also add DEP-3
header.
 
-- Magnus Holmgren <holmgren@debian.org> Sun, 26 May 2013 21:35:09 +0200
 
pike7.8 (7.8.700-3) unstable; urgency=low
 
* Link pike7.8-odbc to unixodbc, not iodbc, since the latter is not
multiarch-aware and not capable of handling the ODBC drivers in
wheezy (Closes: #707911).
* reg_enum_conflict.patch (new): Undefine conflicting REG_* definitions
for now (Closes: #708366).
 
-- Magnus Holmgren <holmgren@debian.org> Thu, 23 May 2013 23:10:42 +0200
 
pike7.8 (7.8.700-2) unstable; urgency=low
 
* Upload to unstable.
* module-layout.patch: Use __REAL_MAJOR__ and __REAL_MINOR__ in
version-specific include and module paths; __REAL_VERSION__, being a
float, could allegedly cause trouble.
* Bump Standards-Version to 3.9.4
 
-- Magnus Holmgren <holmgren@debian.org> Tue, 07 May 2013 23:10:27 +0200
 
pike7.8 (7.8.700-1) experimental; urgency=low
 
* New upstream release.
* Since the upstream tarball no longer contains Nettle 1.15, which
contained non-fee IETF documents, but instead Nettle 2.5, we can ship
it unmodified.
* Override the Lintian warnings about outdated config.guess files in the
bundles directories, as they aren't used.
* Drop nettle-2.1.patch. Refresh remaining patches.
* Exclude the ZXID module for now, until zxid has been packaged for
Debian.
* No longer exclude the PV (picture viewer) tool, as it now supports
GTK+2.
 
-- Magnus Holmgren <holmgren@debian.org> Sun, 07 Oct 2012 21:54:26 +0200
 
pike7.8 (7.8.550-dfsg-1) experimental; urgency=low
 
* The latest official upstream "beta" release.
- Dropped dumping_problems.patch; incorporated upstream.
- unbreak_cross_compilation.patch partially incorporated upstream.
* Update debian/watch to point to
http://pike.ida.liu.se/download/pub/pike/beta/.
 
-- Magnus Holmgren <holmgren@debian.org> Mon, 25 Apr 2011 00:28:05 +0200
 
pike7.8 (7.8.352-dfsg-7) unstable; urgency=low
 
* Correct Replaces/Breaks for the move of files in -6 (Closes: #678846).
/branches/7.8-stable/debian/control
3,19 → 3,19
Priority: optional
Maintainer: Magnus Holmgren <holmgren@debian.org>
Uploaders: Henrik Andreasson <debian@han.pp.se>
Standards-Version: 3.9.4
Standards-Version: 3.9.3
Build-Depends: dpkg-dev (>= 1.15.7), debhelper (>= 5), bison, sharutils, bc, pkg-config,
libgmp10-dev, nettle-dev (>= 2.1~), zlib1g-dev | libz-dev,
libbz2-dev, libgdbm-dev, unixodbc-dev, libmysqlclient-dev,
libbz2-dev, libgdbm-dev, libiodbc2-dev, libmysqlclient-dev,
libpq-dev, libsqlite3-dev, libpcre3-dev, libsdl-mixer1.2-dev,
libsdl1.2-dev, libsane-dev, x11proto-gl-dev, libxpm-dev,
libglade2-dev, libfreetype6-dev, freeglut3-dev, libjpeg-dev,
libtiff-dev, librsvg2-dev (>= 2.7), libgnomeui-dev,
libtiff4-dev, librsvg2-dev (>= 2.7), libgnomeui-dev,
libfuse-dev, libfftw3-dev, libavahi-compat-libdnssd-dev
Build-Conflicts: libutahglx-dev
Homepage: http://pike.ida.liu.se/
Vcs-Svn: svn://svn.debian.org/pkg-pike/branches/7.8-stable
Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-pike/
Vcs-Browser: http://svn.debian.org/pkg-pike
 
Package: pike7.8-core
Architecture: any
110,9 → 110,8
Package: pike7.8-mysql
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, pike7.8-core (= ${binary:Version})
Description: MySQL modules for Pike
This package contains Pike modules providing access to MySQL
databases: Mysql and Sql.mysql(s).
Description: MySQL module for Pike
This Pike module provides access to MySQL databases.
.
Pike is an interpreted programming language, for more information
see the description of the pike7.8-core package.
120,13 → 119,9
Package: pike7.8-pg
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, pike7.8-core (= ${binary:Version})
Description: PostgreSQL modules for Pike
This package contains Pike module providing access to PostgreSQL
databases: Postgres, Sql.postgres, and Sql.postgres_result.
Description: PostgreSQL module for Pike
This Pike module provides access to PostgreSQL databases.
.
Note: These modules are deprecated in favour of the pure Pike
Sql.pgsql module, which is included in the core package.
.
Pike is an interpreted programming language, for more information
see the description of the pike7.8-core package.
 
133,9 → 128,8
Package: pike7.8-odbc
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, pike7.8-core (= ${binary:Version})
Description: ODBC modules for Pike
This package contains Pike modules providing glue to the ODBC
interface: Odbc, Sql.odbc, and Sql.odbc_result.
Description: ODBC module for Pike
This Pike module provides glue to the iODBC interface.
.
Pike is an interpreted programming language, for more information
see the description of the pike7.8-core package.
145,9 → 139,9
Depends: ${shlibs:Depends}, ${misc:Depends}, pike7.8-core (= ${binary:Version})
Suggests: pike7.8-image (= ${source:Version})
Description: SVG format support for Pike
This package provides an SVG graphics format module, Image.SVG. It
has been separated from the pike7.8-image module because of its quite
extensive dependencies.
This module provides an SVG graphics format module. It has
been separated from the pike7.8-image module because of its
quite extensive dependencies.
.
Pike is an interpreted programming language, for more information
see the description of the pike7.8-core package.
155,13 → 149,12
Package: pike7.8-image
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, pike7.8-core (= ${binary:Version})
Replaces: pike7.8-core (<< 7.8.700-6)
Breaks: pike7.8-core (<< 7.8.700-6)
Replaces: pike7.8-core (<< 7.8.352-dfsg-6)
Breaks: pike7.8-core (<< 7.8.352-dfsg-6)
Suggests: pike7.8-svg (= ${source:Version})
Description: Image modules for Pike
This package provides many powerful image processing functions to
Pike programs. It contains the modules Image (except Image.SVG),
Graphics, Colors, and Protocols.X.XImage.
Description: Image module for Pike
This module provides many powerful image processing functions to
Pike programs.
.
Pike is an interpreted programming language, for more information
see the description of the pike7.8-core package.
186,10 → 179,7
 
Package: pike7.8-gtk
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, pike7.8-core (= ${binary:Version}),
pike7.8-image (= ${binary:Version})
Replaces: pike7.8-core (<< 7.8.700-5)
Breaks: pike7.8-core (<< 7.8.700-5)
Depends: ${shlibs:Depends}, ${misc:Depends}, pike7.8-core (= ${binary:Version})
Description: GTK+ 2.0 module for Pike
This Pike module provides access to the GTK+ 2.0 library.
.
199,10 → 189,8
Package: pike7.8-gl
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, pike7.8-core (= ${binary:Version})
Description: Mesa modules for Pike
This package contains the Pike modules providing access to the Mesa
3D graphics library: GL, GLU (GL Utilities), and GLUE (GL Universal
Environment).
Description: Mesa module for Pike
This Pike module provides access to the Mesa 3D graphics library.
.
Pike is an interpreted programming language, for more information
see the description of the pike7.8-core package.
220,9 → 208,8
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, pike7.8-core (= ${binary:Version})
Description: PCRE module for Pike
This Pike module (Regexp.PCRE) enables one to use the PCRE (Perl
compatible regular expressions) library from within the Pike
programs.
This Pike module enables one to use the PCRE (Perl compatible regular
expressions) library from within the Pike programs.
.
Pike is an interpreted programming language, for more information
see the description of the pike7.8-core package.
/branches/7.8-stable/debian/pike7.8-image.install
3,6 → 3,5
usr/lib/pike?.?/modules/*Image*.pmod
usr/lib/pike?.?/modules/Graphics.pmod
usr/lib/pike?.?/modules/Colors.pmod
usr/lib/pike?.?/?.?/modules/Colors.pmod
usr/lib/pike?.?/?.?/modules/Image.pmod
usr/lib/pike?.?/7.0/modules/Colors.pmod
usr/lib/pike?.?/modules/Protocols.pmod/X.pmod/XImage.pmod
/branches/7.8-stable/debian/rules
135,7 → 135,7
#{ADT,Array,Audio,Cache,Calendar,Calendar_I,COM,Colors,CommonLog,Crypto,Debug,Filesystem,Error,Float,Function,Geography,Getopt,Gettext,Gmp,Graphics,Gz,HTTPAccept,Int,Kerberos,Languages,Local,Locale,Mapping,Math,MIME,Mird,Multiset,Nettle,Parser,Pike,Pipe,Process,Program,Protocols,Regexp,Remote,SSL,Shuffler,Standards,Stdio,String,System,Thread,Tools,Unicode,Web,Yabu,Yp,_ADT,_Charset,_Roxen,___Gz,___MIME,___Math,___Mird,___Regexp,___Yp,____Charset,__builtin*,spider}.
#usr/lib/pike/*/modules/Sql.pmod/{module,Sql,rsql,sql_*}.*
 
excluded_modules:=Ssleay Mird Msql msql PDF Ffmpeg Oracle oracle sybase DVB Java TTF Gnome GDK GTKSupport ZXID
excluded_modules:=Ssleay Mird Msql msql PDF Ffmpeg Oracle oracle sybase DVB Java TTF PV.pike Gnome GDK GTKSupport
# This is tricky. Note that it's only possible for an exclusion to match the last
# component specified in an .install file or on the command line, and below.
DH_EXCLUDE:=$(addprefix -X,$(excluded_modules))
/branches/7.8-stable/debian/patches/hurd.patch
File deleted
/branches/7.8-stable/debian/patches/pcre_info_obsolete.patch
File deleted
/branches/7.8-stable/debian/patches/nettle_crypt_md5_buffer_size.patch
File deleted
/branches/7.8-stable/debian/patches/undefined_htons.patch
File deleted
/branches/7.8-stable/debian/patches/reg_enum_conflict.patch
File deleted
/branches/7.8-stable/debian/patches/misplaced_MAXPATHLEN.patch
1,9 → 1,10
From: Samuel Thibault <samuel.thibault@ens-lyon.org>
Subject: Move reserve MAXPATHLEN definition up.
 
--- a/src/modules/files/efuns.c
+++ b/src/modules/files/efuns.c
@@ -118,6 +118,10 @@ LINKFUNC(BOOL, movefileex, (
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 /* __NT__ */
14,7 → 15,7
struct array *encode_stat(PIKE_STAT_T *s)
{
struct array *a;
@@ -1524,9 +1528,6 @@ void f_getcwd(INT32 args)
@@ -1443,9 +1447,6 @@
size*=2;
} while (size < 10000);
#else
/branches/7.8-stable/debian/patches/dump_timeout.patch
5,7 → 5,7
 
--- a/lib/modules/Tools.pmod/Standalone.pmod/dump.pike
+++ b/lib/modules/Tools.pmod/Standalone.pmod/dump.pike
@@ -325,7 +325,8 @@ void dump_files() {
@@ -323,7 +323,8 @@ void dump_files() {
#if constant(alarm)
// Dumping shouldn't take more than a minute per file.
/branches/7.8-stable/debian/patches/series
7,9 → 7,6
misplaced_MAXPATHLEN.patch
pthread_stub.patch
unbreak_cross_compilation.patch
dumping_problems.patch
nettle-2.1.patch
dump_timeout.patch
reg_enum_conflict.patch
hurd.patch
nettle_crypt_md5_buffer_size.patch
pcre_info_obsolete.patch
undefined_htons.patch
/branches/7.8-stable/debian/patches/pthread_stub.patch
1,6 → 1,6
--- a/src/configure
+++ b/src/configure
@@ -90560,6 +90560,9 @@ cat confdefs.h >>conftest.$ac_ext
@@ -90901,6 +90901,9 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <pthread.h>
12,7 → 12,7
int
--- a/src/configure.in
+++ b/src/configure.in
@@ -3977,6 +3977,9 @@ pthread_t gazonk;
@@ -3929,6 +3929,9 @@ pthread_t gazonk;
AC_MSG_CHECKING(for pthread_atfork)
AC_CACHE_VAL(pike_cv_have_pthread_atfork,[
AC_TRY_LINK([#include <pthread.h>
/branches/7.8-stable/debian/patches/dumping_problems.patch
0,0 → 1,133
From: Martin Stjernholm <mast@roxen.com>
Subject: Encode references to all ex-masters as if they are to the current master.
 
That since we cannot hope to eradicate all references to the old
master when replacing it, and in any case the decoder cannot hope to
find the same ex-master again.
 
If this creates a problem for someone using replace_master then it's
always possible to clear the is_pike_master variable in the old
master.
 
--- trunk/lib/master.pike.in 28 Jul 2010 10:29:59 -0000 1.474
+++ cvs/lib/master.pike.in 28 Jul 2010 22:58:01 -0000 1.476
@@ -85,6 +85,13 @@
//!
int show_if_constant_errors = 0;
+int is_pike_master = 0;
+// This integer variable should exist in any object that aspires to be
+// the master. It gets set to 1 when the master is installed, and is
+// therefore set in any object that is or has been the master. That
+// makes the Encoder class encode references to the master and all
+// ex-masters as references to the current master object.
+
// --- Functions begin here.
// Have to access some stuff without going through the resolver.
@@ -5092,6 +5099,11 @@
}
}
+ else if (what->is_pike_master) {
+ ENC_MSG (" is a master object\n");
+ ENC_RETURN ("o/master");
+ }
+
program prog;
if ((prog = objects_reverse_lookup (what)))
ENC_MSG (" found program in objects: %O\n", prog);
--- trunk/src/builtin_functions.c 27 Jul 2010 16:46:01 -0000 1.704
+++ cvs/src/builtin_functions.c 28 Jul 2010 22:51:00 -0000 1.705
@@ -7364,22 +7364,28 @@
*/
PMOD_EXPORT void f_replace_master(INT32 args)
{
+ struct object *new_master;
ASSERT_SECURITY_ROOT("replace_master");
if(!args)
SIMPLE_TOO_FEW_ARGS_ERROR("replace_master", 1);
if(Pike_sp[-args].type != T_OBJECT)
SIMPLE_BAD_ARG_ERROR("replace_master", 1, "object");
- if(!Pike_sp[-args].u.object->prog)
+ new_master = Pike_sp[-args].u.object;
+ if(!new_master->prog)
bad_arg_error("replace_master", Pike_sp-args, args, 1, "object", Pike_sp-args,
"Called with destructed object.\n");
if (Pike_sp[-args].subtype)
bad_arg_error("replace_master", Pike_sp-args, args, 1, "object", Pike_sp-args,
"Subtyped master objects are not supported yet.\n");
-
+
+ push_constant_text ("is_pike_master");
+ args++;
+ object_set_index (new_master, 0, Pike_sp - 1, &svalue_int_one);
+
free_object(master_object);
- master_object=Pike_sp[-args].u.object;
+ master_object=new_master;
add_ref(master_object);
free_program(master_program);
--- trunk/src/object.c 11 Jul 2010 10:08:02 -0000 1.310
+++ cvs/src/object.c 28 Jul 2010 22:50:59 -0000 1.311
@@ -658,6 +658,7 @@
}
{
+ int f;
ONERROR uwp;
/* fprintf(stderr, "Cloning master...\n"); */
@@ -673,7 +674,11 @@
call_c_initializers(master_object);
call_pike_initializers(master_object,0);
-
+
+ f = find_identifier ("is_pike_master", master_program);
+ if (f >= 0)
+ object_low_set_index (master_object, f, &svalue_int_one);
+
/* fprintf(stderr, "Master loaded.\n"); */
UNSET_ONERROR (uwp);
--- trunk/src/svalue.c 11 Jul 2010 12:39:10 -0000 1.261
+++ cvs/src/svalue.c 28 Jul 2010 22:46:39 -0000 1.262
@@ -30,14 +30,10 @@
#define sp Pike_sp
-PMOD_EXPORT const struct svalue svalue_undefined =
+PMOD_EXPORT struct svalue svalue_undefined =
SVALUE_INIT (T_INT, NUMBER_UNDEFINED, 0);
-PMOD_EXPORT const struct svalue svalue_int_zero = SVALUE_INIT_INT (0);
-#ifdef HAVE_UNION_INIT
-PMOD_EXPORT const struct svalue svalue_int_one = SVALUE_INIT_INT (1);
-#else
+PMOD_EXPORT struct svalue svalue_int_zero = SVALUE_INIT_INT (0);
PMOD_EXPORT struct svalue svalue_int_one = SVALUE_INIT_INT (1);
-#endif
#ifdef PIKE_DEBUG
PMOD_EXPORT const char msg_type_error[] =
--- trunk/src/svalue.h 18 Feb 2010 08:52:55 -0000 1.172
+++ cvs/src/svalue.h 28 Jul 2010 22:46:40 -0000 1.173
@@ -323,13 +323,8 @@
#define FUNCTION_BUILTIN USHRT_MAX
-extern PMOD_EXPORT const struct svalue svalue_undefined, svalue_int_zero;
-#ifdef HAVE_UNION_INIT
-extern PMOD_EXPORT const struct svalue svalue_int_one;
-#else
-/* The value 1 is initialized first thing in init_pike. */
-extern PMOD_EXPORT struct svalue svalue_int_one;
-#endif
+extern PMOD_EXPORT struct svalue svalue_undefined,
+ svalue_int_zero, svalue_int_one;
#define is_gt(a,b) is_lt(b,a)
#define is_ge(a,b) is_le(b,a)
/branches/7.8-stable/debian/patches/no_dump_modules.patch
1,9 → 1,10
Author: Magnus Holmgren <holmgren@debian.org>
Description: Make install.pike not dump modules; we do that in postinst
 
--- a/bin/install.pike
+++ b/bin/install.pike
@@ -2980,7 +2980,6 @@ the PRIVATE_CRT stuff in install.pike.\n
diff -urNad trunk~/bin/install.pike trunk/bin/install.pike
--- trunk~/bin/install.pike 2008-08-19 13:51:08.000000000 +0200
+++ trunk/bin/install.pike 2010-07-28 16:12:19.000000000 +0200
@@ -2942,7 +2942,6 @@
{
do_export();
}else{
/branches/7.8-stable/debian/patches/dynamic_module_makefile.in-libgcc.patch
1,10 → 1,11
Author: Marek Habersack <grendel@debian.org>
Description: Figure out LIBGCC name.
 
--- a/src/modules/dynamic_module_makefile.in
+++ b/src/modules/dynamic_module_makefile.in
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: b9e7817a07dab41006a9b1cc92c9ce0193303874 $
# $Id: dynamic_module_makefile.in,v 1.124 2008/01/11 00:22:27 grubba Exp $
#
+LIBGCC=$(shell gcc -print-libgcc-file-name)
/branches/7.8-stable/debian/patches/unbreak_cross_compilation.patch
4,20 → 4,21
## DP: Fix various breakage preventing cross compilation:
## DP: * Use the installed pike when needed, not the newly built one.
## DP: * Don't disable dynamic module loading just because we're cross-compiling
## DP: * Don't freak out because a test program cannot be run
 
@DPATCH@
--- a/src/configure
+++ b/src/configure
@@ -8718,7 +8718,7 @@ if test "x$enable_binary" = "xno"; then
RUNPIKE="USE_PIKE"
--- a/src/configure 2009-09-22 20:37:45.000000000 +0000
+++ b/src/configure 2010-05-04 09:44:55.000000000 +0000
@@ -8855,7 +8855,7 @@
RUNTPIKE="USE_PIKE"
elif test "x$cross_compiling" = "xyes"; then
- RUNPIKE="DEFAULT_RUNPIKE"
+ RUNPIKE="USE_PIKE"
RUNTPIKE="USE_PIKE"
else
RUNPIKE="DEFAULT_RUNPIKE"
@@ -106150,7 +106150,7 @@ EOF
if test "x$cross_compiling" = "xyes"; then
- RUNPIKE="DEFAULT_RUNPIKE"
+ RUNPIKE="USE_PIKE"
RUNTPIKE="USE_PIKE"
else
RUNPIKE="DEFAULT_RUNPIKE"
@@ -106926,7 +106926,7 @@
;;
esac
if test "$cross_compiling" = yes; then
26,3 → 27,20
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
--- a/src/modules/Mysql/configure 2010-05-19 10:20:10.745552500 +0000
+++ b/src/modules/Mysql/configure 2009-09-22 20:38:35.000000000 +0000
@@ -7018,13 +7018,7 @@
$as_echo "yes" >&6; }
if test "$cross_compiling" = yes; then
- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }; }
+:
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
/branches/7.8-stable/debian/patches/module-layout.patch
1,22 → 1,24
Author: Magnus Holmgren <holmgren@debian.org>
Description: Add local site-pike directories to master.pike.in
 
--- a/lib/master.pike.in
+++ b/lib/master.pike.in
@@ -2137,6 +2137,10 @@ protected void create()
diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' trunk~/lib/master.pike.in trunk/lib/master.pike.in
--- trunk~/lib/master.pike.in 2009-09-19 12:08:35.000000000 +0200
+++ trunk/lib/master.pike.in 2010-04-11 21:02:58.000000000 +0200
@@ -2094,6 +2094,10 @@
add_module_path("#lib_prefix#/modules");
#endif
+ // Debian paths
+ add_include_path("/usr/local/lib/pike"+__REAL_MAJOR__+"."+__REAL_MINOR__+"/include");
+ add_module_path("/usr/local/lib/pike"+__REAL_MAJOR__+"."+__REAL_MINOR__+"/modules");
+ add_include_path("/usr/local/lib/pike"+__REAL_VERSION__+"/include");
+ add_module_path("/usr/local/lib/pike"+__REAL_VERSION__+"/modules");
+
#if "#cflags# "[0]!='#'
cflags = "#cflags#";
#endif
--- a/lib/modules/Tools.pmod/Standalone.pmod/module.pike
+++ b/lib/modules/Tools.pmod/Standalone.pmod/module.pike
@@ -25,9 +25,8 @@ string bin_path=include_path;
diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' trunk~/lib/modules/Tools.pmod/Standalone.pmod/module.pike trunk/lib/modules/Tools.pmod/Standalone.pmod/module.pike
--- trunk~/lib/modules/Tools.pmod/Standalone.pmod/module.pike 2008-07-08 14:59:17.000000000 +0200
+++ trunk/lib/modules/Tools.pmod/Standalone.pmod/module.pike 2010-04-11 21:35:20.000000000 +0200
@@ -25,9 +25,8 @@
// this is not the ideal location for all systems, but it's a start.
string local_module_path=combine_path(getenv("HOME")||"","lib/pike/modules");
bool old_style_module = false;
24,11 → 26,11
-// master() puts the lib/modules path last.
-string system_module_path=master()->system_module_path[-1];
+
+string system_module_path="/usr/local/lib/pike"+__REAL_MAJOR__+"."+__REAL_MINOR__+"/modules";
+string system_module_path="/usr/local/lib/pike"+__REAL_VERSION__+"/modules";
// where do we install the documentation?
string system_doc_path = master()->doc_prefix;
@@ -184,7 +183,7 @@ void do_make(array(string) cmd)
@@ -183,7 +182,7 @@
extra_args = ({
"PIKE="+run_pike,
"SRCDIR="+fix("$src"),
37,7 → 39,7
"LOCAL_MODULE_PATH=" + lmp,
});
}
@@ -241,6 +240,7 @@ int main(int argc, array(string) argv)
@@ -240,6 +239,7 @@
({"all",Getopt.NO_ARG,({"--all"}) }),
({"make",Getopt.NO_ARG,({"--make"}) }),
({"auto",Getopt.NO_ARG,({"--auto"}) }),
45,7 → 47,7
({"source",Getopt.HAS_ARG,({"--source"}) }),
({"query",Getopt.HAS_ARG,({"--query"}) }),
({"config_args",Getopt.HAS_ARG,({"--configure-args"}) }),
@@ -277,6 +277,9 @@ int main(int argc, array(string) argv)
@@ -276,6 +276,9 @@
case "auto":
run->depend=run->autoheader=run->autoconf=run->configure=run->make=AUTO;
break;
55,7 → 57,7
}
}
@@ -421,7 +424,7 @@ int main(int argc, array(string) argv)
@@ -405,7 +408,7 @@
run_or_fail( ([ "env":getenv()|
([
"PIKE":run_pike,
64,9 → 66,10
"LOCAL_MODULE_PATH":local_module_path,
])
]),
--- a/src/modules/dynamic_module_makefile.in
+++ b/src/modules/dynamic_module_makefile.in
@@ -90,13 +90,13 @@ $(OBJS): propagated_variables
diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' 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 2010-04-11 22:37:28.000000000 +0200
@@ -90,13 +90,13 @@
#
install: $(MODULE_INSTALL)
@if test "x$(OBJS)" != "x" ; then \
/branches/7.8-stable/debian/source/lintian-overrides
File deleted
/branches/7.8-stable/debian/pike7.8-gtk.install
1,3 → 1,2
usr/lib/pike?.?/modules/*GTK2*
#usr/share/pike?.?/modules/*GTK2*
usr/lib/pike?.?/modules/Tools.pmod/PV.pike
/branches/7.8-stable/debian/watch
1,4 → 1,4
version=3
 
opts=dversionmangle=s/-dfsg$// \
http://pike.ida.liu.se/download/pub/pike/beta/(7\.8\.\d+)/ .*/Pike-v(7\.8\.\d+)\.tar\.gz
http://pike.ida.liu.se/download/pub/pike/all/(7\.8\.\d+)/ .*/Pike-v(7\.8\.\d+)\.tar\.gz
/branches/7.8-stable/.
Property changes:
Deleted: svn:mergeinfo
## -0,1 +0,0 ##
Reverse-merged /trunk:r126-180