Subversion Repositories pike-old

Compare Revisions

Ignore whitespace Rev 2 → Rev 3

/trunk/debian/toclean.txt
File deleted
/trunk/debian/dhelp.manual
File deleted
/trunk/debian/tocoredoc.txt
File deleted
/trunk/debian/dhelp.refdoc
File deleted
/trunk/debian/dirs
File deleted
/trunk/debian/todocdoc.txt
File deleted
/trunk/debian/toremove.txt
File deleted
/trunk/debian/pike7.6-pcre.install
1,2 → 1,2
usr/lib/pike/*/lib/modules/*Regexp_PCRE.*
usr/share/pike/*/lib/modules/*Regexp_PCRE.*
usr/lib/pike/*/modules/*Regexp_PCRE.*
usr/share/pike/*/modules/*Regexp_PCRE.*
/trunk/debian/control
3,15 → 3,24
Priority: optional
Maintainer: Magnus Holmgren <magnus@kibibyte.se>
Uploaders: Henrik Andreasson <pike@han.pp.se>
Standards-Version: 3.6.2.1
Build-Depends: debhelper (>> 4.0.0), dpatch, libgdbm-dev, libgmp3-dev, zlib1g-dev | libz-dev, libjpeg-dev, libttf-dev, libmysqlclient15-dev, libreadline5-dev, perl, bison, debhelper, freeglut3-dev (>= 2.2.0-6.1) [alpha hppa], freeglut3-dev [!alpha !hppa], x11proto-gl-dev, libxpm-dev, libglade2-dev, libxml2-dev, libfreetype6-dev, autoconf, libiodbc2-dev, libsane-dev, libpq-dev, libsdl-mixer1.2-dev, libsdl1.2-dev, librsvg2-dev (>= 2.7), libperl-dev, sharutils, libpng12-dev, libtiff4-dev, bc, libpcre3-dev, libbz2-dev, libnettle-dev (>= 1.14-1)
Standards-Version: 3.7.2
Build-Depends: debhelper (>> 4.0.0), dpatch, bison, sharutils, bc,
libgmp3-dev, libnettle-dev (>= 1.14-1),
zlib1g-dev | libz-dev, libbz2-dev, libreadline5-dev,
libgdbm-dev, libiodbc2-dev, libmysqlclient15-dev, libpq-dev,
libperl-dev, libpcre3-dev, libxml2-dev,
libsdl-mixer1.2-dev, libsdl1.2-dev, libsane-dev,
x11proto-gl-dev, libxpm-dev, libglade2-dev, libfreetype6-dev,
freeglut3-dev (>= 2.2.0-6.1) [alpha hppa], freeglut3-dev [!alpha !hppa],
libjpeg-dev, libtiff4-dev, librsvg2-dev (>= 2.7), libpng12-dev
Build-Conflicts: libutahglx-dev
Homepage: http://pike.ida.liu.se/
 
Package: pike7.6-core
Architecture: any
Depends: ${shlibs:Depends}
Suggests: pike7.6-doc
Recommends: pike7.6-image (=${Source-Version})
Recommends: pike7.6-image (= ${binary:Version})
Description: Powerful interpreted programming language
Pike is an interpreted, object-oriented, dynamic programming language
with a syntax similar to C. It includes many powerful data types and
24,9 → 33,9
 
Package: pike7.6
Architecture: all
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})
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
packages that together make up the recommended Pike installation.
44,9 → 53,76
.
http://pike.ida.liu.se/
 
Package: pike7.6-dev
Architecture: any
Depends: ${shlibs:Depends}, pike7.6-core (>= ${source:Version})
Description: Development files for Pike 7.6
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 Pike environment.
.
Pike is an interpreted programming language, for more information
see the description of the pike7.6-core package or visit the URL
below.
.
http://pike.ida.liu.se/
 
Package: pike7.6-manual
Architecture: all
Section: doc
Description: Pike 7.6 manual
The Pike manual auto-generated from the sources.
.
Pike is an interpreted programming language, for more information
see the description of the pike7.6-core package or visit the URL
below.
.
http://pike.ida.liu.se/
 
Package: pike7.6-reference
Architecture: all
Section: doc
Description: Pike 7.6 reference
The Pike reference auto-generated from the sources.
.
Pike is an interpreted programming language, for more information
see the description of the pike7.6-core package or visit the URL
below.
.
http://pike.ida.liu.se/
 
Package: pike7.6-doc
Architecture: all
Section: doc
Depends: pike7.6-manual (>= ${source:Version}), pike7.6-reference (>= ${source:Version})
Description: Pike 7.6 documentation meta package
This package depends upon all the Pike 7.6 documentation
packages. Note that the download and installation sizes might be very
large.
.
Pike is an interpreted programming language, for more information
see the description of the pike7.6-core package or visit the URL
below.
.
http://pike.ida.liu.se/
 
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
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)!
.
Pike is an interpreted programming language, for more information
see the description of the pike7.6-core package or visit the URL
below.
.
http://pike.ida.liu.se/
 
Package: pike7.6-mysql
Architecture: any
Depends: ${shlibs:Depends}, pike7.6-core (=${Source-Version})
Depends: ${shlibs:Depends}, pike7.6-core (= ${binary:Version})
Description: Mysql module for Pike
This Pike module provides access to Mysql databases.
.
58,7 → 134,7
 
Package: pike7.6-pg
Architecture: any
Depends: ${shlibs:Depends}, pike7.6-core (=${Source-Version})
Depends: ${shlibs:Depends}, pike7.6-core (= ${binary:Version})
Description: Postgres module for Pike
This Pike module provides access to Postgres databases.
.
70,7 → 146,7
 
Package: pike7.6-odbc
Architecture: any
Depends: ${shlibs:Depends}, pike7.6-core (=${Source-Version})
Depends: ${shlibs:Depends}, pike7.6-core (= ${binary:Version})
Description: Odbc module for Pike
This Pike module provides glue to the iOdbc interface.
.
82,8 → 158,8
 
Package: pike7.6-svg
Architecture: any
Depends: ${shlibs:Depends}, pike7.6-core (=${Source-Version})
Suggests: pike7.6-image (=${Source-Version})
Depends: ${shlibs:Depends}, pike7.6-core (= ${binary:Version})
Suggests: pike7.6-image (= ${binary:Version})
Description: SVG format support for Pike
This module provides an SVG graphics format module. It has
been separated from the pike7.6-image module because of its
97,8 → 173,8
 
Package: pike7.6-image
Architecture: any
Depends: ${shlibs:Depends}, pike7.6-core (=${Source-Version})
Suggests: pike7.6-svg (=${Source-Version})
Depends: ${shlibs:Depends}, pike7.6-core (= ${binary:Version})
Suggests: pike7.6-svg (= ${binary:Version})
Description: Image module for Pike
This module provides many powerful image processing functions to
Pike programs.
111,7 → 187,7
 
Package: pike7.6-sdl
Architecture: any
Depends: ${shlibs:Depends}, pike7.6-core (=${Source-Version})
Depends: ${shlibs:Depends}, pike7.6-core (= ${binary:Version})
Description: SDL module for Pike
This module provides the Pike interface to the SDL library.
.
123,7 → 199,7
 
Package: pike7.6-gdbm
Architecture: any
Depends: ${shlibs:Depends}, pike7.6-core (=${Source-Version})
Depends: ${shlibs:Depends}, pike7.6-core (= ${binary:Version})
Description: Gdbm module for Pike
This Pike module provides access to gdbm databases.
.
135,7 → 211,7
 
Package: pike7.6-gl
Architecture: any
Depends: ${shlibs:Depends}, pike7.6-core (=${Source-Version})
Depends: ${shlibs:Depends}, pike7.6-core (= ${binary:Version})
Description: Mesa module for Pike
This Pike module provides access to the Mesa 3D graphics library.
.
147,7 → 223,7
 
Package: pike7.6-sane
Architecture: any
Depends: ${shlibs:Depends}, pike7.6-core (=${Source-Version})
Depends: ${shlibs:Depends}, pike7.6-core (= ${binary:Version})
Description: SANE module for Pike
This Pike module provides access to SANE.
.
159,10 → 235,9
 
Package: pike7.6-perl
Architecture: any
Depends: ${shlibs:Depends}, pike7.6-core (=${Source-Version})
Depends: ${shlibs:Depends}, pike7.6-core (= ${binary:Version})
Description: Perl module for Pike
This Pike module enables one to embed perl in the pike
programs.
This Pike module enables one to embed perl in pike programs.
.
Pike is an interpreted programming language, for more information
see the description of the pike7.6-core package or visit the URL
172,10 → 247,10
 
Package: pike7.6-pcre
Architecture: any
Depends: ${shlibs:Depends}, pike7.6-core (=${Source-Version})
Depends: ${shlibs:Depends}, pike7.6-core (= ${binary:Version})
Description: PCRE module for Pike
This Pike module enables one to use the PCRE (Perl regular
expressions) from within the Pike programs.
expressions) from within Pike programs.
.
Pike is an interpreted programming language, for more information
see the description of the pike7.6-core package or visit the URL
185,10 → 260,10
 
Package: pike7.6-bzip2
Architecture: any
Depends: ${shlibs:Depends}, pike7.6-core (=${Source-Version})
Depends: ${shlibs:Depends}, pike7.6-core (= ${binary:Version})
Description: Bzip2 module for Pike
This Pike module enables one to use the Bzip2 compression
algorithm from within the Pike programs.
algorithm from within Pike programs.
.
Pike is an interpreted programming language, for more information
see the description of the pike7.6-core package or visit the URL
195,69 → 270,3
below.
.
http://pike.ida.liu.se/
 
Package: pike7.6-dev
Architecture: all
Depends: ${shlibs:Depends}, pike7.6-core (>= ${Source-Version})
Description: Development files for Pike 7.6
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
Pike environment.
.
Pike is an interpreted programming language, for more information
see the description of the pike7.6-core package or visit the URL
below.
.
http://pike.ida.liu.se/
 
Package: pike7.6-manual
Architecture: all
Section: doc
Description: Pike 7.6 manual
The Pike manual auto-generated from the sources.
.
Pike is an interpreted programming language, for more information
see the description of the pike7.6-core package or visit the URL
below.
.
http://pike.ida.liu.se/
 
Package: pike7.6-reference
Architecture: all
Section: doc
Description: Pike 7.6 reference
The Pike reference auto-generated from the sources.
.
Pike is an interpreted programming language, for more information
see the description of the pike7.6-core package or visit the URL
below.
.
http://pike.ida.liu.se/
 
Package: pike7.6-doc
Architecture: all
Section: doc
Depends: pike7.6-manual (>= ${Source-Version}), pike7.6-reference (>= ${Source-Version})
Description: Pike 7.6 documentation meta package
This package depends upon all the Pike 7.6 documentation packages. Note
that the download and installation sizes might be very large.
.
Pike is an interpreted programming language, for more information
see the description of the pike7.6-core package or visit the URL
below.
.
http://pike.ida.liu.se/
 
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
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)!
.
Pike is an interpreted programming language, for more information
see the description of the pike7.6-core package or visit the URL
below.
.
http://pike.ida.liu.se/
/trunk/debian/pike7.6-svg.install
1,0 → 0,0
usr/lib/pike/*/lib/modules/*Image_SVG.so
usr/lib/pike/*/modules/*Image_SVG.so
/trunk/debian/control.disabled
9,3 → 9,16
below.
.
http://pike.ida.liu.se/
 
Package: pike7.6-java
Architecture: any
Depends: ${shlibs:Depends}, pike7.6-core (= ${binary:Version})
Description: Java module for Pike
This Pike module enables one to call Java code from Pike programs.
.
Pike is an interpreted programming language, for more information
see the description of the pike7.6-core package or visit the URL
below.
.
http://pike.ida.liu.se/
 
/trunk/debian/patches/01_master.in.dpatch
1,18 → 1,17
#! /bin/sh /usr/share/dpatch/dpatch-run
## 01_master.in.dpatch by <magnus@proffe.kibibyte.se>
## 01_master.in.dpatch by <magnus@kibibyte.se>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Add local site-pike directories to master.pike.in
 
@DPATCH@
 
diff -U3 -Narp pike7.6-7.6.24/lib/master.pike.in pike7.6-7.6.24.new/lib/master.pike.in
--- pike7.6-7.6.24/lib/master.pike.in 2004-07-23 14:17:24 +0200
+++ pike7.6-7.6.24.new/lib/master.pike.in 2005-01-06 23:27:54 +0100
@@ -565,6 +565,14 @@ string normalize_path( string path )
#else
return replace(path,"\\","/");
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-09-26 09:26:21.000000000 +0200
@@ -1115,6 +1115,14 @@
include_prefix = "¤include_prefix¤";
#endif
system_module_path=pike_module_path;
+
+ // Debian paths
+ add_include_path("/usr/local/include/pike");
23,4 → 22,4
+ add_module_path("/usr/local/share/pike"+__REAL_MAJOR__+"."+__REAL_MINOR__+"/site_pike");
}
//! Mapping containing the cache of currently compiled files.
/trunk/debian/patches/05_install.pike.dpatch
5,21 → 5,10
## DP: Allow include_prefix to be separately overridden in install.pike
 
@DPATCH@
 
--- 7.6/bin/install.pike 2005-12-30 14:33:48.450200000 +0100
+++ 7.6.fix/bin/install.pike 2005-12-30 15:14:24.806462750 +0100
@@ -1197,7 +1197,7 @@ int pre_install(array(string) argv)
exec_prefix=combine_path(prefix,"bin");
lib_prefix=combine_path(prefix,"lib");
doc_prefix=combine_path(prefix,"doc");
- include_prefix=combine_path(prefix,"include","pike");
+ include_prefix=vars->include_prefix||combine_path(prefix,"include","pike");
man_prefix=combine_path(prefix,"man");
if (export) {
low_install_file(combine_path(vars->TMP_BINDIR,"install.pike"),
--- 7.6.orig/src/Makefile.in 2005-07-28 01:19:28.618585000 +0200
+++ 7.6/src/Makefile.in 2005-08-16 12:53:13.127535720 +0200
@@ -53,7 +53,7 @@ man_prefix = $(prefix)/man
diff -urNad trunk~/src/Makefile.in trunk/src/Makefile.in
--- trunk~/src/Makefile.in 2006-10-20 15:40:28.000000000 +0200
+++ trunk/src/Makefile.in 2007-09-26 09:51:13.000000000 +0200
@@ -53,7 +53,7 @@
# TESTARGS = -F -a
# Arguments for install.pike used by the install targets.
28,7 → 17,7
#
# use bison please, yacc isn't good enough.
@@ -495,7 +495,7 @@ install: pike tools
@@ -506,7 +506,7 @@
MANDIR_SRC="$(MANDIR_SRC)" \
man_prefix="$(man_prefix)" pike_name=$(pike_name) \
fakeroot="$(buildroot)" PIKE_MODULE_RELOC="$(PIKE_MODULE_RELOC)" \
/trunk/debian/patches/10_misplaced_MAXPATHLEN.dpatch
0,0 → 1,31
#!/bin/sh /usr/share/dpatch/dpatch-run
## 10_misplaced_MAXPATHLEN.dpatch by Samuel Thibault <samuel.thibault@ens-lyon.org>
##
## All lines beginning with `## DP:' are a description of the patch.
## 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 @@
#endif
+#ifndef MAXPATHLEN
+#define MAXPATHLEN 32768
+#endif
+
struct array *encode_stat(PIKE_STAT_T *s)
{
struct array *a;
@@ -1113,9 +1117,6 @@
size*=2;
} while (size < 10000);
#else
-#ifndef MAXPATHLEN
-#define MAXPATHLEN 32768
-#endif
tmp=xalloc(MAXPATHLEN+1);
THREADS_ALLOW_UID();
e = getwd(tmp);
/trunk/debian/patches/00list
4,3 → 4,4
04_make_variables_fpic
05_install.pike
07_dynamic_module_makefile.in-libgcc
10_misplaced_MAXPATHLEN
/trunk/debian/pike7.6-perl.install
1,2 → 1,2
usr/lib/pike/*/lib/modules/*Perl.*
usr/share/pike/*/lib/modules/*Perl.*
usr/lib/pike/*/modules/*Perl.*
usr/share/pike/*/modules/*Perl.*
/trunk/debian/pike7.6-gl.install
1,4 → 1,2
usr/lib/pike/*/lib/modules/*GL.*
usr/share/pike/*/lib/modules/*GL.*
usr/lib/pike/*/lib/modules/*GLUT.*
usr/share/pike/*/lib/modules/*GLUT.*
usr/lib/pike/*/modules/*GL*
usr/share/pike/*/modules/*GL*
/trunk/debian/pike7.6-odbc.install
1,4 → 1,4
usr/lib/pike/*/lib/modules/*Odbc.*
usr/share/pike/*/lib/modules/*Odbc.*
usr/lib/pike/*/lib/modules/Sql.pmod/odbc*
usr/share/pike/*/lib/modules/Sql.pmod/odbc*
usr/lib/pike/*/modules/*Odbc.*
usr/share/pike/*/modules/*Odbc.*
usr/lib/pike/*/modules/Sql.pmod/odbc*
usr/share/pike/*/modules/Sql.pmod/odbc*
/trunk/debian/pike7.6-gdbm.install
1,2 → 1,2
usr/lib/pike/*/lib/modules/*Gdbm.*
usr/share/pike/*/lib/modules/*Gdbm.*
usr/lib/pike/*/modules/*Gdbm.*
usr/share/pike/*/modules/*Gdbm.*
/trunk/debian/pike7.6-dev.dirs
1,3 → 1,2
usr/share/emacs/
usr/bin/
usr/include/pike/
/trunk/debian/pike7.6-dev.install
1,0 → 0,0
usr/include/pike/*/*
usr/bin/pike*-config
/trunk/debian/menu
1,4 → 1,4
?package(pike7.6-core):needs=text section=Apps/Programming\
?package(pike7.6-core):needs="text" section="Apps/Programming"\
title="Pike 7.6 HILFE" \
command="/usr/bin/pike7.6" \
icon="/usr/share/pixmaps/pike/pike7.6.xpm"
icon="/usr/share/pixmaps/pike7.6.xpm"
/trunk/debian/pike7.6-bzip2.install
1,2 → 1,2
usr/lib/pike/*/lib/modules/*Bz2.*
usr/share/pike/*/lib/modules/*Bz2.*
usr/lib/pike/*/modules/*Bz2.*
usr/share/pike/*/modules/*Bz2.*
/trunk/debian/pike7.6-sane.install
1,2 → 1,2
usr/lib/pike/*/lib/modules/*SANE.*
usr/share/pike/*/lib/modules/*SANE.*
usr/lib/pike/*/modules/*SANE.*
usr/share/pike/*/modules/*SANE.*
/trunk/debian/NEWS
0,0 → 1,7
pike7.6 (7.6.112-1) unstable; urgency=low
 
* 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.
 
-- Magnus Holmgren <magnus@kibibyte.se> Tue, 25 Sep 2007 20:21:17 +0200
/trunk/debian/pike7.6-core.install
0,0 → 1,8
usr/bin/pike7.6
usr/lib/pike/*/?.?
usr/lib/pike/*/include
usr/lib/pike/*/modules
usr/lib/pike/*/master.pike
usr/lib/pike/*/master.pike.o
usr/share/pixmaps
usr/share/man
/trunk/debian/changelog
6,10 → 6,44
[ Magnus Holmgren ]
* New maintainers (Closes: #411684).
* Use dpatch to apply patches.
* Radically clean up debian/rules.
* Radically clean up debian/rules (Closes: #424334).
* Delete redundant dhelp files (dhelp uses doc-base metadata since
long ago).
* Change directory structure and get rid of an unnecessary directory level:
- Pike modules and include files, and master.pike are now in
/usr/lib/pike/<version>/modules instead of
/usr/lib/pike/<version>/lib/modules.
- The pike executable is now in /usr/bin itself, instead of in
/usr/lib/pike/<version>/bin with just a symlink in /usr/bin.
- .pike and .pmod files are no longer moved to /usr/share/pike. It's
not that important that all files in /usr/lib are actually
platform-specific. All the symlinks are thus eliminated.
* Add patch from Samuel Thibault to fix FTBFS on HURD (Closes: #434581).
* Move modules GLU and GLUE to pike7.6-gl, where they belong.
* Drop Image.TTF from pike7.6-image so that Debian can get rid of the old
freetype1 library (Closes: #431784).
* Fix 01_master.in.dpatch; the Debian-specific add_*_path() calls were
completely off.
 
-- Magnus Holmgren <magnus@kibibyte.se> Tue, 07 Aug 2007 13:31:58 +0200
-- Magnus Holmgren <magnus@kibibyte.se> Tue, 25 Sep 2007 20:21:17 +0200
 
pike7.6 (7.6.93-3) unstable; urgency=low
 
* QA upload.
* Set maintainer to QA Group; Orphaned: #411684
* Conforms with latest Standards Version 3.7.2
* Remove duplicate build-dependency on debhelper
* Add quotes to debian/menu
 
-- Michael Ablassmeier <abi@debian.org> Thu, 15 Mar 2007 10:29:51 +0100
 
pike7.6 (7.6.93-2) unstable; urgency=low
 
* Please change postgresql-dev build dependency to libpq-dev (Closes:
#409770)
 
-- Marek Habersack <grendel@debian.org> Tue, 13 Feb 2007 18:41:28 +0100
 
pike7.6 (7.6.93-1) unstable; urgency=low
 
* The latest cvs snapshot
/trunk/debian/rules
13,9 → 13,6
#export DH_VERBOSE=1
include /usr/share/dpatch/dpatch.make
 
PIKEV=7.6
PIKE=pike$(PIKEV)
 
ifdef CCVER
CC=gcc-$(CCVER)
else
38,11 → 35,6
CFARGSEXTRA=--without-rtldebug --without-cdebug --without-debug
endif
 
# Temporary workaround for hppa linker issues
ifeq ($(DEB_BUILD_ARCH),hppa)
CFLAGS_EXTRA += -ffunction-sections
endif
 
ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
CFARGSEXTRA += --with-rtldebug --with-cdebug --with-debug
endif
76,11 → 68,19
MACHINE_OPTS=--without-machine-code
endif
 
VERSION:=$(shell dpkg-parsechangelog | grep ^Version | sed -e 's/Version: //;s/-[^-]*$$//')
OS=$(shell uname -srm|sed -e 's/ /-/g'|tr '[A-Z]' '[a-z]'|tr '/' '_')
BUILDDIR=build/$(OS)
DEBVERSION:=$(shell dpkg-parsechangelog | sed -ne 's/Version: *\(.*\)-.*$$/\1/p')
MAJOR:=$(shell sed -ne 's/major://p' buildid.txt)
MINOR:=$(shell sed -ne 's/minor://p' buildid.txt)
BUILD:=$(shell sed -ne 's/build://p' buildid.txt)
PIKEV:=$(MAJOR).$(MINOR)
VERSION:=$(MAJOR).$(MINOR).$(BUILD)
PIKE:=pike$(PIKEV)
 
ifneq ($(VERSION),$(DEBVERSION))
$(error Version mismatch; buildid.txt: $(VERSION), debian/changelog: $(DEBVERSION))
endif
 
CFARGS=$(CFARGSEXTRA) \
--prefix=/usr
--with-cflags="$(CFLAGS_EXTRA)" \
--with-cppflags="$(CPPFLAGS_EXTRA)" \
--with-bignums \
88,12 → 88,10
--with-poll \
--with-zlib \
--with-freetype \
--with-ttflib \
--without-ttflib \
--with-libnettle \
--without-libpdf \
--without-libpanda \
--without-sybase \
--with-java \
--without-java \
--with-odbc \
--with-sane \
--with-postgres \
102,15 → 100,27
--with-perl \
--without-ffmpeg \
--without-libpdf \
--without-libpanda $(MACHINE_OPTS) $(EXTRA_ARGS) \
--without-libpanda \
--without-GTK \
--with-GTK2
--without-GTK2 \
$(MACHINE_OPTS) $(EXTRA_ARGS)
 
RUNPIKE=$(CURDIR)/$(BUILDDIR)/pike -DNOT_INSTALLED -DPRECOMPILED_SEARCH_MORE -m$(CURDIR)/$(BUILDDIR)/master.pike
RUNPIKE2=$(CURDIR)/debian/$(PIKE)-core/usr/bin/pike -m$(CURDIR)/$(BUILDDIR)/lib/master.pike
PIKE_FAKEROOT=$(CURDIR)/debian/$(PIKE)-core
PIKE_FAKEROOT_OMIT=$(BUILDDIR)*:$(CURDIR)/lib*:$(CURDIR)/src*:$(CURDIR)/bin*:$(CURDIR)/man*:$(BUILDDIR)/lib*:$(CURDIR)*:$(CURDIR)/debian/$(PIKE)-core*
include_prefix=/usr/include/pike/$(VERSION)
lib_prefix=/usr/lib/pike/$(VERSION)
 
MODULE_PACKAGES=$(shell dh_listpackages -a -N $(PIKE)-core -N $(PIKE)-dev)
#{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 Msql msql PDF Ffmpeg Oracle oracle sybase Gnome GTK GDK DVB Java TTF
# 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))
DH_ALREADY=`for p in $(MODULE_PACKAGES); do \
find debian/$$p/usr/lib/pike/*/* -type f -printf "-X%P "; done`
 
TMP=$(CURDIR)/debian/tmp
 
export CFLAGS CC PIKE VERSION
 
build-arch: build-arch-stamp
126,10 → 136,6
dh_testdir
 
# Add here command to compile/build the arch indep package.
# It's ok not to do anything here, if you don't need to build
# anything for this package.
#/usr/bin/docbook-to-man debian/$(PIKE).sgml > $(PIKE).1
$(MAKE) documentation CONFIGUREARGS="$(CFARGS)"
touch build-indep-stamp
 
137,7 → 143,6
 
clean: clean-patched unpatch
dh_clean
rm -rf debian/pike7.6-gtk
 
clean-patched:
dh_testdir
149,124 → 154,62
rm -rf refdoc/modref refdoc/traditional_manual
 
install: DH_OPTIONS=
install: build
install: build-arch
dh_testdir
dh_testroot
dh_clean -k
dh_installdirs
 
# Add here commands to install the package into debian/tmp.
$(MAKE) -C$(BUILDDIR)/ \
buildroot=$(CURDIR)/debian/tmp \
prefix=/usr/lib \
$(MAKE) INSTALLARGS=--traditional \
buildroot=$(TMP) \
prefix=/usr \
man_prefix=/usr/share/man \
lib_prefix="$(lib_prefix)" \
include_prefix="$(include_prefix)" \
pike_name=/usr/bin/$(PIKE) \
include_prefix="/usr/include/pike/$(VERSION)/" \
install
install_nodoc
 
# Some cleaning
# -rm -f `find $(CURDIR)/debian/tmp/usr/lib/pike/$(VERSION)/ -name ".autodoc" -type f -print`
# -@for f in `cat $(CURDIR)/debian/toremove.txt | sed -e 's/@PIKE@/$(PIKE)/g;s/@VERSION@/$(VERSION)/g'`; do \
# echo Removing $(CURDIR)/debian/$(PIKE)-core/$$f ; \
# rm $(CURDIR)/debian/$(PIKE)-core/$$f &> /dev/null || echo " FAILED"; \
# done
# Some cleaning
find "$(TMP)$(lib_prefix)" -name '.autodoc' -type f -exec rm -f '{}' ';'
 
# an eye-candy
install -d -m 755 -o root -g root $(CURDIR)/debian/$(PIKE)-core/usr/share/pixmaps/pike
install -m 644 -o root -g root $(CURDIR)/debian/pike.xpm $(CURDIR)/debian/$(PIKE)-core/usr/share/pixmaps/pike/$(PIKE).xpm
install -d -m755 $(TMP)/usr/share/pixmaps
install -m644 debian/pike.xpm $(TMP)/usr/share/pixmaps/$(PIKE).xpm
mv $(TMP)/usr/bin/pike $(TMP)/usr/bin/$(PIKE)
mv $(TMP)/usr/share/man/man1/pike.1 $(TMP)/usr/share/man/man1/$(PIKE).1
 
# install the docs
mkdir -p $(CURDIR)/debian/$(PIKE)-doc/usr/share/doc/$(PIKE)-doc/html/manual
dh_install --sourcedir=$(CURDIR) -p$(PIKE)-manual refdoc/traditional_manual/* usr/share/doc/$(PIKE)-doc/html/manual
mkdir -p $(CURDIR)/debian/$(PIKE)-manual/usr/share/doc/$(PIKE)-doc/html/manual
install -m 644 -o root -g root $(CURDIR)/debian/dhelp.manual $(CURDIR)/debian/$(PIKE)-manual/usr/share/doc/$(PIKE)-doc/html/manual/.dhelp
 
mkdir -p $(CURDIR)/debian/$(PIKE)-doc/usr/share/doc/$(PIKE)-doc/html/reference
mkdir -p $(CURDIR)/debian/$(PIKE)-reference/usr/share/doc/$(PIKE)-doc/html/reference/
dh_install --sourcedir=$(CURDIR) -p$(PIKE)-reference refdoc/modref/* usr/share/doc/$(PIKE)-doc/html/reference
install -m 644 -o root -g root $(CURDIR)/debian/dhelp.refdoc $(CURDIR)/debian/$(PIKE)-reference/usr/share/doc/$(PIKE)-doc/html/reference/.dhelp
 
ln -sf ../lib/pike/$(VERSION)/bin/pike $(CURDIR)/debian/$(PIKE)-core/usr/bin/$(PIKE)
install -m 644 -o root -g root $(CURDIR)/man/pike.1 $(CURDIR)/debian/$(PIKE)-core/usr/share/man/man1/$(PIKE).1
rm -rf $(CURDIR)/debian/$(PIKE)-core/usr/lib/pike/$(VERSION)/man/
 
install -d -m 755 -o root -g root $(CURDIR)/debian/$(PIKE)-core/usr/include/pike/
mv $(CURDIR)/debian/$(PIKE)-core/usr/lib/pike/$(VERSION)/include/pike \
$(CURDIR)/debian/$(PIKE)-core/usr/include/pike/$(VERSION) ; \
rm -rf $(CURDIR)/debian/$(PIKE)-core/usr/lib/pike/$(VERSION)/include
chmod 644 `find $(CURDIR)/debian/$(PIKE)-core/usr/include/pike/$(VERSION)/ -type f -print`
 
# move all the *.pmod and *.pike files to /usr/share recreating the structure
install -d -m 755 -o root -g root $(CURDIR)/debian/$(PIKE)-core/usr/share/pike/$(VERSION)
for f in `(cd $(CURDIR)/debian/$(PIKE)-core/usr/lib/pike/$(VERSION)/lib/ && find -name "*.pmod" -print -o -name "*.pike" -print)`; do \
install -d -m 755 -o root -g root $(CURDIR)/debian/$(PIKE)-core/usr/share/pike/$(VERSION)/lib/`dirname $$f`/; \
if [ -f $(CURDIR)/debian/$(PIKE)-core/usr/lib/pike/$(VERSION)/lib/$$f ]; then \
mv $(CURDIR)/debian/$(PIKE)-core/usr/lib/pike/$(VERSION)/lib/$$f $(CURDIR)/debian/$(PIKE)-core/usr/share/pike/$(VERSION)/lib/$$f; \
(echo /usr/share/pike/$(VERSION)/lib/$$f /usr/lib/pike/$(VERSION)/lib/$$f | sed -e 's#/./#/#g') >> $(CURDIR)/debian/links; \
fi; \
# Fix permissions and shebang lines
-for f in `find $(TMP)/usr/bin $(TMP)/usr/lib -type f`; do \
if file $$f | grep -q "script"; then \
chmod a+x $$f; \
sed -ri -e 's@#!.*NOMODULE@#!/usr/bin/$(PIKE)@' \
-e 's@#! */usr/local/bin/pike@#!/usr/bin/$(PIKE)@' \
-e 's@#! */usr/bin/env.*pike@#!/usr/bin/$(PIKE)@' \
$$f; \
fi; \
done
dh_link && rm -f $(CURDIR)/debian/links
 
sed -e "`$(RUNPIKE) -e 'write("s#@CFLAGS@#%s#g;s/@LDFLAGS@//g;s/@MAJOR@/%d/g; s/@MINOR@/%d/g; s/@BUILD@/%d/g","-I/usr/include/pike/$(VERSION)/", __REAL_MAJOR__, __REAL_MINOR__, __REAL_BUILD__);'`" \
$(CURDIR)/debian/pike-config.in > $(CURDIR)/debian/$(PIKE)-dev/usr/bin/$(PIKE)-config
 
# Fix permissions
find $(CURDIR)/debian/$(PIKE)-core/usr/lib/pike/$(VERSION) -type f -exec chmod -x '{}' ';'
chmod 755 $(CURDIR)/debian/$(PIKE)-core/usr/lib/pike/$(VERSION)/bin/pike
 
for f in `find $(CURDIR)/debian/$(PIKE)-core/usr/bin -type f` \
`find $(CURDIR)/debian/$(PIKE)-core/usr/lib/pike/$(VERSION) -type f` \
`find $(CURDIR)/debian/$(PIKE)-core/usr/share/pike/$(VERSION) -type f`; \
do \
file $$f | grep "script" >/dev/null \
&& perl -pi -e 's@#\!.*NOMODULE@#\!/usr/bin/$(PIKE)@' $$f \
&& chmod a+x $$f; \
file $$f | grep "script" >/dev/null \
&& perl -pi -e 's@#\!.*/usr/local/bin/pike@#\!/usr/bin/$(PIKE)@' $$f; \
file $$f | grep "script" >/dev/null \
&& perl -pi -e 's@#\!.*/usr/bin/env.*pike@#\!/usr/bin/$(PIKE)@' $$f; \
done; exit 0
 
find build/ -name precompile.sh -exec 'cp {} $(CURDIR)/debian/$(PIKE)-core/usr/include/pike/$(VERSION)' \;
find build/ -name smartlink -exec 'cp {} $(CURDIR)/debian/$(PIKE)-core/usr/include/pike/$(VERSION)' \;
cp ./bin/fixdepends.sh ./bin/install_module ./bin/mktestsuite $(CURDIR)/debian/$(PIKE)-core/usr/include/pike/$(VERSION)
 
# Some more permission changes
for f in run_autoconfig precompile.sh smartlink fixdepends.sh install_module mktestsuite; do \
chmod 755 $(CURDIR)/debian/$(PIKE)-core/usr/include/pike/$(VERSION)/$$f ; \
done
 
# Create the documentation links to save space
for f in `cat $(CURDIR)/debian/tocoredoc.txt`; do \
dh_link -p$$f /usr/share/doc/$(PIKE)-core /usr/share/doc/$$f ; \
done
 
# install the specs file
# Install the specs file
sed -e 's/@PIKEVERSION@/$(VERSION)/g' \
-e 's;@CONFIGURE_ARGS@;$(CFARGS);g' \
< $(CURDIR)/debian/specs.in > $(CURDIR)/debian/$(PIKE)-core/usr/include/pike/$(VERSION)/specs
< debian/specs.in > $(TMP)$(include_prefix)/specs
 
# pike -x module fix
echo 's;\$$\(MODULE_BASE\)/dynamic_module_makefile;\$$\(PIKE_SRC_DIR\)/dynamic_module_makefile;g' > \
$(CURDIR)/debian/sed-script.tmp
sed -r -f $(CURDIR)/debian/sed-script.tmp < \
$(CURDIR)/debian/$(PIKE)-core/usr/include/pike/$(VERSION)/dynamic_module_makefile > \
$(CURDIR)/debian/$(PIKE)-core/usr/include/pike/$(VERSION)/dynamic_module_makefile.new
mv $(CURDIR)/debian/$(PIKE)-core/usr/include/pike/$(VERSION)/dynamic_module_makefile.new \
$(CURDIR)/debian/$(PIKE)-core/usr/include/pike/$(VERSION)/dynamic_module_makefile
rm -f $(CURDIR)/debian/sed-script.tmp
# Install pike-config
sed -e "s#@CFLAGS@#$(include_prefix)#;s/@LDFLAGS@//" \
-e "s/@MAJOR@/$(MAJOR)/;s/@MINOR@/$(MINOR)/;s/@BUILD@/$(BUILD)/" \
debian/pike-config.in > $(TMP)/usr/bin/$(PIKE)-config
 
rm -r $(CURDIR)/debian/$(PIKE)-core/usr/lib/pike/$(VERSION)/doc
dh_install --sourcedir=debian/tmp
# # pike -x module fix
sed -i -e 's;\$$(MODULE_BASE)/dynamic_module_makefile;\$$(PIKE_SRC_DIR)/dynamic_module_makefile;g' \
$(TMP)$(include_prefix)/dynamic_module_makefile
 
# Need to move dynamic_module_makefile back to -core, since it contains platform-specific stuff
# mv $(CURDIR)/debian/$(PIKE)-dev/usr/include/pike/$(VERSION)/dynamic_module_makefile \
# $(CURDIR)/debian/$(PIKE)-core/usr/include/pike/$(VERSION)/dynamic_module_makefile
 
# Build architecture-independent files here.
# Pass -i to all debhelper commands in this target to reduce clutter.
binary-indep: build-indep install
binary-indep: build-indep
dh_testdir -i
dh_testroot -i
# install the docs
dh_install -p$(PIKE)-manual refdoc/traditional_manual/* usr/share/doc/$(PIKE)-doc/html/manual
dh_install -p$(PIKE)-reference refdoc/modref/* usr/share/doc/$(PIKE)-doc/html/reference
dh_install -i -N$(PIKE)-manual -N$(PIKE)-reference --sourcedir=$(TMP)
dh_installdocs -i
dh_installchangelogs -i
dh_link -i
282,14 → 225,18
dh_testdir -a
dh_testroot -a
# dh_installdebconf -a
dh_install -a --sourcedir=debian/tmp -N$(PIKE)-core $(DH_EXCLUDE)
dh_install -p$(PIKE)-core --sourcedir=debian/tmp $(DH_EXCLUDE) $(DH_ALREADY)
for p in $(MODULE_PACKAGES); do \
dh_link -p$$p usr/share/doc/$(PIKE)-core usr/share/doc/$$p; \
done
dh_installdocs -a
dh_installmenu -a -p$(PIKE)-core
dh_installman -p$(PIKE)-core debian/tmp/usr/share/man/man1/$(PIKE).1
dh_installmenu -a
# dh_installman -a
dh_installchangelogs -a
dh_strip -a
dh_link -a
dh_compress -a
dh_fixperms -a
dh_fixperms -a -X/run_autoconfig -X/precompile.sh -X/smartlink -X/fixdepends.sh -X/install_module -X/mktestsuite
dh_installdeb -a
dh_shlibdeps -a
dh_gencontrol -a
/trunk/debian/pike7.6-mysql.install
1,6 → 1,6
usr/lib/pike/*/lib/include/mysql.h
usr/lib/pike/*/lib/7.4/include/mysql.h
usr/lib/pike/*/lib/modules/*Mysql.*
usr/share/pike/*/lib/modules/*Mysql.*
usr/lib/pike/*/lib/modules/Sql.pmod/mysql*
usr/share/pike/*/lib/modules/Sql.pmod/mysql*
usr/lib/pike/*/include/mysql.h
usr/lib/pike/*/7.4/include/mysql.h
usr/lib/pike/*/modules/*Mysql.*
usr/share/pike/*/modules/*Mysql.*
usr/lib/pike/*/modules/Sql.pmod/mysql*
usr/share/pike/*/modules/Sql.pmod/mysql*
/trunk/debian/pike7.6-pg.install
1,6 → 1,6
usr/lib/pike/*/lib/include/postgres.h
usr/lib/pike/*/lib/7.4/include/postgres.h
usr/lib/pike/*/lib/modules/*Postgres.*
usr/share/pike/*/lib/modules/*Postgres.*
usr/lib/pike/*/lib/modules/Sql.pmod/postgres*
usr/share/pike/*/lib/modules/Sql.pmod/postgres*
usr/lib/pike/*/include/postgres.h
usr/lib/pike/*/7.4/include/postgres.h
usr/lib/pike/*/modules/*Postgres.*
usr/share/pike/*/modules/*Postgres.*
usr/lib/pike/*/modules/Sql.pmod/postgres*
usr/share/pike/*/modules/Sql.pmod/postgres*
/trunk/debian/pike7.6-java.install
0,0 → 1,0
usr/lib/pike/*/modules/*Java.*
/trunk/debian/pike7.6-image.install
1,5 → 1,6
usr/lib/pike/*/lib/modules/*Image*.so
usr/lib/pike/*/lib/modules/*Image*.pmod*
usr/share/pike/*/lib/modules/*Image*.pmod*
usr/share/pike/*/lib/modules/_Image.pmod
usr/lib/pike/*/lib/modules/_Image.pmod
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
/trunk/debian/pike7.6-sdl.install
1,2 → 1,2
usr/lib/pike/*/lib/modules/*SDL.*
usr/share/pike/*/lib/modules/*SDL.*
usr/lib/pike/*/modules/*SDL.*
usr/share/pike/*/modules/*SDL.*
/trunk/debian/pike7.6-gtk.install
1,8 → 1,8
usr/lib/pike/*/lib/modules/GDK*
usr/lib/pike/*/lib/modules/Gnome*
usr/lib/pike/*/lib/modules/GTKSupport.pmod
usr/lib/pike/*/lib/modules/*GTK*
usr/share/pike/*/lib/modules/GDK*
usr/share/pike/*/lib/modules/Gnome*
usr/share/pike/*/lib/modules/GTKSupport.pmod
usr/share/pike/*/lib/modules/*GTK*
usr/lib/pike/*/modules/GDK*
usr/lib/pike/*/modules/Gnome*
usr/lib/pike/*/modules/GTKSupport.pmod
usr/lib/pike/*/modules/*GTK*
usr/share/pike/*/modules/GDK*
usr/share/pike/*/modules/Gnome*
usr/share/pike/*/modules/GTKSupport.pmod
usr/share/pike/*/modules/*GTK*