Subversion Repositories pike

Compare Revisions

Ignore whitespace Rev 37 → Rev 38

/trunk/debian/control
2,7 → 2,7
Section: interpreters
Priority: optional
Maintainer: Magnus Holmgren <holmgren@debian.org>
Uploaders: Henrik Andreasson <pike@han.pp.se>
Uploaders: Henrik Andreasson <debian@han.pp.se>
Standards-Version: 3.7.3
Build-Depends: debhelper (>> 4.0.0), dpatch, bison, sharutils, bc,
libgmp3-dev, libnettle-dev (>= 1.14),
37,8 → 37,8
Depends: pike7.6-core (>= ${source:Version}), pike7.6-image (>= ${source:Version}), pike7.6-gdbm (>= ${source:Version})
Recommends: pike7.6-doc (>= ${source:Version})
Suggests: pike7.6-mysql (>= ${source:Version}), pike7.6-pg (>= ${source:Version}), pike7.6-dev (>= ${source:Version})
Description: Recommended meta package for Pike 7.6
This is a meta package which depends upon several other Pike
Description: Recommended metapackage for Pike 7.6
This is a metapackage which depends upon several other Pike
packages that together make up the recommended Pike installation.
If you want to install every packaged component of the Pike
distribution, please install the pike7.6-meta package.
88,7 → 88,7
Architecture: all
Section: doc
Depends: pike7.6-manual (>= ${source:Version}), pike7.6-reference (>= ${source:Version})
Description: Pike 7.6 documentation meta package
Description: Pike 7.6 documentation metapackage
This package depends upon all the Pike 7.6 documentation
packages. Note that the download and installation sizes might be very
large.
100,7 → 100,7
Package: pike7.6-meta
Architecture: all
Depends: pike7.6 (>= ${source:Version}), pike7.6-mysql (>= ${source:Version}), pike7.6-pg (>= ${source:Version}), pike7.6-odbc (>= ${source:Version}), pike7.6-image (>= ${source:Version}), pike7.6-sdl (>= ${source:Version}), pike7.6-gdbm (>= ${source:Version}), pike7.6-gl (>= ${source:Version}), pike7.6-sane (>= ${source:Version}), pike7.6-doc (>= ${source:Version}), pike7.6-dev (>= ${source:Version}), pike7.6-perl (>= ${source:Version}), pike7.6-svg (>= ${source:Version}), pike7.6-pcre (>= ${source:Version}), pike7.6-bzip2 (>= ${source:Version})
Description: Meta package for Pike 7.6
Description: Metapackage for Pike 7.6
This package depends on all the components that make up the Pike
language distribution. It will pull in a LOT of packages the
Pike components depend upon (including XFree libraries, GTK+, GNOME)!
218,7 → 218,7
Architecture: any
Depends: ${shlibs:Depends}, pike7.6-core (= ${binary:Version})
Description: PCRE module for Pike
This Pike module enables one to use the PCRE (Perl regular
This Pike module enables one to use the PCRE (Perl-compatible regular
expressions) from within Pike programs.
.
Pike is an interpreted programming language, for more information
/trunk/debian/patches/12_perl_init.dpatch
0,0 → 1,64
#! /bin/sh
## 12_perl_init.dpatch by Magnus Holmgren <holmgren@debian.org>
##
## DP: Properly call PERL_SYS_INIT() and PERL_SYS_TERM().
## DP: Credit to Niko Tyni <ntyni@debian.org>.
 
FILE=src/modules/Perl/configure
 
dpatch_patch() {
[ ! -e ${FILE}.dp-orig ] || return 1
 
sed -i.dp-orig -f - ${FILE} <<'END_SED'
/my_perl = perl_alloc();/i\
PERL_SYS_INIT3(&argc,&argv,&env);
/perl_free(my_perl);/a\
PERL_SYS_TERM();
END_SED
 
patch -p1 $*
 
}
 
dpatch_unpatch() {
patch -p1 -R $* && [ -e ${FILE}.dp-orig ] && mv -f ${FILE}.dp-orig ${FILE}
 
}
 
 
DPATCH_LIB_NO_DEFAULT=1
 
. /usr/share/dpatch/dpatch.lib.sh
 
exit
 
@DPATCH@
--- 7.6-stable~/src/modules/Perl/perlmod.c 2004-04-15 02:11:26.000000000 +0200
+++ 7.6-stable/src/modules/Perl/perlmod.c 2008-06-16 22:50:54.000000000 +0200
@@ -235,6 +235,7 @@
}
static char *dummyargv[] = { "perl", "-e", "1", 0 };
+static int dummyargc = 3;
static void init_perl_glue(struct object *o)
{
@@ -263,6 +264,9 @@
return;
}
#endif
+ if (num_perl_interpreters == 0)
+ PERL_SYS_INIT(&dummyargc, &dummyargv);
+
MT_PERMIT;
ps->perl = perl_alloc();
PL_perl_destruct_level=2;
@@ -334,6 +338,8 @@
perl_free(ps->perl);
MT_FORBID;
num_perl_interpreters--;
+ if (num_perl_interpreters == 0)
+ PERL_SYS_TERM();
}
_free_arg_and_env();
}
Property changes:
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: trunk/debian/patches/00list
===================================================================
--- trunk/debian/patches/00list (revision 37)
+++ trunk/debian/patches/00list (revision 38)
@@ -5,3 +5,4 @@
07_dynamic_module_makefile.in-libgcc
10_misplaced_MAXPATHLEN
11_pthread_stub
+12_perl_init
Index: trunk/debian/pike7.6-core.postinst
===================================================================
--- trunk/debian/pike7.6-core.postinst (revision 37)
+++ trunk/debian/pike7.6-core.postinst (revision 38)
@@ -32,7 +32,7 @@
case "$1" in
configure)
- /usr/sbin/update-alternatives --install /usr/bin/pike pike /usr/bin/${PIKEBIN} 10 \
+ update-alternatives --install /usr/bin/pike pike /usr/bin/${PIKEBIN} 10 \
--slave /usr/share/man/man1/pike.1.gz pike.1.gz /usr/share/man/man1/${PIKEBIN}.1.gz
#
# If the creation fails, so be it, user might have the filesystem mounted r/o
/trunk/debian/changelog
1,3 → 1,22
pike7.6 (7.6.112-4) unstable; urgency=low
 
* 12_perl_init.dpatch: Don't use .bak as filename extension for the
original of the patched file (Closes: #512539). Thanks to Robert
Millan for spotting this.
* pike7.6-core.postinst: Don't use absolute path to call
update-alternatives (Closes: #510941).
 
-- Magnus Holmgren <holmgren@debian.org> Sun, 25 Jan 2009 21:58:33 +0100
 
pike7.6 (7.6.112-3) unstable; urgency=medium
 
* 12_perl_init.dpatch (new): Fix silent build failure on hppa (Closes:
#486066). Thanks to Niko Tyni.
* Correct co-maintainer email address.
* Correct spelling in package descriptions.
 
-- Magnus Holmgren <holmgren@debian.org> Tue, 24 Jun 2008 20:22:18 +0200
 
pike7.6 (7.6.112-2) unstable; urgency=low
 
* Increase Standards-Version to 3.7.3: