From 4909351d94763ab8db35351edcf1fe0b916bbfa6 Mon Sep 17 00:00:00 2001
From: Marek Habersack <mhabersack@novell.com>
Date: Sat, 3 Sep 2005 03:37:40 +0200
Subject: [PATCH] Preparing for upload to Debian/experimental
Rev: packaging/debian/changelog:1.63
Rev: packaging/debian/control:1.32
Rev: packaging/debian/patches/01_master.in.diff:1.4
Rev: packaging/debian/patches/02_smartlink_rpath.diff:1.3
Rev: packaging/debian/patches/03_install.pike.diff:1.1
Rev: packaging/debian/patches/04_src_makefile.in.diff:1.1
Rev: packaging/debian/rules:1.51
Rev: packaging/debian/specs.in:1.1
Rev: packaging/debian/toremove.txt:1.7
---
packaging/debian/changelog | 10 ++
packaging/debian/control | 27 +++++-
packaging/debian/patches/01_master.in.diff | Bin 700 -> 769 bytes
.../debian/patches/02_smartlink_rpath.diff | Bin 1035 -> 1390 bytes
packaging/debian/patches/03_install.pike.diff | Bin 0 -> 1542 bytes
.../debian/patches/04_src_makefile.in.diff | Bin 0 -> 733 bytes
packaging/debian/rules | 90 +++++++++++++-----
packaging/debian/specs.in | 7 ++
packaging/debian/toremove.txt | 1 -
9 files changed, 108 insertions(+), 27 deletions(-)
create mode 100644 packaging/debian/patches/03_install.pike.diff
create mode 100644 packaging/debian/patches/04_src_makefile.in.diff
create mode 100644 packaging/debian/specs.in
diff --git a/packaging/debian/changelog b/packaging/debian/changelog
index 589f7a81d0..63928fb4f8 100644
--- a/packaging/debian/changelog
+++ b/packaging/debian/changelog
@@ -1,6 +1,16 @@
pike7.7 (7.7.21-1) experimental; urgency=low
* The latest cvs snapshot
+ * Updated the Standards-Version, no changes
+ * Using own version of specs.in, since the pike-generated one does not
+ make sense on a Debian system.
+ * Implemented configurable include_prefix for the install process
+ * GTK v1 is no longer used. Using GTK v2 and GNOME v2.x instead
+ * Turned on several experimental features, for wider testing
+ * Added new modules:
+ - SQLite
+ - Fuse
+ - DNS-SD (libhowl)
-- Marek Habersack <grendel@debian.org> Fri, 3 Jun 2005 16:45:28 +0200
diff --git a/packaging/debian/control b/packaging/debian/control
index 8b2b0bcc63..e81e9ce8f4 100644
--- a/packaging/debian/control
+++ b/packaging/debian/control
@@ -2,8 +2,8 @@ Source: pike7.7
Section: interpreters
Priority: optional
Maintainer: Marek Habersack <grendel@debian.org>
-Standards-Version: 3.6.1
-Build-Depends: debhelper (>> 4.0.0), libgdbm-dev, libgmp3-dev, libz-dev, libjpeg-dev, libttf-dev, libmysqlclient10-dev, libreadline-dev, perl, bison, debhelper, freeglut3-dev (>= 2.2.0-6.1) [alpha hppa] | libglut3-dev, freeglut3-dev [!alpha !hppa] | libglut3-dev, xlibmesa-glu-dev | libglu-dev, xlibmesa-gl-dev | libgl-dev, libxpm4-dev, libglib1.2-dev, libglade0-dev, libxml2-dev, libgtkxmhtml-dev, libfreetype6-dev, autoconf, libiodbc2-dev, libsane-dev, postgresql-dev, librsvg2-dev, libsdl-mixer1.2-dev, libsdl1.2-dev, libperl-dev, sharutils, libpng3-dev, gtkglarea5-dev, libtiff3g-dev, gdk-imlib1-dev, bc, libpcre3-dev, libbz2-dev, libnettle-dev
+Standards-Version: 3.6.2.1
+Build-Depends: debhelper (>> 4.0.0), libgdbm-dev, libgmp3-dev, libz-dev, libjpeg-dev, libttf-dev, libmysqlclient10-dev, libreadline-dev, perl, bison, debhelper, freeglut3-dev (>= 2.2.0-6.1) [alpha hppa] | libglut3-dev, freeglut3-dev [!alpha !hppa] | libglut3-dev, xlibmesa-glu-dev | libglu-dev, xlibmesa-gl-dev | libgl-dev, libxpm4-dev, gnome-devel, libgtkxmhtml-dev, libfreetype6-dev, autoconf, libiodbc2-dev, libsane-dev, postgresql-dev, librsvg2-dev, libsdl-mixer1.2-dev, libsdl1.2-dev, libperl-dev, sharutils, libpng3-dev, gtkglarea5-dev, libtiff3g-dev, bc, libpcre3-dev, libbz2-dev, libnettle-dev, libsqlite3-dev, libfuse-dev, libhowl-dev
Build-Conflicts: libutahglx-dev
Package: pike7.7-core
@@ -130,6 +130,27 @@ Description: Bzip2 module for Pike
This Pike module enables one to use the Bzip2 compression
algorithm from within the Pike programs.
+Package: pike7.7-fuse
+Architecture: any
+Depends: ${shlibs:Depends}, pike7.7-core (=${Source-Version})
+Description: Filesystem in USErspace support for Pike
+ This Pike module enables one to export filesystems to the Linux
+ kernel using the FUSE library.
+
+Package: pike7.7-mdns
+Architecture: any
+Depends: ${shlibs:Depends}, pike7.7-core (=${Source-Version})
+Description: mDNS support module for Pike
+ This Pike module enables one to use the mDNS/DNS-SD (part of the
+ Apple Zeroconf/Rendezvous strategy) protocol.
+
+Package: pike7.7-sqlite
+Architecture: any
+Depends: ${shlibs:Depends}, pike7.7-core (=${Source-Version})
+Description: SQLite module for Pike
+ This Pike module enables one to use the SQLite embedded database
+ library.
+
Package: pike7.7-dev
Architecture: all
Depends: ${shlibs:Depends}
@@ -188,7 +209,7 @@ Description: Pike 7.7 documentation meta package
Package: pike7.7-meta
Architecture: all
-Depends: pike7.7 (=${Source-Version}), pike7.7-mysql (=${Source-Version}), pike7.7-pg (=${Source-Version}), pike7.7-odbc (=${Source-Version}), pike7.7-image (=${Source-Version}), pike7.7-sdl (=${Source-Version}), pike7.7-gdbm (=${Source-Version}), pike7.7-gtk (=${Source-Version}), pike7.7-gl (=${Source-Version}), pike7.7-sane (=${Source-Version}), pike7.7-doc (=${Source-Version}), pike7.7-dev (=${Source-Version}), pike7.7-perl (=${Source-Version}), pike7.7-svg (=${Source-Version}), pike7.7-pcre (=${Source-Version}), pike7.7-bzip2 (=${Source-Version})
+Depends: pike7.7 (=${Source-Version}), pike7.7-mysql (=${Source-Version}), pike7.7-pg (=${Source-Version}), pike7.7-odbc (=${Source-Version}), pike7.7-image (=${Source-Version}), pike7.7-sdl (=${Source-Version}), pike7.7-gdbm (=${Source-Version}), pike7.7-gtk (=${Source-Version}), pike7.7-gl (=${Source-Version}), pike7.7-sane (=${Source-Version}), pike7.7-doc (=${Source-Version}), pike7.7-dev (=${Source-Version}), pike7.7-perl (=${Source-Version}), pike7.7-svg (=${Source-Version}), pike7.7-pcre (=${Source-Version}), pike7.7-bzip2 (=${Source-Version}), pike7.7-fuse (=${Source-Version}), pike7.7-mdns (=${Source-Version}), pike7.7-sqlite (=${Source-Version})
Description: Meta package for Pike 7.7
This package depends on all the components that make up the Pike
language distribution. It will pull in a LOT of packages the
diff --git a/packaging/debian/patches/01_master.in.diff b/packaging/debian/patches/01_master.in.diff
index 03d4fe3d0e447b61f187360593832bc1cb95fdd4..5029d21d4a3f5fdea0ff3df48c6c1805c695d806 100644
GIT binary patch
delta 293
zcmdnP+Q=rZtE;O}keQuou4k@mu4k@iWT=;4l$kzJP}rQ)$iTo<*T6#8&|Ja5(8|Er
z%D`C900tDa4U7y7xU{vk(ezIg6t0JAwbV5*RsiWUvobZ%Gc>g{H8eLjHiK$)a8S@S
zwJ_8%Q_u!ch9(LQ4hqF3MVWc&3VHcOxrsTMRjKg>i6t2tFkui!L6b{CIW?y^l}kZE
zp(wSav?x!ZD77FbF*#KOB(I|s!ycogqol8-x$)CUMmv3dMFro)f&!4S$@zIDiJ5sI
sW=Te>LULkqMyf)7nnH4EQBi7MNlv9ga(-?>W=?8~LRw}{YOx*{0FU-jY5)KL
delta 222
zcmZo<+ruiTtE;O}keQuou4k%iu4k%eJTXz&S}(sSGo91Oz`$77z*yJNLc!3;%E;Kt
z*jUd11{Aan3=Ispw6(R-wTst-br~5b7@Ap`8e17+>T+;U(6ul#(J@od22qA43Jwlj
z3d)&j3Q9{d^OAE)Q&Qs#ic-@uE0!ol8^kKwsxMLJQczGpl~b_AqTHHGVdLLpjEr0W
D_+~ng
diff --git a/packaging/debian/patches/02_smartlink_rpath.diff b/packaging/debian/patches/02_smartlink_rpath.diff
index b436f984228960f77e990abdaceb2c39225b5bd1..4b5fdc080917376e94e1825ff48edc07ae2e2e77 100644
GIT binary patch
delta 631
zcmeC?c*iA^l9`sKpc`tepzD`dRG?6hnVo8`XRd3mXRc>7QBXu5Rm4y~DKk&MI5)AV
zBquX3n@d+$7gfPTL6Le+BLf2?T?2Dn14{)1V=F@t(ldYo1#JT(0|PE?ZEaMYXhwq!
zG1WD&)HN^$8Dd~+WniRdVrgz+VPbA+1U1CLK|$Bh#9YTxK^sI_C^$GMWQwOLl%y7y
zC{(B@D=6A3R2V2&E0koU=535JWUR;MT|>S6qRe#t;-X}P5A~AKU5O@*83fpk0r|&7
zx8A^1*U(VG(9Fuv%*w!mm{38p4`dFOaIvtkFflVRKn@pE108b(Z9^~x3YWYRg<Pq`
z%sh?Eyb^`PqV!}Ph2)IHA_Xn2#G>>v&B^*q2ldR1KzfY86ig2uE&rI->ssoVDQFuT
RSn8OALmy-d9v!=w0|5nnsh|J=
delta 307
zcmaFI)y)y5tE;O}keQuou4k-ku4k-gYN(fAl$oxdl$obroSRrwl9QR2&84lajiw4s
zfrEpBuAzy!j-`S&h_X;{aM;YrXvkQPFyB<yT+dX`SiiU^8DX+sGT1s!BLf3tT?0d1
zLvsZq11m#gD`N{i0~k=yHZU|WKyw5ZqoAf3>lzs-7@Ap`T38vV8etd%ajKb)ImoFX
r%E4iB5c5GkQwxxg5twptnC!^1p4U{zOhMb&z*NUv!NFm&ENdVDd&f;6
diff --git a/packaging/debian/patches/03_install.pike.diff b/packaging/debian/patches/03_install.pike.diff
new file mode 100644
index 0000000000000000000000000000000000000000..bf14adc848105c203f0db88a083d3bca51a87014
GIT binary patch
literal 1542
zcmdPZ)m13S%uY4eGuJiOGuJaR)XOi*OxI7!%+t@zD=taQ$<YJJa~c^KnCco>>KYg;
z7#LZZ8d{l{>KVX*g0_K?fdQAcwl<n!_{}l4GBC0-G1N0QH#9c3G_tUOn&aT0plfJh
zV4-8Kpbe!R927G1N)!r;Qsbe{(nu^SO03i<E-A{)OV?CLEJ`oa<Wc~E<iz4s1tneG
zlA^?v%#zIfyu=(OD~ObWLTW{7a(qEiYFcK6ZCPSbv92AGNKK6fL`qu;>~bYdYnZ;A
z%p_E82mxeWIhjfNpzzWMY1IX}MnNGnFFB_)B^9PUIX^ckGcPs1Ah9F^YMqV}RE?63
z5=b{lvo==E5GO-bLrtuyA<{^Qi3%zC@DRYJQ9&ssKUqmf0qzp0w%o)#sD;pgLkJ*;
zKyG3l*z-_bNkyrN+16a(D77>*2S+J{CM8Ny;|-gum69^^K*0vJ77;tPSXJj_CLyUN
z5F+3J(X{3or16P}2kd^$O+*fv%rpg!)QW=qq7qGoYAyxNocwZFmWofy%t_Ti2`@-`
z3-Jwzck=Xe@eBf`R79zuq^SdqSqn2r%z|lBViuC$6l@jJQ%jP|Q#4>X4k=eE*eam7
z38F<u0VT>25sp(iG|s`Xh?;|NXu*{$F*HL$300W1T$!7gof@B;SX`1?q@e^VL?CQ%
z*$c{xXhM3Kc}hB53Y?q>Z|k6yGq8XxE=epYEjH9p@`M!UnR)375W^Kx^7B&lK-mBQ
DZwc$9
literal 0
HcmV?d00001
diff --git a/packaging/debian/patches/04_src_makefile.in.diff b/packaging/debian/patches/04_src_makefile.in.diff
new file mode 100644
index 0000000000000000000000000000000000000000..19ed2b927fe1b5e17853a42d70532f2f4f4692c7
GIT binary patch
literal 733
zcmdPZ)m13S%uY4eGuJiOGuJaR)XOi*OxG_iO4j#H%uY?q%t_VD%;PjNFfi3Mu+TL$
zS1>TNGBCC>FxNAH0R?RXBLf32ZEbBdvv3$=scT@Y05ZeK%G5y5#K^$X%-Gb}3~G#n
zgMzN9nU1-FHkfp9P{>Wpi!UfjP0OrMuvJjefG{=na})Ep6qFT0T!TX#gWQ7^Y!!6f
z6m%206hNYmMd_uvsd**E3TgR83YmGuC5bsXdLXYVloqF^C?r)Xlw_pBBos;#i_%j|
ziuJg3J^g}19DRIXChF#;mg^RmROX~|X(LP7+bZZH$${(ySzB71s*sdfoS&yqkdvBN
zoT{TxnV6ickXf9kUZRkmpP!<TnwMXio}tGD_NK83*q>m^!2#wPD{wF>l;r2<6muzX
z`a1f#cm~A>2RYj+sc0a0no0^WTne0s&;dy!c$!LJW8(7?b5m_qG(cVlvo*oG(h{>%
zi}LeJKzfo&Gjmcv98D#K08ek%cwc{)P#@R$AXguMu$>r!V5@aGRWy)-M3YOKGczwa
zr!*xM8e1T<QAISB6wvf2aKU^XpP5&ZT9lYvl3A9D76J|`8bP6cAXjKAsAz=v2E;pg
Tg2F^oA0=XSb&-rvh~WYN&!p7{
literal 0
HcmV?d00001
diff --git a/packaging/debian/rules b/packaging/debian/rules
index dbb73ce22d..72e309f640 100755
--- a/packaging/debian/rules
+++ b/packaging/debian/rules
@@ -6,7 +6,7 @@
# architecture-dependant package, as well as an architecture-independent
# package.
#
-# $Id: rules,v 1.50 2004/05/11 14:13:28 grendel Exp $
+# $Id: rules,v 1.51 2005/09/03 01:37:40 grendel Exp $
#
# Uncomment this to turn on verbose mode.
@@ -21,6 +21,39 @@ else
CC=gcc
endif
+CFLAGS = -DDEBIAN
+
+ifdef SSP
+SSP_FLAGS=-fstack-protector
+endif
+
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+CFLAGS += -O0
+CFARGSEXTRA=--with-rtldebug --with-cdebug --with-debug --without-copt
+else
+CFLAGS += -O2
+CFARGSEXTRA=--without-rtldebug --without-cdebug --without-debug
+endif
+
+# Temporary workaround for hppa linker issues
+ifeq ($(DEB_BUILD_ARCH),hppa)
+CFLAGS += -ffunction-sections
+endif
+
+ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
+CFLAGS += -g3 -ggdb3
+endif
+
+CFLAGS += $(SSP_FLAGS)
+# Temporary workaround for hppa linker issues
+ifeq ($(DEB_BUILD_ARCH),hppa)
+CFLAGS+=-ffunction-sections
+endif
+
+ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
+ INSTALL_PROGRAM += -s
+endif
+
EXTRA_ARGS=--with-security
DO_MACHINE_CODE=no
@@ -40,13 +73,25 @@ else
MACHINE_OPTS=--without-machine-code
endif
-VERSION:=$(shell dpkg-parsechangelog | grep ^Version | sed -e 's/Version: //;s/-[0-9.]*$$//')
+#
+# These are on so that people can report problems with them
+#
+EXPERIMENTAL_CFARGS=--with-computed-goto \
+ --with-small-eval-instruction \
+ --with-keypair-loop \
+ --without-lock
+
+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)
-CFARGS=--without-rtldebug \
- --without-cdebug \
- --without-ssleay \
- --with-security \
+CFARGS=$(CFARGSEXTRA) \
+ $(EXPERIMENTAL_CFARGS) \
+ --disable-rpath \
+ --enable-pikelib \
+ --disable-smartlink-binary \
+ --with-relocatable-dumped-modules \
+ --without-bundles \
+ --with-cflags="$(CFLAGS)" \
--with-bignums \
--with-gmp \
--with-poll \
@@ -65,26 +110,16 @@ CFARGS=--without-rtldebug \
--with-perl \
--without-ffmpeg \
--without-libpdf \
- --without-libpanda --without-machine-code
+ --without-GTK \
+ --with-GTK2 \
+ --with-sqlite \
+ --without-libpanda $(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*
-CFLAGS=-O2 -s
-# Temporary workaround for hppa linker issues
-ifeq ($(DEB_BUILD_ARCH),hppa)
-CFLAGS+=-ffunction-sections
-endif
-
-ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
- CFLAGS += -g
-endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
- INSTALL_PROGRAM += -s
-endif
-
export CFLAGS CC PIKE VERSION
configure: configure-stamp
@@ -98,7 +133,7 @@ configure-stamp:
touch patched-stamp
# Add here commands to configure the package.
- (cd $(BUILDDIR); $(CURDIR)/src/configure --prefix=/usr $(CFARGS) $(EXTRA_ARGS))
+ (cd $(BUILDDIR); $(CURDIR)/src/configure --prefix=/usr $(CFARGS))
touch configure-stamp
@@ -192,8 +227,12 @@ install: build
dh_installdirs
# Add here commands to install the package into debian/$(PIKE).
- $(MAKE) -C$(BUILDDIR)/ buildroot=$(CURDIR)/debian/$(PIKE)-core \
- prefix=/usr/lib pike_name=/usr/bin/$(PIKE) install
+ $(MAKE) -C$(BUILDDIR)/ \
+ buildroot=$(CURDIR)/debian/$(PIKE)-core \
+ prefix=/usr/lib \
+ pike_name=/usr/bin/$(PIKE) \
+ include_prefix="/usr/include/pike/$(VERSION)/" \
+ install
# Some cleaning
-rm -f `find $(CURDIR)/debian/$(PIKE)-core/usr/lib/pike/$(VERSION)/ -name ".autodoc" -type f -print`
@@ -260,6 +299,11 @@ install: build
dh_link -p$$f /usr/share/doc/$(PIKE)-core /usr/share/doc/$$f ; \
done
+ # 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
+
rm -r $(CURDIR)/debian/$(PIKE)-core/usr/lib/pike/$(VERSION)/doc
dh_movefiles --sourcedir=debian/$(PIKE)-core
diff --git a/packaging/debian/specs.in b/packaging/debian/specs.in
new file mode 100644
index 0000000000..6d7cc76037
--- /dev/null
+++ b/packaging/debian/specs.in
@@ -0,0 +1,7 @@
+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@
diff --git a/packaging/debian/toremove.txt b/packaging/debian/toremove.txt
index a5e4fd93ff..18eed24ee9 100644
--- a/packaging/debian/toremove.txt
+++ b/packaging/debian/toremove.txt
@@ -33,7 +33,6 @@ usr/lib/pike/@VERSION@/include/pike/precompile.sh
usr/lib/pike/@VERSION@/include/pike/smartlink
usr/lib/pike/@VERSION@/include/pike/test_pike.pike
usr/lib/pike/@VERSION@/include/pike/aclocal.m4
-usr/lib/pike/@VERSION@/include/pike/specs
usr/lib/pike/@VERSION@/lib/master.pike.in
usr/lib/pike/@VERSION@/bin/pike.syms
usr/lib/pike/@VERSION@/bin/rsif
--
GitLab