The unified diff between revisions [860ccb1a..] and [b0ab670a..] is displayed below. It can also be downloaded as a raw diff.
#
#
# delete ".mtn-ignore"
#
# delete "debian/README.source"
#
# delete "debian/patches"
#
# delete "debian/patches/info.patch"
#
# delete "debian/patches/series"
#
# add_file "build_all.gpr"
# content [9b9af507e56508c9261b7751f5061b097807000c]
#
# patch "debian/aunit_build.gpr"
# from [111796c9399067e11bc422e5fa0f5ba5fd8f9a10]
# to [240e9d914b12ad483fa19a66c171a1028c3eaef5]
#
# patch "debian/aunit_test.gpr"
# from [9b60a7882d8d1bd02798848f95a467d711dc80a9]
# to [dda9a08e87c4ccb62514dc851e5454407ac5f289]
#
# patch "debian/changelog"
# from [1dbeeab1b633b39827791a7e3668ed42cdcf286a]
# to [e319ce0703e6fcb10e0c58b98b37519777874868]
#
# patch "debian/control"
# from [006ec087ffefcea9d5687f740aa525fd45712993]
# to [8325f5880053e7610288afdde804855624629992]
#
# patch "debian/copyright"
# from [ce466aaf22f75ac16352b00ac11a01b5bafb70b3]
# to [116279a893a71f64bc07deb25874a31af115ee51]
#
# patch "debian/rules"
# from [84c73d52201d01cfd13f19cebc568d98b07d896a]
# to [7128316091e8e980cf2c2ea6a7f5d23acad8eb2d]
#
============================================================
--- build_all.gpr 9b9af507e56508c9261b7751f5061b097807000c
+++ build_all.gpr 9b9af507e56508c9261b7751f5061b097807000c
@@ -0,0 +1,10 @@
+-- Oh, mighty Emacs, please use -*- Ada -*- mode here.
+
+project Build_All is
+ for Source_Dirs use (".", "aunit/framework", "aunit/text_reporter");
+ for Object_Dir use "obj";
+ for Main use ("build_all");
+ package Compiler is
+ for Default_Switches ("Ada") use ("-O2", "-gnatafon", "-gnatVa");
+ end Compiler;
+end Build_All;
============================================================
--- debian/aunit_build.gpr 111796c9399067e11bc422e5fa0f5ba5fd8f9a10
+++ debian/aunit_build.gpr 240e9d914b12ad483fa19a66c171a1028c3eaef5
@@ -1,4 +1,4 @@
--- Copyright (c) 2009, 2010 Stephen Leake <stephen_leake@stephe-leake.org>
+-- Copyright (c) 2009 Stephen Leake <stephen_leake@stephe-leake.org>
--
-- 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
@@ -20,12 +20,8 @@ project AUnit_Build is
for Languages use ("Ada");
for Source_Dirs use
- ("../aunit/containers",
- "../aunit/framework",
- "../aunit/framework/calendar",
- "../aunit/framework/exception",
- "../aunit/framework/nativememory",
- "../aunit/reporters");
+ ("../aunit/framework",
+ "../aunit/text_reporter");
for Library_Dir use "tmp";
@@ -38,16 +34,13 @@ project AUnit_Build is
for Library_Version use "libaunit.so." & external ("soversion");
package Compiler is
- -- WORKAROUND: -fstack-check is broken in gcc 4.3.2
- -- we get aliasing warnings without -fno-strict-aliasing
for Default_Switches ("Ada") use
("-g",
"-O2",
"-gnat05",
"-gnatfno",
"-gnatwa",
- "-gnatVa",
- "-fno-strict-aliasing");
+ "-gnatVa");
end Compiler;
end AUnit_Build;
============================================================
--- debian/aunit_test.gpr 9b60a7882d8d1bd02798848f95a467d711dc80a9
+++ debian/aunit_test.gpr dda9a08e87c4ccb62514dc851e5454407ac5f289
@@ -1,4 +1,4 @@
--- Copyright (c) 2009, 2010 Stephen Leake <stephen_leake@stephe-leake.org>
+-- Copyright (c) 2009 Stephen Leake <stephen_leake@stephe-leake.org>
--
-- 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
@@ -23,14 +23,14 @@ project AUnit_Test is
for Object_Dir use "tmp/aunit_test";
package Compiler is
- -- WORKAROUND: -fstack-check is broken in gcc 4.3.2
for Default_Switches ("Ada") use
("-g",
"-O2",
"-gnat05",
"-gnatfno",
"-gnatwa",
- "-gnatVa");
+ "-gnatVa",
+ "-fstack-check");
end Compiler;
end AUnit_Test;
============================================================
--- debian/changelog 1dbeeab1b633b39827791a7e3668ed42cdcf286a
+++ debian/changelog e319ce0703e6fcb10e0c58b98b37519777874868
@@ -1,10 +1,3 @@
-libaunit (2009-1) unstable; urgency=low
-
- * New upstream release - version changed from 1.03 to 2009
- * bump aliversion and soversion
-
- -- Stephen Leake <stephen_leake@stephe-leake.org> Tue, 12 Jan 2010 01:16:57 -0500
-
libaunit (1.03-4) unstable; urgency=low
[Stephen Leake]
============================================================
--- debian/control 006ec087ffefcea9d5687f740aa525fd45712993
+++ debian/control 8325f5880053e7610288afdde804855624629992
@@ -2,19 +2,20 @@ Maintainer: Stephen Leake <stephen_leake
Section: libs
Priority: optional
Maintainer: Stephen Leake <stephen_leake@stephe-leake.org>
-Build-Depends: debhelper (>= 6.0.7~), gnat-4.4, quilt
+Uploaders: Ludovic Brenta <lbrenta@debian.org>
+Build-Depends: debhelper (>= 6.0.7~), gnat-4.4
Standards-Version: 3.8.3
Homepage: http://libre.adacore.com/libre/
XS-Vcs-Mtn: www.ada-france.org org.debian.libaunit
XS-Vcs-Browser: http://www.ada-france.org:8081/branch/changes/org.debian.libaunit
-Package: libaunit4-dev
+Package: libaunit1-dev
Section: libdevel
Architecture: amd64 hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel ppc64 powerpc sparc s390
-Depends: gnat-4.4, libaunit4 (= ${binary:Version}), ${misc:Depends}
+Depends: gnat-4.4, libaunit3 (= ${binary:Version}), ${misc:Depends}
Suggests: libaunit-dbg
-Conflicts: libaunit-dev, libaunit3-dev
-Replaces: libaunit-dev, libaunit3-dev
+Conflicts: libaunit-dev
+Replaces: libaunit-dev
Description: AUnit, a unit testing framework for Ada
AUnit is a set of Ada packages based on the xUnit family of unit test
frameworks. It's intended as a developer's tool to facilitate
@@ -31,7 +32,7 @@ Section: debug
Priority: extra
Architecture: amd64 hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel ppc64 powerpc sparc s390
Section: debug
-Depends: libaunit4 (= ${binary:Version}), ${misc:Depends}
+Depends: libaunit3 (= ${binary:Version}), ${misc:Depends}
Description: AUnit, a unit testing framework for Ada
AUnit is a set of Ada packages based on the xUnit family of unit test
frameworks. It's intended as a developer's tool to facilitate
@@ -44,7 +45,7 @@ Description: AUnit, a unit testing frame
.
This package contains the debugging symbols for AUnit.
-Package: libaunit4
+Package: libaunit3
Section: libs
Architecture: amd64 hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel ppc64 powerpc sparc s390
Depends: ${shlibs:Depends}, ${misc:Depends}
============================================================
--- debian/copyright ce466aaf22f75ac16352b00ac11a01b5bafb70b3
+++ debian/copyright 116279a893a71f64bc07deb25874a31af115ee51
@@ -1,13 +1,19 @@
-Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135
-Name: gprbuild
-Maintainer: AdaCore <report@gnat.com>
-Source: https://libre.adacore.com/libre/download/
+This package was debianized by Ludovic Brenta <ludovic@ludovic-brenta.org> on
+Tue, 24 Feb 2004 02:33:37 +0100.
-Copyright: Copyright (C) 2006-2008, AdaCore
-License: GPLv2
- /usr/share/common-licenses/GPL-2
+It was downloaded from http://libre.act-europe.fr/aunit.
-Files: some
-Copyright: Copyright (C) 2004-2008, Free Software Foundation
-License: GPLv2
- /usr/share/common-licenses/GPL-2
+Upstream Author: Ed Falis <falis@gnat.com>.
+
+Copyright: Copyright (c) 2000, 2001 Ada Core Technologies, Inc.
+
+AUnit 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. GNAT 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.
+
+On Debian GNU/Linux systems, the full text of the GNU General Public
+License is in /usr/share/common-licenses/GPL.
============================================================
--- debian/rules 84c73d52201d01cfd13f19cebc568d98b07d896a
+++ debian/rules 7128316091e8e980cf2c2ea6a7f5d23acad8eb2d
@@ -1,7 +1,7 @@
#!/usr/bin/make -f
#
# Debian Makefile for AUnit
-# Copyright (c) 2009, 2010 Stephen Leake <stephen_leake@stephe-leake.org>
+# Copyright (c) 2009 Stephen Leake <stephen_leake@stephe-leake.org>
# Copyright (c) 2004, 2006 Ludovic Brenta <ludovic@ludovic-brenta.org>
#
# This program is free software; you can redistribute it and/or modify
@@ -29,21 +29,21 @@
.SUFFIXES=
-include /usr/share/quilt/quilt.make
-
# We use gnatmake, not make, for parallel builds.
.NOTPARALLEL:
CPUS := $(shell getconf _NPROCESSORS_ONLN)
-# get soversions, aliversions from debian/control
-soversion := $(shell sed -n -e "s/^Package: libaunit\([0123456789]\+\)$$/\1/p" debian/control)
-aliversion := $(shell sed -n -e "s/^Package: libaunit\(.\+\)-dev$$/\1/p" debian/control)
+# soversion changes when the library API changes
+soversion := 3
+# aliversion changes when any ali file changes
+aliversion := 1
+
# Targets mandated by the Debian Policy
.PHONY: build binary binary-arch binary-indep clean
-build: patch build-stamp
+build: build-stamp
build-stamp:
dh_testdir
@@ -51,7 +51,7 @@ build-stamp:
gnatmake -p -j$(CPUS) -Pdebian/aunit_build -XLIBTYPE=dynamic -Xsoversion=$(soversion)
touch $@
-clean: unpatch
+clean:
dh_testdir
dh_testroot
dh_clean -a
@@ -96,8 +96,7 @@ libaunit-dev:
dh_install -p$(package) debian/aunit.gpr usr/share/ada/adainclude
dh_install -p$(package) debian/tmp/libaunit.a usr/lib
dh_link -p$(package) usr/lib/libaunit.so.$(soversion) usr/lib/libaunit.so
- dh_installdocs -p$(package) docs/aunit.html docs/aunit.pdf
- dh_installinfo -p$(package) docs/aunit.info
+ dh_installdocs -p$(package) AUnit.html
dh_installexamples -p$(package) template/*
lint: