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

 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
 

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

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
 

packaging/debian/specs.in

+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@

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