Subversion Repositories pike

Compare Revisions

Ignore whitespace Rev 132 → Rev 159

/tags/7.8.700-2/debian/README.source
File deleted
/tags/7.8.700-2/debian/control
3,8 → 3,8
Priority: optional
Maintainer: Magnus Holmgren <holmgren@debian.org>
Uploaders: Henrik Andreasson <debian@han.pp.se>
Standards-Version: 3.9.2
Build-Depends: debhelper (>= 5), bison, sharutils, bc, pkg-config,
Standards-Version: 3.9.4
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, libiodbc2-dev, libmysqlclient-dev,
libpq-dev, libsqlite3-dev, libpcre3-dev, libsdl-mixer1.2-dev,
14,7 → 14,7
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/trunk
Vcs-Svn: svn://svn.debian.org/pkg-pike/branches/7.8-stable
Vcs-Browser: http://svn.debian.org/pkg-pike
 
Package: pike7.8-core
53,7 → 53,10
 
Package: pike7.8-dev
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, pike7.8-core (= ${binary:Version}), pike7.8-image (= ${binary:Version})
Depends: ${shlibs:Depends}, ${misc:Depends},
pike7.8-core (= ${binary:Version}), pike7.8-image (= ${binary:Version})
Replaces: pike7.8-core (<< 7.8.352-dfsg-6)
Breaks: pike7.8-core (<< 7.8.352-dfsg-6)
Description: Development files for Pike 7.8
This package contains files you will need to develop C extension modules
for Pike. The package depends on the recommended set of packages for the
146,6 → 149,8
Package: pike7.8-image
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, pike7.8-core (= ${binary:Version})
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 module for Pike
This module provides many powerful image processing functions to
/tags/7.8.700-2/debian/patches/misplaced_MAXPATHLEN.patch
1,7 → 1,6
From: Samuel Thibault <samuel.thibault@ens-lyon.org>
Subject: Move reserve MAXPATHLEN definition up.
 
