/trunk/debian/pike7.8-pcre.install |
---|
1,2 → 1,2 |
usr/lib/pike/*/modules/*Regexp_PCRE.* |
#usr/share/pike/*/modules/*Regexp_PCRE.* |
usr/lib/pike?.?/modules/*Regexp_PCRE.* |
#usr/share/pike?.?/modules/*Regexp_PCRE.* |
/trunk/debian/patches/01_master.in.dpatch |
---|
File deleted |
Property changes: |
Deleted: svn:executable |
## -1 +0,0 ## |
-* |
\ No newline at end of property |
Index: debian/patches/module-layout.dpatch |
=================================================================== |
--- debian/patches/module-layout.dpatch (nonexistent) |
+++ debian/patches/module-layout.dpatch (revision 84) |
@@ -0,0 +1,94 @@ |
+#! /bin/sh /usr/share/dpatch/dpatch-run |
+## 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 -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,12 @@ |
+ add_module_path("#lib_prefix#/modules"); |
+ #endif |
+ |
++ // Debian paths |
++ add_include_path("/usr/local/lib/pike/include"); |
++ add_include_path("/usr/local/lib/pike"+__REAL_VERSION__)+"/include"; |
++ add_module_path("/usr/local/lib/pike/modules"); |
++ add_module_path("/usr/local/lib/pike"+__REAL_VERSION__+"/modules"); |
++ |
+ #if "#cflags# "[0]!='#' |
+ cflags = "#cflags#"; |
+ #endif |
+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; |
+-// we prefer the last element, because if there are more than one |
+-// 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"; |
+ |
+ // where do we install the documentation? |
+ string system_doc_path = master()->doc_prefix; |
+@@ -183,7 +182,7 @@ |
+ extra_args = ({ |
+ "PIKE="+run_pike, |
+ "SRCDIR="+fix("$src"), |
+- "MODULE_INSTALL_DIR="+combine_path(__FILE__,"../../.."), |
++ "MODULE_INSTALL_DIR="+system_module_path, |
+ "LOCAL_MODULE_PATH=" + lmp, |
+ }); |
+ } |
+@@ -240,6 +239,7 @@ |
+ ({"all",Getopt.NO_ARG,({"--all"}) }), |
+ ({"make",Getopt.NO_ARG,({"--make"}) }), |
+ ({"auto",Getopt.NO_ARG,({"--auto"}) }), |
++ ({"debian",Getopt.NO_ARG,({"--debian"}) }), |
+ ({"source",Getopt.HAS_ARG,({"--source"}) }), |
+ ({"query",Getopt.HAS_ARG,({"--query"}) }), |
+ ({"config_args",Getopt.HAS_ARG,({"--configure-args"}) }), |
+@@ -276,6 +276,9 @@ |
+ case "auto": |
+ run->depend=run->autoheader=run->autoconf=run->configure=run->make=AUTO; |
+ break; |
++ |
++ case "debian": |
++ system_module_path=master()->system_module_path[-1]; |
+ } |
+ } |
+ |
+@@ -405,7 +408,7 @@ |
+ run_or_fail( ([ "env":getenv()| |
+ ([ |
+ "PIKE":run_pike, |
+- "MODULE_INSTALL_DIR":combine_path(__FILE__,"../../.."), |
++ "MODULE_INSTALL_DIR":system_module_path, |
+ "LOCAL_MODULE_PATH":local_module_path, |
+ ]) |
+ ]), |
+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 \ |
+- $(TMP_BINDIR)/install_module module.so $(SYSTEM_MODULE_PATH)/$(MODDIR)$(MODULE_WRAPPER_PREFIX)$(MODNAME).so && \ |
++ $(TMP_BINDIR)/install_module module.so $(DESTDIR)$(SYSTEM_MODULE_PATH)/$(MODDIR)$(MODULE_WRAPPER_PREFIX)$(MODNAME).so && \ |
+ if [ -f $(MODNAME).pdb ]; then \ |
+- cp $(MODNAME).pdb $(SYSTEM_MODULE_PATH)/$(MODDIR)$(MODULE_WRAPPER_PREFIX); \ |
++ cp $(MODNAME).pdb $(DESTDIR)$(SYSTEM_MODULE_PATH)/$(MODDIR)$(MODULE_WRAPPER_PREFIX); \ |
+ else :; fi; \ |
+ fi; \ |
+ if test "x$(MODULE_PMOD_IN)" != "x"; then \ |
+- $(TMP_BINDIR)/install_module module.pmod $(SYSTEM_MODULE_PATH)/$(MODDIR)$(MODNAME).pmod ;\ |
++ $(TMP_BINDIR)/install_module module.pmod $(DESTDIR)$(SYSTEM_MODULE_PATH)/$(MODDIR)$(MODNAME).pmod ;\ |
+ fi; |
+ |
+ # |
/debian/patches/module-layout.dpatch |
---|
Property changes: |
Added: svn:executable |
## -0,0 +1 ## |
+* |
\ No newline at end of property |
Index: debian/patches/00list |
=================================================================== |
--- debian/patches/00list (revision 83) |
+++ debian/patches/00list (revision 84) |
@@ -1,4 +1,4 @@ |
-01_master.in |
+module-layout |
02_smartlink_rpath |
#04_make_variables_fpic |
#05_install.pike |
Index: debian/pike7.8-svg.install |
=================================================================== |
--- debian/pike7.8-svg.install (revision 83) |
+++ debian/pike7.8-svg.install (revision 84) |
@@ -1 +1 @@ |
-usr/lib/pike/*/modules/*Image_SVG.so |
+usr/lib/pike?.?/modules/*Image_SVG.so |
Index: debian/pike7.8-sqlite.install |
=================================================================== |
--- debian/pike7.8-sqlite.install (revision 83) |
+++ debian/pike7.8-sqlite.install (revision 84) |
@@ -1,3 +1,3 @@ |
-usr/lib/pike/*/modules/*SQLite.* |
-usr/lib/pike/*/modules/Sql.pmod/sqlite* |
-#usr/share/pike/*/modules/Sql.pmod/sqlite* |
+usr/lib/pike?.?/modules/*SQLite.* |
+usr/lib/pike?.?/modules/Sql.pmod/sqlite* |
+#usr/share/pike?.?/modules/Sql.pmod/sqlite* |
Index: debian/pike7.8-gl.install |
=================================================================== |
--- debian/pike7.8-gl.install (revision 83) |
+++ debian/pike7.8-gl.install (revision 84) |
@@ -1,2 +1,2 @@ |
-usr/lib/pike/*/modules/*GL* |
-#usr/share/pike/*/modules/*GL* |
+usr/lib/pike?.?/modules/*GL* |
+#usr/share/pike?.?/modules/*GL* |
Index: debian/pike7.8-core.postinst |
=================================================================== |
--- debian/pike7.8-core.postinst (revision 83) |
+++ debian/pike7.8-core.postinst (revision 84) |
@@ -28,7 +28,7 @@ |
# so that unnecessary prompting doesn't happen if a package's |
# installation fails and the `postinst' is called with `abort-upgrade', |
# `abort-remove' or `abort-deconfigure'. |
-LOCAL_DIRS="share/pike/site_pike share/pike${PIKE}/site_pike lib/pike/site_pike lib/pike${PIKE}/site_pike include/pike include/pike${PIKE}" |
+LOCAL_DIRS="lib/pike/modules lib/pike${PIKE}/modules lib/pike/include lib/pike${PIKE}/include" |
case "$1" in |
configure) |
/trunk/debian/pike7.8-odbc.install |
---|
1,4 → 1,4 |
usr/lib/pike/*/modules/*Odbc.* |
#usr/share/pike/*/modules/*Odbc.* |
usr/lib/pike/*/modules/Sql.pmod/odbc* |
#usr/share/pike/*/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.8-gdbm.install |
---|
1,2 → 1,2 |
usr/lib/pike/*/modules/*Gdbm.* |
#usr/share/pike/*/modules/*Gdbm.* |
usr/lib/pike?.?/modules/*Gdbm.* |
#usr/share/pike?.?/modules/*Gdbm.* |
/trunk/debian/pike7.8-dev.install |
---|
1,2 → 1,2 |
usr/include/pike/*/* |
usr/include/pike?.?/* |
usr/bin/pike*-config |
/trunk/debian/pike7.8-sane.install |
---|
1,2 → 1,2 |
usr/lib/pike/*/modules/*SANE.* |
#usr/share/pike/*/modules/*SANE.* |
usr/lib/pike?.?/modules/*SANE.* |
#usr/share/pike?.?/modules/*SANE.* |
/trunk/debian/pike7.8-bzip2.install |
---|
1,2 → 1,2 |
usr/lib/pike/*/modules/*Bz2.* |
#usr/share/pike/*/modules/*Bz2.* |
usr/lib/pike?.?/modules/*Bz2.* |
#usr/share/pike?.?/modules/*Bz2.* |
/trunk/debian/pike7.8-core.install |
---|
1,8 → 1,8 |
usr/bin/pike7.8 |
usr/lib/pike/*/?.? |
usr/lib/pike/*/include |
usr/lib/pike/*/modules |
usr/lib/pike/*/master.pike |
usr/lib/pike/*/master.pike.o |
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/specs.in |
---|
1,7 → 1,7 |
CC=gcc |
CFLAGS=-O2 -DDEBIAN |
LDFLAGS=-L/usr/lib -L/usr/X11R6/lib |
CPPFLAGS=-I/usr/include/pike/@PIKEVERSION@/ -I/usr/include |
CC=@include_prefix@/smartlink gcc |
CFLAGS=-O2 -g -DDEBIAN |
LDFLAGS= |
CPPFLAGS=-I@include_prefix@ |
CPP=gcc -E |
LDSHARED=gcc -shared |
configure_args=@CONFIGURE_ARGS@ |
/trunk/debian/changelog |
---|
1,8 → 1,26 |
pike7.8 (7.8.352-dfsg-1) UNRELEASED; urgency=low |
pike7.8 (7.8.352-dfsg-1) experimental; urgency=low |
* New upstream release. |
* 01_master.in.dpatch: Renamed module-layout.dpatch. |
* module-layout.dpatch, debian/*.install, debian/rules: |
* Change Pike module and include paths to |
/usr/lib/pike7.8/modules and /usr/lib/pike7.8/include, |
respectively. Use the same but under /usr/local for locally built |
modules and include files. |
C header files are moved to /usr/include/pike7.8. |
* module-layout.dpatch: |
* Patch module.pike to install modules in /usr/local/pike7.8/modules |
by default, and in the the normal /usr/pike7.8/modules if passed the |
--debian option. |
* dynamic_module_makefile: Prepend $(DESTDIR) to installation directory, |
to facilitate package building. |
* debian/rules, debian/specs.in: Reinstate own, simplified, updated |
specs file. |
* debian/rules: Fix /usr/include/pike7.8/precompike.pike, which tried to |
#include ../lib/Tools.pmod/Standalone.pmod/precompike.pike, which only |
works with the --new-style directory layout. |
-- Magnus Holmgren <holmgren@debian.org> Sun, 11 Apr 2010 20:57:38 +0200 |
-- Magnus Holmgren <holmgren@debian.org> Sun, 18 Apr 2010 23:16:29 +0200 |
pike7.8 (7.8.350-dfsg-1) experimental; urgency=low |
/trunk/debian/rules |
---|
119,8 → 119,8 |
--with-relocatable-dumped-modules \ |
$(MACHINE_OPTS) $(EXTRA_ARGS) |
include_prefix=/usr/include/pike/$(VERSION) |
lib_prefix=/usr/lib/pike/$(VERSION) |
include_prefix=/usr/include/pike$(PIKEV) |
lib_prefix=/usr/lib/pike$(PIKEV) |
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}. |
131,7 → 131,7 |
# 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` |
find debian/$$p/usr/lib/pike?.?/* -type f -printf "-X%P "; done` |
TMP=$(CURDIR)/debian/tmp |
189,9 → 189,9 |
-exec chmod a-x '{}' + \ |
-exec sed -ri -e '1!b;/^#!/d' '{}' + |
# Don't install our own specs file - the ordinary one is not that bad really |
# sed -e 's/@PIKEVERSION@/$(VERSION)/g' \ |
-e 's;@CONFIGURE_ARGS@;$(CFARGS);g' \ |
# Install our own, simpler specs file. |
sed -e "s;@include_prefix@;$(include_prefix);g" \ |
-e "s;@CONFIGURE_ARGS@;$(CFARGS);g" \ |
debian/specs.in > $(TMP)$(include_prefix)/specs |
# Install pike-config |
199,6 → 199,9 |
-e "s/@MAJOR@/$(MAJOR)/;s/@MINOR@/$(MINOR)/;s/@BUILD@/$(BUILD)/" \ |
debian/pike-config.in > $(TMP)/usr/bin/$(PIKE)-config |
# Fix precompike.pike |
sed -i -e "s%\.\./lib%$(lib_prefix)%" $(TMP)$(include_prefix)/precompile.pike |
# # pike -x module fix |
# sed -i -e 's;\$$(MODULE_BASE)/dynamic_module_makefile;\$$(PIKE_SRC_DIR)/modules/dynamic_module_makefile;g' \ |
# $(TMP)$(include_prefix)/modules/dynamic_module_makefile |
/trunk/debian/pike7.8-fuse.install |
---|
1,3 → 1,3 |
usr/lib/pike/*/modules/*Fuse.so |
usr/lib/pike/*/modules/Fuse.pmod |
#usr/share/pike/*/modules/Fuse.pmod |
usr/lib/pike?.?/modules/*Fuse.so |
usr/lib/pike?.?/modules/Fuse.pmod |
#usr/share/pike?.?/modules/Fuse.pmod |
/trunk/debian/pike7.8-mysql.install |
---|
1,5 → 1,5 |
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* |
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.8-pg.install |
---|
1,5 → 1,5 |
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* |
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.8-dnssd.install |
---|
1,2 → 1,2 |
usr/lib/pike/*/modules/*DNS_SD.* |
#usr/share/pike/*/modules/*DNS_SD.* |
usr/lib/pike?.?/modules/*DNS_SD.* |
#usr/share/pike?.?/modules/*DNS_SD.* |
/trunk/debian/pike7.8-java.install |
---|
1,0 → 0,0 |
usr/lib/pike/*/modules/*Java.* |
usr/lib/pike?.?/modules/*Java.* |
/trunk/debian/pike7.8-image.install |
---|
1,6 → 1,6 |
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/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.8-sdl.install |
---|
1,2 → 1,2 |
usr/lib/pike/*/modules/*SDL.* |
#usr/share/pike/*/modules/*SDL.* |
usr/lib/pike?.?/modules/*SDL.* |
#usr/share/pike?.?/modules/*SDL.* |
/trunk/debian/pike7.8-gtk.install |
---|
1,8 → 1,8 |
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* |
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* |