--- libflorist-2008.orig/.bashrc +++ libflorist-2008/.bashrc @@ -0,0 +1,2 @@ +export DEBFULLNAME="David Sauvage" +export DEBEMAIL="sauvage.david@gmail.com" --- libflorist-2008.orig/patches/compiler_options.patch +++ libflorist-2008/patches/compiler_options.patch @@ -0,0 +1,29 @@ +Index: libflorist-2008/florist_build.gpr +=================================================================== +--- libflorist-2008.orig/florist_build.gpr ++++ libflorist-2008/florist_build.gpr +@@ -1,22 +1,8 @@ + project Florist_Build is + +- type Build_Type is ("Debug", "Production"); +- Build : Build_Type := External ("Build", "Production"); +- + package Compiler is +- GNAT_Flags := ("-O2", "-gnatpg"); +- +- for Switches ("posix-signals.adb") use GNAT_Flags; +- for Switches ("posix-implementation.adb") use GNAT_Flags; +- for Switches ("posix-supplement_to_ada_io.adb") use GNAT_Flags; +- for Switches ("posix-unsafe_process_primitives.adb") use GNAT_Flags; +- +- case Build is +- when "Debug" => +- for Default_Switches ("Ada") use ("-O2", "-gnatwae", "-gnatyg"); +- when "Production" => +- for Default_Switches ("Ada") use ("-O2", "-gnatp"); +- end case; ++ for Default_Switches ("Ada") use ++ ("-g", "-O2", "-gnatVa", "-gnatafno", "-fstack-check", "-gnatwa"); + end Compiler; + + end Florist_Build; --- libflorist-2008.orig/debian/control +++ libflorist-2008/debian/control @@ -0,0 +1,46 @@ +Source: libflorist +Section: libs +Priority: optional +Maintainer: Ludovic Brenta +Build-Depends: debhelper (>> 5), gnat (>= 4.3), quilt +Standards-Version: 3.8.0 + +Package: libflorist-dev +Section: libdevel +Conflicts: libflorist-3.15p-1-dev +Replaces: libflorist-3.15p-1-dev +Architecture: alpha amd64 hppa i386 ia64 kfreebsd-i386 mips mipsel ppc64 powerpc s390 sparc +Depends: libflorist2008 (= ${source:Version}), gnat, gnat-4.3 +Description: POSIX.5 Ada interface to operating system services + FLORIST is an implementation of the IEEE Standards 1003.5: 1992, IEEE + STD 1003.5b: 1996, and parts of IEEE STD 1003.5c: 1998, also known as + the POSIX Ada Bindings. Using this library, you can call operating + system services from within Ada programs. + . + This package contains the development files and unstripped static + library. + +Package: libflorist2008 +Section: libs +Architecture: alpha amd64 hppa i386 ia64 kfreebsd-i386 mips mipsel ppc64 powerpc s390 sparc +Depends: ${shlibs:Depends} +Description: POSIX.5 Ada interface to operating system services + FLORIST is an implementation of the IEEE Standards 1003.5: 1992, IEEE + STD 1003.5b: 1996, and parts of IEEE STD 1003.5c: 1998, also known as + the POSIX Ada Bindings. Using this library, you can call operating + system services from within Ada programs. + . + This package contains the run-time shared library. + +Package: libflorist-dbg +Section: libdevel +Priority: extra +Architecture: alpha amd64 hppa i386 ia64 kfreebsd-i386 mips mipsel ppc64 powerpc s390 sparc +Depends: libflorist2008 (=${source:Version}) +Description: POSIX.5 Ada interface to operating system services + FLORIST is an implementation of the IEEE Standards 1003.5: 1992, IEEE + STD 1003.5b: 1996, and parts of IEEE STD 1003.5c: 1998, also known as + the POSIX Ada Bindings. Using this library, you can call operating + system services from within Ada programs. + . + This package contains the debugging symbols for the run-time shared library. --- libflorist-2008.orig/debian/rules +++ libflorist-2008/debian/rules @@ -0,0 +1,126 @@ +#!/usr/bin/make -f +# Sample debian/rules that uses debhelper. +# GNU copyright 1997 to 1999 by Joey Hess. + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 +export SHELL=/bin/bash + +# These are used for cross-compiling and for saving the configure script +# from having to guess our platform (since we know it already) +DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) +CPUS ?= $(shell getconf _NPROCESSORS_ONLN) + +CFLAGS = -Wall -g + +# Parse the version number from the change log: +# major.minor-revision +regexp:=^Version: \([0-9]\+\)-\(.\+\)$$ +major:=$(shell dpkg-parsechangelog | grep ^Version: | sed 's/$(regexp)/\1/') +# minor:=$(shell dpkg-parsechangelog | grep ^Version: | sed 's/$(regexp)/\2/') +revision:=$(shell dpkg-parsechangelog | grep ^Version: | sed 's/$(regexp)/\2/') + +include /usr/share/quilt/quilt.make + +config.status: configure + dh_testdir + CC="gnatgcc -w" ./configure \ + --host=$(DEB_HOST_GNU_TYPE) \ + --build=$(DEB_BUILD_GNU_TYPE) \ + --prefix=/usr \ + --mandir=\$${prefix}/share/man \ + --infodir=\$${prefix}/share/info + +build: patch build-stamp +build-stamp: debian/stamp-patched config.status + dh_testdir + : # Build the static library as per the upstream Makefile + $(MAKE) GNATMAKEFLAGS1B="-g -O2" GCCFLAGS="-g -O2" GNATMAKE="gnatmake -j$(CPUS)" + mv floristlib/libflorist.a . + : # Build the shared library + rm -f floristlib/* *.o *.ali + $(MAKE) GNATMAKEFLAGS1B="-O2 -fPIC" GCCFLAGS="-O2 -fPIC" GNATMAKE="gnatmake -j$(CPUS) -fPIC" + rm floristlib/libflorist.a deps.o deps.ali + gnatgcc -shared *.o \ + -o libflorist.so.$(major) \ + -Wl,--soname,libflorist.so.$(major) \ + -lgnat -lgnarl -lrt -lpthread + touch build-stamp + +clean: unpatch + dh_testdir + dh_testroot + rm -f build-stamp + -$(MAKE) distclean + -rm -f config.{h,log,status} gnatprep.config Makefile pconfig.h \ + pconfig.h.in stamp-h c-posix-signals c-posix-signals.log \ + libflorist* + dh_clean + +install: build preinstall libflorist$(major) libflorist-dev libflorist-dbg + +preinstall: + dh_testdir + dh_testroot + dh_clean -k + +libflorist$(major): + dh_install -p$@ libflorist.so.$(major) usr/lib + dh_strip -p$@ --dbg-package=libflorist-dbg + dh_makeshlibs -p$@ + dh_shlibdeps -p$@ + +libflorist-dev: + dh_installdirs -p$@ \ + usr/share/ada/adainclude/florist \ + usr/lib/ada/adalib/florist + dh_installdocs -p$@ README + dh_link -p$@ \ + usr/lib/libflorist.so.$(major) \ + usr/lib/libflorist.so + dh_install -p$@ libflorist.a usr/lib + dh_install -p$@ floristlib/*.ad[bs] usr/share/ada/adainclude/florist + dh_install -p$@ *.c *.h usr/share/ada/adainclude/florist + dh_install -p$@ debian/florist.gpr usr/share/ada/adainclude + dh_install -p$@ floristlib/*.ali usr/lib/ada/adalib/florist + +libflorist-dbg: + dh_installdirs -p$@ usr/lib/debug/usr/lib + dh_installdocs -p$@ + +# Build architecture-independent files here. +binary-indep: build install +# We have nothing to do by default. + +# Build architecture-dependent files here. +binary-arch: build-stamp install + dh_testdir + dh_testroot + dh_installchangelogs + dh_installdocs + dh_installexamples +# dh_install +# dh_installmenu +# dh_installdebconf +# dh_installlogrotate +# dh_installemacsen +# dh_installpam +# dh_installmime +# dh_installinit +# dh_installcron +# dh_installinfo + dh_installman + dh_link + dh_compress + dh_fixperms +# dh_perl +# d_python + dh_installdeb + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-indep binary-arch preinstall +.PHONY: libflorist$(major) libflorist-dev +.PHONY: build clean binary-indep binary-arch binary install --- libflorist-2008.orig/debian/copyright +++ libflorist-2008/debian/copyright @@ -0,0 +1,57 @@ +This package was debianized by Ludovic Brenta on +Mon, 18 Aug 2003 10:03:11 +0200. + +It was downloaded from http://libre.adacore.com + +Upstream Author: Florida State University and AdaCore + +Copyright: + +Florist is copyright (c) 1996-1997 Florida State University + copyright (c) 1998-2006 AdaCore + +Florist is free software; you can redistribute it and/or modify it +under terms of the GNU General Public License as published by the Free +Software Foundation; either version 2, or (at your option) any later +version. FLORIST is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +General Public License for more details. You should have received a +copy of the GNU General Public License distributed with GNARL (see +file COPYING). If not, write to the Free Software Foundation, 51 +Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +On Debian GNU/Linux systems, the full text of the GNU General Public +License is in the file /usr/share/common-licenses/GPL. + +IMPORTANT NOTE: + +Previous versions of Florist used to contain the following "special +exception" that allowed distributing proprietary software linked with +Florist. THIS EXCEPTION HAS BEEN REMOVED. As a consequence, if you +use Florist in your program, you have four options: + +1) do not distribute your software to anyone outside your organisation + (you can always use it for yourself). + +2) distribute your software under the terms of the GNU General Public + License (this implies that you must distribute the sources of your + software along with the binaries). + +3) distribute your software in source-only form, under any licensing + terms you choose (including for example NDA or non-redistribution + clauses), and ask your licensees to compile your program for + themselves. + +4) Contact AdaCore (sales@adacore.com) for a GNAT-Modified GNU General + Public license which will allow you to distribute your binaries + without disclosing your sources. + +The REMOVED "special exception" text follows: + +As a special exception, if other files instantiate generics from this +unit, or you link this unit with other files to produce an executable, +this unit does not by itself cause the resulting executable to be +covered by the GNU General Public License. This exception does not +however invalidate any other reasons why the executable file might be +covered by the GNU Public License. --- libflorist-2008.orig/debian/changelog +++ libflorist-2008/debian/changelog @@ -0,0 +1,96 @@ +libflorist (2008-1ubuntu3) karmic; urgency=low + * rebuild for Karmic + * debian/rules : + add -lgnarl -lrt -lpthread + to the gnatgcc -shared command to build (after -lgnat) + the libflorist.so shared library without + unreferenced symbols + * debian/florist.gpr : add for Externally_Built use "true"; + * debian/florist.gpr : correct wrong Library_Name, should be florist + + -- David Sauvage Sun, 10 Jan 2010 16:28:51 +0100 + +libflorist (2008-1) unstable; urgency=low + + * New upstream version. + * Restore support for GNU/kFreeBSD and, possibly, GNU/HURD as well. + Thanks to Cyril Brulebois for the patch. Closes: #415084. + - debian/control (Build-Depends): add quilt. + - debian/patches/series, debian/patches/kfreebsd.patch: new. + - debian/rules: use quilt to apply and revert the above patches. + * debian/control: + (Standards-Version): update to 3.8.0. + (Build-Depends): Migrate to gnat-4.3. + (Architecture): add mips, mipsel and ppc64. Closes: #479075 + (libflorist2006): rename to libflorist2008 and bump the soname. + (libflorist-dbg): new. + * debian/florist.gpr: turn into a library project file. + * debian/rules: provide all files, not just Ada files, in the -dev + package, so users can use gdb into the library in case of need. + Use all processors available when building. + * debian/patches/compiler_options.patch: compile with all optional + run-time checks enabled, and debugging options. + + -- Ludovic Brenta Sun, 20 Jul 2008 18:03:14 +0200 + +libflorist (2006-1) unstable; urgency=low + + * debian/control (Maintainer): update email address, I'm now a full DD. + (Build-Depends): update to gnat (>= 4.1). + (Standards-Version): update to 3.7.2 with no changes required. + (Architecture): add alpha, amd64, hppa, ia64, kfreebsd-i386 and s390. + (libflorist-3.15p-1-dev): rename to libflorist-dev, with Conflict and + Replace. Depend on gnat-4.1. + (libflorist-3.15p-1): rename to libflorist2006. + * debian/control: soname bump to libflorist.so.2006. + + -- Ludovic Brenta Thu, 21 Sep 2006 18:49:32 +0200 + +libflorist-3.15p-1 (3.15p-5) unstable; urgency=low + + * debian/control: Change maintainer's email address. Bump + standards-version to 3.6.2 (from 3.6.1.1) with no changes. + * debian/rules (regexp): accept any character as the Debian upload + number. Closes: #359891. + + -- Ludovic Brenta Sat, 1 Apr 2006 12:36:36 +0200 + +libflorist-3.15p-1 (3.15p-4) unstable; urgency=low + + * Added a GNAT project file. Closes: #266694. + * Recompiled because s-osinte.ads has been modified in gnat. + Closes: #266700. + * debian/rules: accept dots in Debian revision numbers in case of NMU. + * debian/libflorist-3.15p-1-dev.postinst: Remove. Do not chmod the + *.ali files anymore. Newer versions of dh_fixperms does that for us. + * debian/control: Build-Depend on debhelper (>= 4.2.13). + * debian/control: Update Standards-Version to 3.6.1.1. + * debian/copyright: Mention /usr/share/common-licenses/GPL. + Closes: #266697. + + -- Ludovic Brenta Wed, 18 Aug 2004 20:03:40 +0200 + +libflorist-3.15p-1 (3.15p-3) unstable; urgency=low + + * Work around a compilation problem caused by libc6-dev 2.3.2.ds1-10 in + Sid (no problem in Sarge with libc6-dev 2.3.2-9). + + -- Ludovic Brenta Tue, 11 Nov 2003 18:04:34 +0100 + +libflorist-3.15p-1 (3.15p-2) unstable; urgency=low + + * Rebuild the static library without -fPIC, and the shared library with + it. + + -- Ludovic Brenta Tue, 19 Aug 2003 13:45:07 +0200 + +libflorist-3.15p-1 (3.15p-1) unstable; urgency=low + + * Initial Release. + + -- Ludovic Brenta Mon, 18 Aug 2003 10:03:11 +0200 + + +Local variables: +left-margin: 2 +End: --- libflorist-2008.orig/debian/compat +++ libflorist-2008/debian/compat @@ -0,0 +1 @@ +5 --- libflorist-2008.orig/debian/florist.gpr +++ libflorist-2008/debian/florist.gpr @@ -0,0 +1,38 @@ +-- O mighty Emacs, please use -*- Ada -*- mode in this lowly file. +-- +-- Florist project file for use with GNAT +-- Copyright (c) 2004, 2008 Ludovic Brenta +-- +-- This program is free software; you can redistribute it and/or modify +-- it under the terms of the GNU General Public License as published by +-- the Free Software Foundation; either version 2 of the License, or +-- (at your option) any later version. +-- +-- This program is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-- GNU General Public License for more details. +-- +-- You should have received a copy of the GNU General Public License +-- along with this program; if not, write to the Free Software +-- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + +-- This project file is designed to help build applications that use +-- Florist, the Tcl Ada SHell. Here is an example of how to use this +-- project file: +-- +-- with "florist"; +-- project Example is +-- for Object_Dir use "obj"; +-- for Exec_Dir use "."; +-- for Main use ("example"); +-- end Example; + +project Florist is + for Library_Name use "florist"; + for Library_Kind use "dynamic"; + for Library_Dir use "/usr/lib"; + for Source_Dirs use ("/usr/share/ada/adainclude/florist"); + for Object_Dir use "/usr/lib/ada/adalib/florist"; + for Externally_Built use "True"; +end Florist; --- libflorist-2008.orig/debian/patches/kfreebsd.patch +++ libflorist-2008/debian/patches/kfreebsd.patch @@ -0,0 +1,33 @@ +This patch from Cyril Brulebois allows building Florist on +GNU/kFreeBSD and, hopefully, GNU/HURD as well. Thanks, Cyril. + +-- +Ludovic Brenta. + + +Index: libflorist-2008/configure.in +=================================================================== +--- libflorist-2008.orig/configure.in ++++ libflorist-2008/configure.in +@@ -74,7 +74,7 @@ + *) cp ./configs/pconfig.SunOS5.6 ./pconfig.h.in ;; + esac + ;; +- Linux) ++ Linux|GNU/kFreeBSD|GNU) + # .... need to add cases here for different thread and C libraries + echo "Using Configuration for" ${UNAME_SYSTEM} ${UNAME_RELEASE}; + cp ./configs/pconfig.Linux ./pconfig.h.in; +Index: libflorist-2008/configure +=================================================================== +--- libflorist-2008.orig/configure ++++ libflorist-2008/configure +@@ -2239,7 +2239,7 @@ + *) cp ./configs/pconfig.SunOS5.6 ./pconfig.h.in ;; + esac + ;; +- Linux) ++ Linux|GNU/kFreeBSD|GNU) + # .... need to add cases here for different thread and C libraries + echo "Using Configuration for" ${UNAME_SYSTEM} ${UNAME_RELEASE}; + cp ./configs/pconfig.Linux ./pconfig.h.in; --- libflorist-2008.orig/debian/patches/compiler_options.patch +++ libflorist-2008/debian/patches/compiler_options.patch @@ -0,0 +1,29 @@ +Index: libflorist-2008/florist_build.gpr +=================================================================== +--- libflorist-2008.orig/florist_build.gpr ++++ libflorist-2008/florist_build.gpr +@@ -1,22 +1,8 @@ + project Florist_Build is + +- type Build_Type is ("Debug", "Production"); +- Build : Build_Type := External ("Build", "Production"); +- + package Compiler is +- GNAT_Flags := ("-O2", "-gnatpg"); +- +- for Switches ("posix-signals.adb") use GNAT_Flags; +- for Switches ("posix-implementation.adb") use GNAT_Flags; +- for Switches ("posix-supplement_to_ada_io.adb") use GNAT_Flags; +- for Switches ("posix-unsafe_process_primitives.adb") use GNAT_Flags; +- +- case Build is +- when "Debug" => +- for Default_Switches ("Ada") use ("-O2", "-gnatwae", "-gnatyg"); +- when "Production" => +- for Default_Switches ("Ada") use ("-O2", "-gnatp"); +- end case; ++ for Default_Switches ("Ada") use ++ ("-g", "-O2", "-gnatVa", "-gnatafno", "-fstack-check", "-gnatwa"); + end Compiler; + + end Florist_Build; --- libflorist-2008.orig/debian/patches/series +++ libflorist-2008/debian/patches/series @@ -0,0 +1,3 @@ +kfreebsd.patch +compiler_options.patch +