@DPATCH@
--- a/src/modules/files/efuns.c
+++ b/src/modules/files/efuns.c
@@ -118,6 +118,10 @@ LINKFUNC(BOOL, movefileex, (
15,7 → 14,7
struct array *encode_stat(PIKE_STAT_T *s)
{
struct array *a;
@@ -1520,9 +1524,6 @@ void f_getcwd(INT32 args)
@@ -1524,9 +1528,6 @@ void f_getcwd(INT32 args)
size*=2;
} while (size < 10000);
#else
/tags/7.8.700-2/debian/patches/smartlink_rpath.patch
1,19 → 1,16
#! /bin/sh /usr/share/dpatch/dpatch-run
## 02_smartlink_rpath.dpatch
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Make smartlink not use -rpath
Description: Make smartlink not use -rpath
 
@DPATCH@
--- a/bin/smartlink
+++ b/bin/smartlink
@@ -162,9 +162,8 @@ if test x$# != x0 ; then
@@ -161,10 +161,9 @@ if test x$# != x0 ; then
SunOS\ 5.*)
LDOPTS="$LDOPTS -R$RPATH"
;;
Linux\ 2.*)
- Linux\ 2.*)
- if test x$LINKING != xno -a "x$RPATH" != x ; then
- LDOPTS="$LDOPTS -Wl,-rpath,$RPATH"
- fi
+ Linux\ 2.*|Linux\ 3.*)
+ LD_LIBRARY_PATH="$RPATH"
+ export LD_LIBRARY_PATH
;;
/tags/7.8.700-2/debian/patches/pthread_stub.patch
1,7 → 1,7
--- a/src/configure
+++ b/src/configure
@@ -62495,6 +62495,9 @@ else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -90560,6 +90560,9 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <pthread.h>
+#if defined(__stub_pthread_atfork) || defined(__stub___pthread_atfork)
12,7 → 12,7
int
--- a/src/configure.in
+++ b/src/configure.in
@@ -3953,6 +3953,9 @@ pthread_t gazonk;
@@ -3977,6 +3977,9 @@ pthread_t gazonk;
AC_MSG_CHECKING(for pthread_atfork)
AC_CACHE_VAL(pike_cv_have_pthread_atfork,[
AC_TRY_LINK([#include <pthread.h>
/tags/7.8.700-2/debian/patches/no_dump_modules.patch
3,7 → 3,7
 
--- a/bin/install.pike
+++ b/bin/install.pike
@@ -2945,7 +2945,6 @@ the PRIVATE_CRT stuff in install.pike.\n
@@ -2980,7 +2980,6 @@ the PRIVATE_CRT stuff in install.pike.\n
{
do_export();
}else{
/tags/7.8.700-2/debian/patches/dump_timeout.patch
1,3 → 1,8
Author: Magnus Holmgren
Bug-Debian: http://bugs.debian.org/593436
Description: Increase module dumping timeout
The timeout seems to be too short on architectures such as ARM and Geode.
 
--- 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() {
/tags/7.8.700-2/debian/patches/dynamic_module_makefile.in-libgcc.patch
1,11 → 1,10
Author: Marek Habersack <grendel@debian.org>
Description: Figure out LIBGCC name.
 
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
--- a/src/modules/dynamic_module_makefile.in
+++ b/src/modules/dynamic_module_makefile.in
@@ -2,6 +2,7 @@
# $Id: dynamic_module_makefile.in,v 1.124 2008/01/11 00:22:27 grubba Exp $
# $Id: b9e7817a07dab41006a9b1cc92c9ce0193303874 $
#
+LIBGCC=$(shell gcc -print-libgcc-file-name)
/tags/7.8.700-2/debian/patches/series
7,5 → 7,4
misplaced_MAXPATHLEN.patch
pthread_stub.patch
unbreak_cross_compilation.patch
nettle-2.1.patch
dump_timeout.patch
/tags/7.8.700-2/debian/patches/unbreak_cross_compilation.patch
8,7 → 8,7
@DPATCH@
--- a/src/configure
+++ b/src/configure
@@ -7348,7 +7348,7 @@ if test "x$enable_binary" = "xno"; then
@@ -8718,7 +8718,7 @@ if test "x$enable_binary" = "xno"; then
RUNPIKE="USE_PIKE"
RUNTPIKE="USE_PIKE"
elif test "x$cross_compiling" = "xyes"; then
17,12 → 17,12
RUNTPIKE="USE_PIKE"
else
RUNPIKE="DEFAULT_RUNPIKE"
@@ -73133,7 +73133,7 @@ EOF
@@ -106150,7 +106150,7 @@ EOF
;;
esac
if test "$cross_compiling" = yes; then :
if test "$cross_compiling" = yes; then
- pike_cv_sys_dynamic_loading=no
+ pike_cv_sys_dynamic_loading=yes
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
/tags/7.8.700-2/debian/patches/module-layout.patch
3,13 → 3,13
 
--- a/lib/master.pike.in
+++ b/lib/master.pike.in
@@ -2113,6 +2113,10 @@ protected void create()
@@ -2137,6 +2137,10 @@ protected void create()
add_module_path("#lib_prefix#/modules");
#endif
+ // Debian paths
+ add_include_path("/usr/local/lib/pike"+__REAL_VERSION__+"/include");
+ add_module_path("/usr/local/lib/pike"+__REAL_VERSION__+"/modules");
+ add_include_path("/usr/local/lib/pike"+__REAL_MAJOR__+"."+__REAL_MINOR__+"/include");
+ add_module_path("/usr/local/lib/pike"+__REAL_MAJOR__+"."+__REAL_MINOR__+"/modules");
+
#if "#cflags# "[0]!='#'
cflags = "#cflags#";
24,11 → 24,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_VERSION__+"/modules";
+string system_module_path="/usr/local/lib/pike"+__REAL_MAJOR__+"."+__REAL_MINOR__+"/modules";
// where do we install the documentation?
string system_doc_path = master()->doc_prefix;
@@ -183,7 +182,7 @@ void do_make(array(string) cmd)
@@ -184,7 +183,7 @@ void do_make(array(string) cmd)
extra_args = ({
"PIKE="+run_pike,
"SRCDIR="+fix("$src"),
37,7 → 37,7
"LOCAL_MODULE_PATH=" + lmp,
});
}
@@ -240,6 +239,7 @@ int main(int argc, array(string) argv)
@@ -241,6 +240,7 @@ int main(int argc, array(string) argv)
({"all",Getopt.NO_ARG,({"--all"}) }),
({"make",Getopt.NO_ARG,({"--make"}) }),
({"auto",Getopt.NO_ARG,({"--auto"}) }),
45,7 → 45,7
({"source",Getopt.HAS_ARG,({"--source"}) }),
({"query",Getopt.HAS_ARG,({"--query"}) }),
({"config_args",Getopt.HAS_ARG,({"--configure-args"}) }),
@@ -276,6 +276,9 @@ int main(int argc, array(string) argv)
@@ -277,6 +277,9 @@ int main(int argc, array(string) argv)
case "auto":
run->depend=run->autoheader=run->autoconf=run->configure=run->make=AUTO;
break;
55,7 → 55,7
}
}
@@ -405,7 +408,7 @@ int main(int argc, array(string) argv)
@@ -421,7 +424,7 @@ int main(int argc, array(string) argv)
run_or_fail( ([ "env":getenv()|
([
"PIKE":run_pike,
/tags/7.8.700-2/debian/pike7.8-core.postinst
43,7 → 43,7
# won't be detected as out-of-date if the Mysql module is later
# installed.
find /usr/lib/$PIKEBIN -name '*.o' -delete
$PIKEBIN -x dump --distquiet -r /usr/lib/$PIKEBIN
$PIKEBIN -x dump --distquiet -r /usr/lib/$PIKEBIN/modules /usr/lib/$PIKEBIN/?.?/modules
}
 
case "$1" in
/tags/7.8.700-2/debian/prerm-snippet
0,0 → 1,4
dpkg -L #PACKAGE# | grep '\.\(pike\|pmod\)$' |
while read file; do
rm -f "${file}.o"
done
/tags/7.8.700-2/debian/pike7.8-dev.install
1,6 → 1,7
usr/include/pike?.?/*
usr/lib/pike?.?/modules/Tools.pmod/AutoDoc.pmod
usr/lib/pike?.?/modules/Tools.pmod/Standalone.pmod/module.pike
usr/lib/pike?.?/modules/Tools.pmod/Standalone.pmod/pmar_install.pike
usr/lib/pike?.?/modules/Tools.pmod/Standalone.pmod/monger.pike
usr/lib/pike?.?/modules/Tools.pmod/Standalone.pmod/precompile.pike
usr/lib/pike?.?/modules/Tools.pmod/Standalone.pmod/*_autodoc.pike
/tags/7.8.700-2/debian/NEWS
1,6 → 1,16
pike7.8 (7.8.352-dfsg-6) unstable; urgency=low
 
A few graphics modules (Graphics, Colors, and Protocols.X.XImage) have
been moved from pike7.8-core to pike7.8-image because they in fact
require the Image module. Similarily, the pmar_install tool, which
requires the module tool, has been moved to pike7.8-dev where that
tool is found.
 
-- Magnus Holmgren <holmgren@debian.org> Sat, 23 Jun 2012 21:19:16 +0200
 
pike7.6 (7.6.112-1) unstable; urgency=low
 
* The Image.TTF module uses the deprecated freetype1 library that is
The Image.TTF module uses the deprecated freetype1 library that is
being phased out. It has therefore been removed. The Image.FreeType
module should be used instead.
 
/tags/7.8.700-2/debian/changelog
1,3 → 1,29
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.
8,6 → 34,35
 
-- 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).
 
-- Magnus Holmgren <holmgren@debian.org> Sun, 24 Jun 2012 19:40:32 +0200
 
pike7.8 (7.8.352-dfsg-6) unstable; urgency=low
 
* Add to each module package a prerm script that deletes .o files for
that package to avoid leaving empty directories around (Closes:
#669955).
* Move the Graphics, Colors, and Protocols.X.XImage module to the -image
package, as those modules require the Image module. Likewise move the
pmar_install standalone tool to the -dev package.
* Link with --as-needed.
* Avoid errors when dumping modules by processing the module directories
(main and compatibility) separately.
 
-- Magnus Holmgren <holmgren@debian.org> Sat, 23 Jun 2012 20:57:14 +0200
 
pike7.8 (7.8.352-dfsg-5) unstable; urgency=low
 
* Build with -O1 on i386 (Closes: #640818).
* smartlink_rpath.patch: Update to recognize Linux 3.x.
* Use dpkg-buildflags to set CFLAGS etc.
* Some cleanup in debian/rules.
 
-- Magnus Holmgren <holmgren@debian.org> Mon, 18 Jun 2012 16:35:35 +0200
 
pike7.8 (7.8.352-dfsg-4) unstable; urgency=low
 
* Correct description of pike7.8-pcre (Closes: #597867).
20,8 → 75,10
slightly sleeker libgnomeui-dev, which should cover (together with
libglade2-dev, which was already listed) everything that worked
previously.
* Move to 7.8-stable branch in SVN, modifying Vcs-Svn in debian/control
to reflect this.
 
-- Magnus Holmgren <holmgren@debian.org> Sun, 20 Mar 2011 17:04:31 +0100
-- Magnus Holmgren <holmgren@debian.org> Sun, 20 Mar 2011 17:55:07 +0100
 
pike7.8 (7.8.352-dfsg-3) unstable; urgency=low
 
/tags/7.8.700-2/debian/rules
21,7 → 21,7
export DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
CFARGSEXTRA = --with-cdebug
CFARGSEXTRA := --with-cdebug
 
ifneq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
export CC=$(DEB_HOST_GNU_TYPE)-gcc
28,21 → 28,19
CFARGSEXTRA += --host=$(DEB_HOST_GNU_TYPE)
endif
 
ifeq (,$(DEB_BUILD_ARCH))
DEB_BUILD_ARCH=$(shell dpkg-architecture -qDEB_BUILD_ARCH)
endif
DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
 
CFLAGS_EXTRA = -g
CPPFLAGS_EXTRA = -DDEBIAN
 
ifdef SSP
SSP_FLAGS=-fstack-protector
endif
 
ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
CFARGSEXTRA += --without-copt
else
CFARGSEXTRA += --with-copt
ifneq (,$(filter $(DEB_HOST_ARCH), i386))
CFARGSEXTRA += --without-copt
export DEB_CFLAGS_MAINT_STRIP := -O2 -O3
export DEB_CFLAGS_MAINT_PREPEND := -O1
else
CFARGSEXTRA += --with-copt
endif
endif
 
ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
51,23 → 49,21
CFARGSEXTRA += --without-rtldebug
endif
 
CFLAGS_EXTRA += $(SSP_FLAGS)
# Temporary workaround for hppa linker issues
ifeq ($(DEB_BUILD_ARCH),hppa)
CFLAGS_EXTRA += -ffunction-sections
export DEB_CFLAGS_MAINT_APPEND += -ffunction-sections
endif
 
ifeq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
INSTALL_PROGRAM += -s
endif
 
EXTRA_ARGS=--with-security
 
export DEB_CPPFLAGS_MAINT_APPEND := -DDEBIAN
export DEB_LDFLAGS_MAINT_APPEND := -Wl,--as-needed
 
DO_MACHINE_CODE=no
ifeq ($(DEB_BUILD_ARCH),i386)
ifeq ($(DEB_HOST_ARCH),i386)
DO_MACHINE_CODE=yes
endif
ifeq ($(DEB_BUILD_ARCH),powerpc)
ifeq ($(DEB_HOST_ARCH),powerpc)
DO_MACHINE_CODE=yes
endif
ifeq ($(DEB_BUILD_ARCH),sparc)
93,9 → 89,17
$(error Version mismatch; buildid.txt: $(VERSION), debian/changelog: $(DEBVERSION))
endif
 
CFLAGS := $(shell dpkg-buildflags --get CFLAGS)
CPPFLAGS := $(shell dpkg-buildflags --get CPPFLAGS)
LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS)
 
# --with-lib-path is just to stop configure from adding all the
# standard library directories with -L as well as -R to LDFLAGS
CFARGS=$(CFARGSEXTRA) \
--with-cflags='$(CFLAGS_EXTRA)' \
--with-cppflags='$(CPPFLAGS_EXTRA)' \
--with-cflags='`dpkg-buildflags --get CFLAGS`' \
--with-cppflags='`dpkg-buildflags --get CPPFLAGS`' \
--with-ldflags='`dpkg-buildflags --get LDFLAGS`' \
--prefix=/usr \
--with-bignums \
--with-gmp \
--with-poll \
131,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 PV.pike Gnome GDK GTKSupport
excluded_modules:=Ssleay Mird Msql msql PDF Ffmpeg Oracle oracle sybase DVB Java TTF Gnome GDK GTKSupport ZXID
# 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))
229,8 → 233,9
dh_testroot -a
dh_install -a -N$(PIKE)-core --sourcedir=debian/tmp $(DH_EXCLUDE)
dh_install -p$(PIKE)-core --sourcedir=debian/tmp $(DH_EXCLUDE) $(DH_ALREADY)
for p in $(MODULE_PACKAGES) $(PIKE)-dev; do \
for p in $(MODULE_PACKAGES); do \
dh_link -p$$p usr/share/doc/$(PIKE)-core usr/share/doc/$$p; \
sed "s/#PACKAGE#/$$p/" debian/prerm-snippet >> debian/$$p.prerm.debhelper; \
done
dh_installdocs -a
dh_installmenu -a
/tags/7.8.700-2/debian/source/lintian-overrides
0,0 → 1,0
pike7.8 source: outdated-autotools-helper-file bundles/patches/nettle-*/config.guess 2005-03-17
/tags/7.8.700-2/debian/pike7.8-image.install
1,6 → 1,7
usr/lib/pike?.?/modules/Image.so
usr/lib/pike?.?/modules/*Image_[!S]*.so
usr/lib/pike?.?/modules/*Image*.pmod
#usr/share/pike?.?/modules/*Image*.pmod*
#usr/share/pike?.?/modules/_Image.pmod
usr/lib/pike?.?/modules/_Image.pmod
usr/lib/pike?.?/modules/Graphics.pmod
usr/lib/pike?.?/modules/Colors.pmod
usr/lib/pike?.?/7.0/modules/Colors.pmod
usr/lib/pike?.?/modules/Protocols.pmod/X.pmod/XImage.pmod