* modified code so that the building of a Debian archive will fail much later on in the process than before

Author: Shawn David Pringle, B.Sc.

include/std/convert.e

@@ -1,4 +1,3 @@
---# This file uses ISO-8859-1 encoding
 --****
 -- == Data Type Conversion
 --
@@ -24,6 +23,11 @@ constant
 constant M_ALLOC = 16
 atom mem  = machine_func(M_ALLOC,8)
 
+-- Character codes in ISO8859-1 
+-- '$', '£', '¤', '¥', '€'
+constant POUND = #A3, CURRENCY = #A4, YEN = #A5, EURO = #80 
+
+
 --****
 -- === Routines
 
@@ -593,7 +597,7 @@ end function
 -- the result by a further 10. Thus ##3845%## gives a value of ##(3845 / 100) ==> 38.45##,
 -- and ##3845%%## gives a value of ##(3845 / 1000) ==> 3.845##.
 -- # You can have single currency symbol before the first digit or after the last
--- digit. A currency symbol is any character of the string: "$£¤¥€".
+-- digit. A currency symbol is any character of the string: "$£¤¥€".
 -- # You can have any number of whitespace characters before the first digit and
 -- after the last digit.
 -- # The currency, sign and base symbols can appear in any order. Thus ##"$ -21.10"## is
@@ -689,7 +693,7 @@ public function to_number( sequence text_in, integer return_bad_pos = 0)
 					lBadPos = i
 				end if
 
-			case '$', '£', '¤', '¥', '€' then
+			case '$', POUND, CURRENCY, YEN, EURO then
 				if lCurrencyFound = 0 then
 					lCurrencyFound = 1
 					lLastDigit = lDigitCount

packaging/debian/Makefile

@@ -3,7 +3,9 @@ include Makefile.eu
 
 euphoria : update
 	echo TARGET: $@
+	-ln -s ../.. euphoria
 	cd $(DEB_SOURCE_DIR) && dpkg-buildpackage -nc
+
 binclean :
 	for d in $(BUILD_DIRS); \
 	do \
@@ -12,7 +14,7 @@ binclean :
 	-rm eui euc eu.a eub
 
 clean : 
-	-rm -rf $(DEB_SOURCE_DIR)
+	-rm -rf $(DEB_SOURCE_DIR) Makefile.eu	
 	-rm *deb
 	-rm *gz
 
@@ -22,21 +24,29 @@ copy-files :
 
 source :
 
-update :
-	hg archive $(DEB_SOURCE_DIR)
+update : 
+	mkdir -p euphoria/debian >/dev/null
+	(cd ../..;git archive --format=tar HEAD  ) | tar -x -C euphoria
+	grep -v 'pdflatex' < euphoria/source/Makefile.gnu | grep -v euphoria.pdf > t
+	echo "pdfdoc-initial :" >> t
+	echo "\ttouch build/euphoria.pdf" >> t
+	echo "pdfdoc :" >> t
+	echo "\ttouch build/euphoria.pdf" >> t
+	mv t euphoria/source/Makefile.gnu
 	cp Makefile.fake $(DEB_SOURCE_DIR)/Makefile
