| /trunk/debian/changelog |
|---|
| 1,26 → 1,8 |
| pike7.8 (7.8.352-dfsg-1) experimental; urgency=low |
| pike7.8 (7.8.352-dfsg-1) UNRELEASED; 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, 18 Apr 2010 23:16:29 +0200 |
| -- Magnus Holmgren <holmgren@debian.org> Sun, 11 Apr 2010 20:57:38 +0200 |
| pike7.8 (7.8.350-dfsg-1) experimental; urgency=low |
| /trunk/debian/patches/module-layout.dpatch |
|---|
| File deleted |
| Property changes: |
| Deleted: svn:executable |
| ## -1 +0,0 ## |
| -* |
| \ No newline at end of property |
| Index: debian/patches/00list |
| =================================================================== |
| --- debian/patches/00list (revision 84) |
| +++ debian/patches/00list (revision 83) |
| @@ -1,4 +1,4 @@ |
| -module-layout |
| +01_master.in |
| 02_smartlink_rpath |
| #04_make_variables_fpic |
| #05_install.pike |
| Index: debian/patches/01_master.in.dpatch |
| =================================================================== |
| --- debian/patches/01_master.in.dpatch (nonexistent) |
| +++ debian/patches/01_master.in.dpatch (revision 83) |
| @@ -0,0 +1,25 @@ |
| +#! /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 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-10-02 14:04:02.000000000 +0200 |
| +@@ -2094,6 +2094,14 @@ |
| + add_module_path("#lib_prefix#/modules"); |
| + #endif |
| + |
| ++ // Debian paths |
| ++ add_include_path("/usr/local/include/pike"); |
| ++ add_include_path("/usr/local/include/pike"+__REAL_MAJOR__+"."+__REAL_MINOR__); |
| ++ add_module_path("/usr/local/lib/pike/site_pike"); |
| ++ add_module_path("/usr/local/lib/pike"+__REAL_MAJOR__+"."+__REAL_MINOR__+"/site_pike"); |
| ++ add_module_path("/usr/local/share/pike/site_pike"); |
| ++ add_module_path("/usr/local/share/pike"+__REAL_MAJOR__+"."+__REAL_MINOR__+"/site_pike"); |
| ++ |
| + #if "#cflags# "[0]!='#' |
| + cflags = "#cflags#"; |
| + #endif |
| /debian/patches/01_master.in.dpatch |
|---|
| Property changes: |
| Added: svn:executable |
| ## -0,0 +1 ## |
| +* |
| \ No newline at end of property |
| Index: debian/rules |
| =================================================================== |
| --- debian/rules (revision 84) |
| +++ debian/rules (revision 83) |
| @@ -119,8 +119,8 @@ |
| --with-relocatable-dumped-modules \ |
| $(MACHINE_OPTS) $(EXTRA_ARGS) |
| -include_prefix=/usr/include/pike$(PIKEV) |
| -lib_prefix=/usr/lib/pike$(PIKEV) |
| +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}. |
| @@ -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' '{}' + |
| -# Install our own, simpler specs file. |
| - sed -e "s;@include_prefix@;$(include_prefix);g" \ |
| - -e "s;@CONFIGURE_ARGS@;$(CFARGS);g" \ |
| +# 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' \ |
| debian/specs.in > $(TMP)$(include_prefix)/specs |
| # Install pike-config |
| @@ -199,9 +199,6 @@ |
| -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-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/pike7.8-sqlite.install |
|---|
| 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* |
| /trunk/debian/pike7.8-gl.install |
|---|
| 1,2 → 1,2 |
| usr/lib/pike?.?/modules/*GL* |
| #usr/share/pike?.?/modules/*GL* |
| usr/lib/pike/*/modules/*GL* |
| #usr/share/pike/*/modules/*GL* |
| /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-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-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-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* |
| /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="share/pike/site_pike share/pike${PIKE}/site_pike lib/pike/site_pike lib/pike${PIKE}/site_pike include/pike include/pike${PIKE}" |
| case "$1" in |
| configure) |
| /trunk/debian/pike7.8-svg.install |
|---|
| 1,0 → 0,0 |
| usr/lib/pike?.?/modules/*Image_SVG.so |
| usr/lib/pike/*/modules/*Image_SVG.so |
| /trunk/debian/pike7.8-dev.install |
|---|
| 1,2 → 1,2 |
| usr/include/pike?.?/* |
| usr/include/pike/*/* |
| usr/bin/pike*-config |
| /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/pike7.8-java.install |
|---|
| 1,0 → 0,0 |
| usr/lib/pike?.?/modules/*Java.* |
| usr/lib/pike/*/modules/*Java.* |
| /trunk/debian/specs.in |
|---|
| 1,7 → 1,7 |
| CC=@include_prefix@/smartlink gcc |
| CFLAGS=-O2 -g -DDEBIAN |
| LDFLAGS= |
| CPPFLAGS=-I@include_prefix@ |
| CC=gcc |
| CFLAGS=-O2 -DDEBIAN |
| LDFLAGS=-L/usr/lib -L/usr/X11R6/lib |
| CPPFLAGS=-I/usr/include/pike/@PIKEVERSION@/ -I/usr/include |
| CPP=gcc -E |
| LDSHARED=gcc -shared |
| configure_args=@CONFIGURE_ARGS@ |