Subversion Repositories pike

Compare Revisions

Ignore whitespace Rev 87 → Rev 88

/trunk/debian/patches/module-layout.dpatch
8,14 → 8,12
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 @@
@@ -2094,6 +2094,10 @@
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]!='#'
/trunk/debian/pike7.8-core.postinst
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="lib/pike/modules lib/pike${PIKE}/modules lib/pike/include lib/pike${PIKE}/include"
LOCAL_DIRS="lib/pike${PIKE}/modules lib/pike${PIKE}/include"
 
update_modules () {
$PIKEBIN -x dump $@ -q -r /usr/lib/$PIKEBIN/modules
/trunk/debian/changelog
2,8 → 2,11
 
* Add trigger for dumping of Pike modules when pike7.8-core or any
module package is installed.
* Remove support for the unversioned local module and include
directories (/usr/local/lib/pike/*) to avoid having to coordinate
their creation and removal by multiple versions.
 
-- Magnus Holmgren <holmgren@debian.org> Sat, 05 Jun 2010 22:16:43 +0200
-- Magnus Holmgren <holmgren@debian.org> Sat, 05 Jun 2010 22:23:13 +0200
 
pike7.8 (7.8.352-dfsg-1) experimental; urgency=low
 
/trunk/debian/pike7.8-core.postrm
5,6 → 5,9
 
set -e
 
PIKE=7.8
PIKEBIN=pike${PIKE}
 
# summary of how this script can be called:
# * <postrm> `remove'
# * <postrm> `purge'
16,12 → 19,11
# * <disappearer's-postrm> `disappear' <r>overwrit>r> <new-version>
# for details, see http://www.debian.org/doc/debian-policy/ or
# the debian-policy package
LOCAL_DIRS="lib/pike${PIKE}/modules lib/pike${PIKE}/include lib/pike${PIKE}"
 
 
case "$1" in
purge)
for d in include/pike include/pike7.8 lib/pike/site_pike lib/pike lib/pike7.8/site_pike lib/pike7.8 share/pike/site_pike \
share/pike share/pike7.8/site_pike share/pike7.8; do
for d in $LOCAL_DIRS; do
rmdir /usr/local/$d || true
done
;;