-	-rm -r $(DEB_SOURCE_DIR)/debian
-	-mkdir $(DEB_SOURCE_DIR)/debian
-	-cp rules $(DEB_SOURCE_DIR)/debian
-	-cp postinst $(DEB_SOURCE_DIR)/debian
-	-cp prerm $(DEB_SOURCE_DIR)/debian
-	-cp $(DEB_SOURCE_DIR)/docs/man/*.1 $(DEB_SOURCE_DIR)/debian
-	-sed s/%arch%/$(ARCH)/ control > $(DEB_SOURCE_DIR)/debian/control
-	-cp changelog $(DEB_SOURCE_DIR)/debian
-	-cp copyright $(DEB_SOURCE_DIR)/debian
-	-rm $(DEB_SOURCE_DIR)/*stamp
-	-cp euphoria-manual $(DEB_SOURCE_DIR)/debian
-	-echo 7 > $(DEB_SOURCE_DIR)/debian/compat
+	-rm -fr $(DEB_SOURCE_DIR)/debian/*
+	cp Makefile.eu $(DEB_SOURCE_DIR)/debian/euphoria
+	cp Makefile.eu $(DEB_SOURCE_DIR)/debian
+	cp rules $(DEB_SOURCE_DIR)/debian
+	cp postinst $(DEB_SOURCE_DIR)/debian
+	cp prerm $(DEB_SOURCE_DIR)/debian
+	cp $(DEB_SOURCE_DIR)/docs/man/*.1 $(DEB_SOURCE_DIR)/debian
+	sed s/%arch%/$(ARCH)/ control > $(DEB_SOURCE_DIR)/debian/control
+	cp changelog  $(DEB_SOURCE_DIR)/debian/changelog
+	cp copyright $(DEB_SOURCE_DIR)/debian
+	rm -f $(DEB_SOURCE_DIR)/*stamp
+	cp euphoria-manual $(DEB_SOURCE_DIR)/debian
+	echo 7 > $(DEB_SOURCE_DIR)/debian/compat
 	cd $(DEB_SOURCE_DIR)/source && ./configure --prefix /usr $(CONFIG)
 	echo TARGET: UPDATE - MAKING SOURCE
 	$(MAKE) -C $(DEB_SOURCE_DIR)/source source
@@ -52,4 +62,4 @@ dh-make : update
 
 
 
-.PHONY : clean binclean update dh-make
+.PHONY : clean binclean update dh-make

packaging/debian/changelog

@@ -1,3 +1,9 @@
+euphoria (4.2.0) development; urgency=low
+
+  * 4.2.0 Release: large enhancements
+
+ -- Shawn Pringle <shawn.pringle@gmail.com>  Fri, 4 Apr 2025 11:51:50 -0300
+
 euphoria (4.0.5) stable; urgency=low
 
   * 4.0.5 Release: bug fixes and enhancements

packaging/debian/rules

@@ -17,12 +17,12 @@ export DH_VERBOSE=1
 export DH_OPTIONS
 
 
-include ../Makefile.eu
+include Makefile.eu
 
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
 	CFLAGS += -O0
 else
-	CFLAGS += -O2
+	CFLAGS += -O3
 endif
 
 configure: configure-stamp
@@ -47,10 +47,7 @@ build-indep: build-indep-stamp
 build-indep-stamp: configure-stamp 
 	# Add here commands to compile the indep part of the package.
 	echo TARGET build-index-stamp
-	$(MAKE) -C source htmldoc pdfdoc-initial
-	$(MAKE) -C source  pdfdoc-initial
-	$(MAKE) -C source  pdfdoc-initial
-	$(MAKE) -C source  pdfdoc-initial
+	$(MAKE) -C source htmldoc
 	touch $@
 
 clean:
@@ -69,7 +66,8 @@ install-indep:
 	echo TARGET install-indep
 	dh_testdir
 	dh_testroot
-	dh_clean -k -i 
+	dh_clean -k -i
+	-rm  euphoria/debian/euphoria
 	dh_installdirs -i
 	# Add here commands to install the indep part of the package into
 	# debian/<package>-doc.
@@ -81,7 +79,8 @@ install-arch:
 	dh_testdir
 	dh_testroot
 	dh_clean -k -s 
-	dh_installdirs -s
+	-rm  euphoria/debian/euphoria
+	#dh_installdirs -s
 	# Add here commands to install the arch part of the package into 
 	# debian/tmp.
 	$(MAKE) DESTDIR=$(CURDIR)/debian/euphoria install install-docs install-tools

source/Makefile.gnu

@@ -809,7 +809,7 @@ htmldoc : $(BUILDDIR)/html/index.html
 
 pdfdoc : $(BUILDDIR)/euphoria.pdf
 
-$(BUILDDIR)/pdf/euphoria.txt : $(EU_DOC_SOURCE)
+$(BUILDDIR)/pdf/euphoria.txt : $(EU_DOC_SOURCE) $(TRUNKDIR)/License.txt
 	-mkdir -p $(BUILDDIR)/pdf
 	$(EUDOC) -d PDF --single --strip=2 -a $(TRUNKDIR)/docs/manual.af -o $(CYPBUILDDIR)/pdf/euphoria.txt