Subversion Repositories pike

Compare Revisions

Ignore whitespace Rev 126 → Rev 148

/tags/7.8.352-dfsg-7/debian/README.source
File deleted
/tags/7.8.352-dfsg-7/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.1
Build-Depends: debhelper (>= 5), bison, sharutils, bc, pkg-config,
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, libiodbc2-dev, libmysqlclient-dev,
libpq-dev, libsqlite3-dev, libpcre3-dev, libsdl-mixer1.2-dev,
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.352-dfsg-7/debian/patches/misplaced_MAXPATHLEN.patch
1,7 → 1,6
From: Samuel Thibault <samuel.thibault@ens-lyon.org>
Subject: Move reserve MAXPATHLEN definition up.
 
@DPATCH@
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
/tags/7.8.352-dfsg-7/debian/patches/smartlink_rpath.patch
1,29 → 1,24
#! /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@
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 @@
--- a/bin/smartlink
+++ b/bin/smartlink
@@ -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
;;
UnixWare\ 7.*)
if test x$LINKING != xno -a "x$RPATH" != x ; then
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 @@
--- a/src/smartlink.c
+++ b/src/smartlink.c
@@ -160,7 +160,7 @@ int main(int argc, char **argv)
full_rpath = rpath;
#ifdef USE_Wl
32,7 → 27,7
#elif defined(USE_Wl_R)
strcat(rpath, "-Wl,-R");
#elif defined(USE_R)
@@ -310,7 +310,7 @@
@@ -310,7 +310,7 @@ int main(int argc, char **argv)
}
rpath_in_use |= add_path(rpath, ld_lib_path);
}
41,7 → 36,7
if (rpath_in_use) {
/* Delete the terminating ':' */
rpath[strlen(rpath) - 1] = 0;
@@ -357,6 +357,7 @@
@@ -357,6 +357,7 @@ int main(int argc, char **argv)
#error Unknown method
#endif
}
/tags/7.8.352-dfsg-7/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
@@ -323,7 +323,8 @@ void dump_files() {
/tags/7.8.352-dfsg-7/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.352-dfsg-7/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.352-dfsg-7/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.352-dfsg-7/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.352-dfsg-7/debian/changelog
1,3 → 1,32
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).
/tags/7.8.352-dfsg-7/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 \
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.352-dfsg-7/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