The unified diff between revisions [d7d3f728..] and [9a61bb9f..] is displayed below. It can also be downloaded as a raw diff.
#
#
# delete "debian/build.gpr"
#
# delete "debian/patches/remove_sigpwr"
#
# add_file "debian/patches/makefile_import_soversion"
# content [e2e30beb590acc98bd00f4244af972707fef850e]
#
# patch "debian/DEV_PKG.install"
# from [946201af944f990687333a6eafc3fe8f9476471e]
# to [1ff1fc7f77f2870a3748b725d5b8e47184c8f795]
#
# patch "debian/DOC_PKG.examples"
# from [31a6ce48b6e932f8ea7b68973e4a6dfe91976478]
# to [fff4ae65ec9127834e2ea91f215900005ea6629b]
#
# patch "debian/LIB_PKG.docs"
# from [464b530a1247d0be2ae8931fa016f41a29957961]
# to [9235b3221ab731b4fbc62adf7dad1349a14b97c9]
#
# patch "debian/LIB_PKG.install"
# from [2fb98604d0dfb94f8a8b0b67b1bbdb0220ac8b1a]
# to [b7847742976ae44ba10f2d4f56e66132ae39c00d]
#
# patch "debian/changelog"
# from [21f23607a0dbdb2910572bbcbc3553d733092ea0]
# to [5267610c366e4f97f123cbf69769d676389219ce]
#
# patch "debian/control"
# from [66dde791b3a4b57d3753069aa793fcf863695581]
# to [5b18bbace6470f44d0510fdb7116675801237990]
#
# patch "debian/patches/series"
# from [5514bad8e7ac20d9234ae931adffa2210e07dad3]
# to [7de0f08e1ce7278091b7f7eba4d4da25f514a856]
#
# patch "debian/patches/stdbool.patch"
# from [3c31b7e18e061dd62b13db5f322016d5d42adeac]
# to [919d34b549f6c871cd624cc3f883d62705ffa205]
#
# patch "debian/rules"
# from [bd553e5ec20acf2e16aa87f92cb17d972cd2a354]
# to [e4e7db208aea62f61f16f43139a1e3a2839857fa]
#
============================================================
--- debian/patches/makefile_import_soversion e2e30beb590acc98bd00f4244af972707fef850e
+++ debian/patches/makefile_import_soversion e2e30beb590acc98bd00f4244af972707fef850e
@@ -0,0 +1,15 @@
+Debian must set SOVERSION used by Makefile.
+This is a misconception. It will be fixed in next upstream.
+Index: b/Makefile
+===================================================================
+--- a/Makefile 2010-01-21 01:50:28.000000000 +0100
++++ b/Makefile 2010-01-21 01:51:02.000000000 +0100
+@@ -24,7 +24,7 @@
+ # USA
+
+ export LIB_NAME := texttools
+-SOVERSION := 1
++SOVERSION ?= 1
+ export SONAME := lib$(LIB_NAME).so.$(SOVERSION)
+ export LIB_DIR := .
+
============================================================
--- debian/DEV_PKG.install 946201af944f990687333a6eafc3fe8f9476471e
+++ debian/DEV_PKG.install 1ff1fc7f77f2870a3748b725d5b8e47184c8f795
@@ -1,5 +1,4 @@
# debian/rules will preprocess and rename that file
-*.ad[sb] C_code/*.[ch] usr/share/ada/adainclude/LIB_NAME
-debian/LIB_NAME.gpr usr/share/ada/adainclude
-shared-ali/* usr/lib/ada/adalib/LIB_NAME
-libLIB_NAME.a usr/lib
+usr/share/ada/adainclude
+usr/lib/ada/adalib/LIB_NAME
+usr/lib/libLIB_NAME.a
============================================================
--- debian/DOC_PKG.examples 31a6ce48b6e932f8ea7b68973e4a6dfe91976478
+++ debian/DOC_PKG.examples fff4ae65ec9127834e2ea91f215900005ea6629b
@@ -1,3 +1,5 @@
# debian/rules will preprocess and rename that file
-examples/*
+# do not copy example/Makefile
+examples/*.adb
+examples/listinfo.txt
cpp
============================================================
--- debian/LIB_PKG.docs 464b530a1247d0be2ae8931fa016f41a29957961
+++ debian/LIB_PKG.docs 9235b3221ab731b4fbc62adf7dad1349a14b97c9
@@ -1,3 +1,3 @@
# debian/rules will preprocess and rename that file
-# This should be automatic accorded to man dh_installdocs
+# This should be automatic accorded to man dh_installdocs.
debian/README.Debian
============================================================
--- debian/LIB_PKG.install 2fb98604d0dfb94f8a8b0b67b1bbdb0220ac8b1a
+++ debian/LIB_PKG.install b7847742976ae44ba10f2d4f56e66132ae39c00d
@@ -1 +1,2 @@
-libLIB_NAME.so.SOVERSION usr/lib
+# debian/rules will preprocess and rename that file
+usr/lib/libLIB_NAME.so.SOVERSION
============================================================
--- debian/changelog 21f23607a0dbdb2910572bbcbc3553d733092ea0
+++ debian/changelog 5267610c366e4f97f123cbf69769d676389219ce
@@ -1,21 +1,24 @@
-libtexttools (2.0.5-3) unstable; urgency=low
+libtexttools (2.0.6-1) unstable; urgency=low
- * Closes: 557894 removed unused SIGPWR reference, unavailable on FreeBSD.
+ * new upstream release.
+ Causes package name changes, see 2.0.5-2.
+ libtexttools1-dev -> libtexttools2-dev (with Conflicts and Replaces)
+ libtexttools3(-dbg) -> libtexttools4(-dbg)
+ Closes: #557894, #249917, #563991.
* control: updated XS-Vcs- field to Vcs- to follow new dpkg policy.
(Architectures) documented alpha removal
(Priority) extra seems more realistic
- (Vcs-Browser) used official URL
+ (Vcs-Browser) used official URL.
(Section) removed binary section inherited from source
(Description) given each binary a distinct description
* build.gpr;rules: documented -fstack-check removal
- * watches: added.
+ * watch: added.
* copyright: GPL-3 instead of GPL.
- * patch/stdbool.h: documented.
* rules: separated debhelper files to ease readability.
- Added patch target.
+ Used upstream build process, with a patch to transmit soversion.
* DOC_PKG.doc-base.*: added.
- -- Nicolas Boulenguez <nicolas.boulenguez@free.fr> Wed, 13 Jan 2010 02:37:34 +0100
+ -- Nicolas Boulenguez <nicolas.boulenguez@free.fr> Thu, 21 Jan 2010 02:06:33 +0100
libtexttools (2.0.5-2) unstable; urgency=low
============================================================
--- debian/control 66dde791b3a4b57d3753069aa793fcf863695581
+++ debian/control 5b18bbace6470f44d0510fdb7116675801237990
@@ -1,19 +1,19 @@ Source: libtexttools
Source: libtexttools
+Section: libdevel
Priority: extra
Maintainer: Nicolas Boulenguez <nicolas.boulenguez@free.fr>
Uploaders: Ludovic Brenta <lbrenta@debian.org>
-Section: libdevel
Build-Depends: debhelper (>= 7.0.50~), ncurses-dev, gnat, gnat-4.4, quilt
Standards-Version: 3.8.3
Vcs-Browser: http://ada-france.org:8081/branch/changes/org.debian.texttools
Homepage: http://www.pegasoft.ca/tt.html
-Package: libtexttools1-dev
+Package: libtexttools2-dev
Architecture: amd64 hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
# alpha is temporarily disabled due to #http://gcc.gnu.org/PR42073
-Depends: ${misc:Depends}, gnat-4.4, libtexttools3 (= ${binary:Version})
-Conflicts: libtexttools-dev
-Replaces: libtexttools-dev
+Depends: ${misc:Depends}, gnat-4.4, libtexttools4 (= ${binary:Version})
+Conflicts: libtexttools-dev, libtexttools1-dev
+Replaces: libtexttools-dev, libtexttools1-dev
Description: Ada and C++ library for writing console applications: development
The Texttools packages are a GPL, ncurses-based library for the Linux
console. Texttools contain more than 600 procedures and functions to
@@ -25,7 +25,7 @@ Description: Ada and C++ library for wri
Install this package if you want to write Ada or C++ programs that
use Texttools.
-Package: libtexttools3
+Package: libtexttools4
Section: libs
Architecture: amd64 hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
# alpha is temporarily disabled due to #http://gcc.gnu.org/PR42073
@@ -44,7 +44,7 @@ Depends: ${misc:Depends}
Section: doc
Architecture: all
Depends: ${misc:Depends}
-Conflicts: libtexttools-dev (<< 2.0.5-1)
+Conflicts: libtexttools-dev (<< 2.0.6-1)
Description: Ada and C++ library for writing console applications: documentation
The Texttools packages are a GPL, ncurses-based library for the Linux
console. Texttools contain more than 600 procedures and functions to
@@ -55,12 +55,12 @@ Description: Ada and C++ library for wri
.
This package contains the documentation.
-Package: libtexttools3-dbg
+Package: libtexttools4-dbg
Section: debug
Architecture: amd64 hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
# alpha is temporarily disabled due to #http://gcc.gnu.org/PR42073
-Depends: ${misc:Depends}, libtexttools3 (= ${binary:Version})
-Recommends: libtexttools1-dev (= ${binary:Version})
+Depends: ${misc:Depends}, libtexttools4 (= ${binary:Version})
+Recommends: libtexttools2-dev (= ${binary:Version})
Description: Ada and C++ library for writing console applications: debug symbols
The Texttools packages are a GPL, ncurses-based library for the Linux
console. Texttools contain more than 600 procedures and functions to
============================================================
--- debian/patches/series 5514bad8e7ac20d9234ae931adffa2210e07dad3
+++ debian/patches/series 7de0f08e1ce7278091b7f7eba4d4da25f514a856
@@ -1,2 +1,2 @@
-remove_sigpwr
+makefile_import_soversion
stdbool.patch
============================================================
--- debian/patches/stdbool.patch 3c31b7e18e061dd62b13db5f322016d5d42adeac
+++ debian/patches/stdbool.patch 919d34b549f6c871cd624cc3f883d62705ffa205
@@ -1,5 +1,6 @@ 8 while C uses 8*sizeof(int).
Allow compilation of mixed Ada and C code. In Ada, Boolean'Size is
8 while C uses 8*sizeof(int).
+This file will be included by CPP instead standard one.
Index: b/C_code/stdbool.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
============================================================
--- debian/rules bd553e5ec20acf2e16aa87f92cb17d972cd2a354
+++ debian/rules e4e7db208aea62f61f16f43139a1e3a2839857fa
@@ -28,13 +28,14 @@
##########################################
# Guess some variables from control file.
##########################################
+# LIB_NAME and SOVERSION must be exported to upstream Makefile.
-LIB_NAME := $(shell sed -n -e "s/^Source: lib\(.\+\)$$/\1/p" debian/control)
+export LIB_NAME := $(shell sed -n -e "s/^Source: lib\(.\+\)$$/\1/p" debian/control)
ifndef LIB_NAME
$(error Could not guess LIB_NAME from debian/control)
endif
-SOVERSION := $(shell sed -n -e "s/^Package: lib$(LIB_NAME)\(.\+\)-dbg$$/\1/p" debian/control)
+export SOVERSION := $(shell sed -n -e "s/^Package: lib$(LIB_NAME)\(.\+\)-dbg$$/\1/p" debian/control)
ifndef SOVERSION
$(error Could not guess SOVERSION from debian/control)
endif
@@ -93,32 +94,6 @@ patch build binary binary-arch binary-in
patch build binary binary-arch binary-indep clean install:
dh --with quilt $@
-override_dh_auto_build: $(SONAME) lib$(LIB_NAME).a
-
-# export some variables to GNAT project file.
-export LIB_NAME
-export SONAME
-export LIB_DIR := .
-# gnatmake can do parallel builds; we don't want make to interfere.
-.NOTPARALLEL:
-CPUS := $(shell getconf _NPROCESSORS_ONLN)
-
-$(SONAME):
- gnatmake -j$(CPUS) --create-missing-dirs -Pdebian/build.gpr \
- -XLIB_KIND=dynamic -XLIB_OBJ_DIR=shared-obj -XLIB_ALI_DIR=shared-ali
-
-lib$(LIB_NAME).a:
- gnatmake -j$(CPUS) --create-missing-dirs -Pdebian/build.gpr \
- -XLIB_KIND=static -XLIB_OBJ_DIR=static-obj -XLIB_ALI_DIR=static-ali
-
-override_dh_auto_clean:
- rm -rf shared-obj shared-ali static-obj static-ali
- rm -f $(SONAME) lib$(LIB_NAME).so lib$(LIB_NAME).a
-
-override_dh_auto_install:
-override_dh_auto_test:
-# Nothing to do, but we do not want to call upstream Makefile.
-
override_dh_compress:
dh_compress --all --exclude=.ads --exclude=.adb --exclude=Makefile --exclude=.c --exclude=.h --exclude=.cpp
@@ -128,24 +103,3 @@ override_dh_installdocs:
override_dh_installdocs:
dh_installdocs --all --link-doc=$(LIB_PKG)
-
-
-######################################################################
-# All that C stuff will be unnecessary with gprbuild’s mixed C/Ada
-# project files. For the moment, gnatmake will embed all .o files,
-# we only have to compile them and store them in the object dir.
-#####################################################################
-
-C_OBJECTS := $(patsubst C_code/%.c,%.o,$(wildcard C_code/*.c))
-
-$(SONAME): $(addprefix shared-obj/,$(C_OBJECTS))
-lib$(LIB_NAME).a: $(addprefix static-obj/,$(C_OBJECTS))
-
-%.o: CFLAGS += -g -O2 -D_Bool=char
-# -fstack-check temporarily disabled due to http://gcc.gnu.org/PR20548.
-shared-obj/%.o: C_code/%.c | shared-obj
- $(CC) -c $(CPPFLAGS) $(CFLAGS) $< -o $@ -fPIC
-static-obj/%.o: C_code/%.c | static-obj
- $(CC) -c $(CPPFLAGS) $(CFLAGS) $< -o $@
-shared-obj static-obj:
- mkdir --parents $@