Subversion Repositories pike-old

Compare Revisions

Ignore whitespace Rev 6 → Rev 7

/trunk/debian/patches/03_language.yacc_bison_fix.dpatch
File deleted
Property changes:
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: patches/01_master.in.dpatch
===================================================================
--- patches/01_master.in.dpatch (revision 6)
+++ patches/01_master.in.dpatch (revision 7)
@@ -7,12 +7,11 @@
@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-09-26 09:26:21.000000000 +0200
-@@ -1115,6 +1115,14 @@
- include_prefix = "¤include_prefix¤";
++++ trunk/lib/master.pike.in 2007-10-02 14:04:02.000000000 +0200
+@@ -1111,6 +1111,14 @@
+ add_module_path("¤lib_prefix¤/modules");
#endif
- system_module_path=pike_module_path;
-+
+
+ // Debian paths
+ add_include_path("/usr/local/include/pike");
+ add_include_path("/usr/local/include/pike"+__REAL_MAJOR__+"."+__REAL_MINOR__);
@@ -20,6 +19,7 @@
+ 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 "¤include_prefix¤"[0]!='¤'
+ include_prefix = "¤include_prefix¤";
+ #endif
Index: patches/00list
===================================================================
--- patches/00list (revision 6)
+++ patches/00list (revision 7)
@@ -1,7 +1,6 @@
01_master.in
02_smartlink_rpath
-03_language.yacc_bison_fix
-04_make_variables_fpic
+#04_make_variables_fpic
05_install.pike
07_dynamic_module_makefile.in-libgcc
10_misplaced_MAXPATHLEN
Index: docs
===================================================================
--- docs (revision 6)
+++ docs (revision 7)
@@ -1,4 +1,3 @@
README-CVS
README
-CHANGES
COMMITTERS
Index: changelog
===================================================================
--- changelog (revision 6)
+++ changelog (revision 7)
@@ -7,9 +7,12 @@
* New maintainers (Closes: #411684).
* Use dpatch to apply patches.
* Radically clean up debian/rules (Closes: #424334).
+ * Manuals are again built during the binary build process so that
+ official tarballs can be used to build the package.
* Delete redundant dhelp files (dhelp uses doc-base metadata since
long ago).
- * Change directory structure and get rid of an unnecessary directory level:
+ * Change directory structure and get rid of an unnecessary directory level
+ (by installing with --traditional instead of --new-style):
- Pike modules and include files, and master.pike are now in
/usr/lib/pike/<version> instead of /usr/lib/pike/<version>/lib.
- The pike executable is now in /usr/bin itself, instead of in
@@ -21,13 +24,18 @@
* Move modules GLU and GLUE to pike7.6-gl, where they belong.
GLUE.Drivers.GTK removed since it depends on GTK, which was dropped
previously.
+ * Make pike7.6-dev Architecture: any.
+ * No longer use own version of specs.in - fix the configure parameters
+ instead.
* Drop Image.TTF from pike7.6-image so that Debian can get rid of the old
freetype1 library (Closes: #431784).
* Fix 01_master.in.dpatch - the Debian-specific add_*_path() calls were
completely off.
* Add debian/watch (checking for latest official stable release).
+ * Drop 03_language.yacc_bison_fix.dpatch; it no longer has any effect.
+ * Add Mird to the module exclusion list.
- -- Magnus Holmgren <magnus@kibibyte.se> Wed, 26 Sep 2007 15:33:54 +0200
+ -- Magnus Holmgren <magnus@kibibyte.se> Mon, 01 Oct 2007 23:32:42 +0200
pike7.6 (7.6.93-3) unstable; urgency=low
/trunk/debian/rules
23,6 → 23,7
DEB_BUILD_ARCH=$(shell dpkg-architecture -qDEB_BUILD_ARCH)
endif
 
CFLAGS_EXTRA = -g
CPPFLAGS_EXTRA = -DDEBIAN
 
ifdef SSP
29,14 → 30,18
SSP_FLAGS=-fstack-protector
endif
 
CFARGSEXTRA = --with-cdebug
 
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
CFARGSEXTRA=--without-rtldebug --without-cdebug --without-debug --without-copt
CFARGSEXTRA += --without-copt
else
CFARGSEXTRA=--without-rtldebug --without-cdebug --without-debug
CFARGSEXTRA += --with-copt
endif
 
ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
CFARGSEXTRA += --with-rtldebug --with-cdebug --with-debug
CFARGSEXTRA += --with-rtldebug
else
CFARGSEXTRA += --without-rtldebug
endif
 
CFLAGS_EXTRA += $(SSP_FLAGS)
81,8 → 86,8
endif
 
CFARGS=$(CFARGSEXTRA) \
--with-cflags="$(CFLAGS_EXTRA)" \
--with-cppflags="$(CPPFLAGS_EXTRA)" \
--with-cflags=\\'$(CFLAGS_EXTRA)\\' \
--with-cppflags=\\'$(CPPFLAGS_EXTRA)\\' \
--with-bignums \
--with-gmp \
--with-poll \
95,14 → 100,16
--with-odbc \
--with-sane \
--with-postgres \
--with-postgres-include-dir=/usr/include/postgresql \
--with-postgres-include-dir=`pg_config --includedir` \
--with-libpq-dir=/usr/lib \
--with-perl \
--without-ffmpeg \
--without-fftw \
--without-libpdf \
--without-libpanda \
--without-GTK \
--without-GTK2 \
--without-bundles \
$(MACHINE_OPTS) $(EXTRA_ARGS)
 
include_prefix=/usr/include/pike/$(VERSION)
112,7 → 119,7
#{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}.
#usr/lib/pike/*/modules/Sql.pmod/{module,Sql,rsql,sql_*}.*
 
excluded_modules:=Ssleay Msql msql PDF Ffmpeg Oracle oracle sybase Gnome GTK GDK DVB Java TTF
excluded_modules:=Ssleay Mird Msql msql PDF Ffmpeg Oracle oracle sybase Gnome GTK GDK DVB Java TTF
# This is tricky. Note that it's only possible for an exclusion to match the last
# component specified in an .install file or on the command line, and below.
DH_EXCLUDE:=$(addprefix -X,$(excluded_modules))
121,7 → 128,8
 
TMP=$(CURDIR)/debian/tmp
 
export CFLAGS CC PIKE VERSION
#export CFLAGS CC PIKE VERSION
export CC
 
build-arch: build-arch-stamp
build-arch-stamp: $(DPATCH_STAMPFN)
150,7 → 158,7
rm -f build-stamp build-arch-stamp build-indep-stamp configure-stamp
 
# Add here commands to clean up after the build process.
-$(MAKE) distclean
$(MAKE) distclean
rm -rf refdoc/modref refdoc/traditional_manual
 
install: DH_OPTIONS=
187,13 → 195,13
fi; \
done
 
# Install the specs file
sed -e 's/@PIKEVERSION@/$(VERSION)/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
debian/specs.in > $(TMP)$(include_prefix)/specs
 
# Install pike-config
sed -e "s#@CFLAGS@#$(include_prefix)#;s/@LDFLAGS@//" \
sed -e "s#@CFLAGS@#-I$(include_prefix)#;s/@LDFLAGS@//" \
-e "s/@MAJOR@/$(MAJOR)/;s/@MINOR@/$(MINOR)/;s/@BUILD@/$(BUILD)/" \
debian/pike-config.in > $(TMP)/usr/bin/$(PIKE)-config
 
211,7 → 219,7
dh_install -p$(PIKE)-reference refdoc/modref/* usr/share/doc/$(PIKE)-doc/html/reference
dh_install -i -N$(PIKE)-manual -N$(PIKE)-reference --sourcedir=$(TMP)
dh_installdocs -i
dh_installchangelogs -i
dh_installchangelogs -i -k CHANGES
dh_link -i
dh_compress -i
dh_fixperms -i
225,15 → 233,15
dh_testdir -a
dh_testroot -a
# dh_installdebconf -a
dh_install -a --sourcedir=debian/tmp -N$(PIKE)-core $(DH_EXCLUDE)
dh_install -a -N$(PIKE)-core --sourcedir=debian/tmp $(DH_EXCLUDE)
dh_install -p$(PIKE)-core --sourcedir=debian/tmp $(DH_EXCLUDE) $(DH_ALREADY)
for p in $(MODULE_PACKAGES); do \
for p in $(MODULE_PACKAGES) $(PIKE)-dev; do \
dh_link -p$$p usr/share/doc/$(PIKE)-core usr/share/doc/$$p; \
done
dh_installdocs -a
dh_installmenu -a
# dh_installman -a
dh_installchangelogs -a
dh_installchangelogs -a -k CHANGES
dh_strip -a
dh_compress -a
dh_fixperms -a -X/run_autoconfig -X/precompile.sh -X/smartlink -X/fixdepends.sh -X/install_module -X/mktestsuite
/trunk/debian/copyright
1,8 → 1,11
This package was debianized by Marek Habersack <grendel@debian.org> on
Sun, 5 May 2002 01:34:05 +0200.
 
It was downloaded from the Pike CVS (http://pike.ida.liu.se)
The current maintainer is Magnus Holmgren <magnus@kibibyte.se> with
some help from Henrik Andreasson <pike@han.pp.se>.
 
It was downloaded from http://pike.ida.liu.se/download/pub/pike/
 
Copyright © 1994-1996 Fredrik Hübinette
Copyright © 1996-1997 Informationsvävarna AB
Copyright © 1997-2000 Idonex AB
/trunk/debian/README.Debian
9,11 → 9,15
- _Ffmpeg: formerly missing from Debian due to patent issues. Might be
included in the next release.
- Gnome, GTK, GDK: Uses obsolete GTK version (1.2).
- Math.Transforms.FFT: Few use cases in Pike, pulls in unnecessary
dependencies.
- Mird: Old, unmaintained, largely unknown library.
- Msql: Obsolete, proprietary DBM.
- PDF: Uses unmaintained libraries unavailable in Debian.
- Ssleay: Obsolete.
- Oracle: Proprietary DBM (so far ...).
- Java: Links with the JVM library in a non-policy compliant way. Work needed.
- Java: Links with the JVM library in a non-policy compliant
way. Work needed.
- Image.TTF: Uses obsolete library (freetype1).
 
Places to visit
47,4 → 51,4
----
$Id: README.Debian,v 1.6 2004/04/30 17:12:38 grendel Exp $
 
-- Magnus Holmgren <magnus@kibibyte.se>, Wed, 26 Sep 2007 15:30:58 +0200
-- Magnus Holmgren <magnus@kibibyte.se>, Fri, 28 Sep 2007 14:16:15 +0200