The unified diff between revisions [3bb48381..] and [1a17ca5c..] is displayed below. It can also be downloaded as a raw diff.
#
#
# add_file "debian/patches/remove_rpath.patch"
# content [7a604e6f571844b432ed5a9c04043cd1f8b937d3]
#
# patch "debian/aunit_example.adb"
# from [4b3ba330c9ff837adfecd4d08d7a027c4c1b4dbb]
# to [96f7db307ab942d65d8555ecd766cf7ca01cb8b8]
#
# patch "debian/changelog"
# from [137834f1ef70fb1379e1af81c3eba3654399c561]
# to [478f139cbaa720dfae5ead6d469044d52d826c6f]
#
# patch "debian/control"
# from [c2f0fe224e56874a88acc77532553a3893b40e1e]
# to [1b75d62ef6d63239f3ab6f09f2b4ec4e88384790]
#
# patch "debian/example_test.adb"
# from [9e351301ca49c36e1a1fff7740cdb2154cb99b2c]
# to [a15dd9cb2623543caef89a39319a4f57e2912b32]
#
# patch "debian/example_test.ads"
# from [b01c1d5fbd4a284eb590b1da8f2966e4b35b9080]
# to [2d2ffc71ab13144ef3f456622ef787d323bd8d76]
#
# patch "debian/patches/series"
# from [751fefe5000046100517e4709014c9904884d4dd]
# to [a98295324bd3048c95199f780e52bcb46ef76242]
#
# patch "debian/rules"
# from [7f3d9aad9da8890470347226f8a1f40a37c24d84]
# to [d9f14b51734120a4798f0821cb208217b025597a]
#
# patch "debian/source.lintian-overrides"
# from [1f16e3b132c25b3391d2b9aa1dcbf8fad2462948]
# to [413c5d0f19a5efd7417d181f565728a0a101d45e]
#
# patch "debian/test_installed.sh"
# from [a92cc501734877ee6724f0ba1b10120fbfef0663]
# to [c58ee9339dd92b8921e1645e17160232e626e41b]
#
============================================================
--- debian/patches/remove_rpath.patch 7a604e6f571844b432ed5a9c04043cd1f8b937d3
+++ debian/patches/remove_rpath.patch 7a604e6f571844b432ed5a9c04043cd1f8b937d3
@@ -0,0 +1,16 @@
+Avoid rpath on Debian, at least in default configuration.
+See http://wiki.debian.org/RpathIssue.
+
+Index: b/share/gprconfig/linker.xml
+===================================================================
+--- a/share/gprconfig/linker.xml 2010-02-13 20:20:25.000000000 +0100
++++ b/share/gprconfig/linker.xml 2010-02-13 20:20:33.000000000 +0100
+@@ -192,7 +192,7 @@
+
+ for Shared_Library_Suffix use ".so";
+ for Library_Auto_Init_Supported use "true";
+- for Run_Path_Option use ("-Wl,-rpath,");
++ for Run_Path_Option use ();
+ </config>
+ </configuration>
+
============================================================
--- debian/aunit_example.adb 4b3ba330c9ff837adfecd4d08d7a027c4c1b4dbb
+++ debian/aunit_example.adb 96f7db307ab942d65d8555ecd766cf7ca01cb8b8
@@ -1,6 +1,7 @@
-- Abstract :
--
--- Example AUnit test
+-- Example AUnit test; show that gprbuild accesses the default gpr
+-- search path.
--
-- Copyright (C) 2010 Stephen Leake. All Rights Reserved.
--
@@ -20,19 +21,16 @@ with AUnit.Assertions;
with AUnit.Test_Cases;
with AUnit.Assertions;
-with AUnit.Reporter.Text;
+with AUnit.Test_Results.Text_Reporter;
with AUnit.Test_Suites; use AUnit.Test_Suites;
with AUnit.Test_Results;
with Example_Test;
procedure Aunit_Example
is
Suite : constant Access_Test_Suite := new Test_Suite;
- Result : constant AUnit.Test_Results.Result_Access :=
- new AUnit.Test_Results.Result;
- Status : AUnit.Status;
- Engine : AUnit.Reporter.Text.Text_Reporter;
+ Result : AUnit.Test_Results.Result;
begin
Add_Test (Suite, new Example_Test.Test_Case);
- Run (Suite, Result, Status);
- AUnit.Reporter.Text.Report (Engine, Result.all);
+ Run (Suite.all, Result);
+ AUnit.Test_Results.Text_Reporter.Report (Result);
end Aunit_Example;
============================================================
--- debian/changelog 137834f1ef70fb1379e1af81c3eba3654399c561
+++ debian/changelog 478f139cbaa720dfae5ead6d469044d52d826c6f
@@ -1,3 +1,12 @@
+gprbuild (1.2.0-4) unstable; urgency=low
+
+ * control (Standards-Version): bump to 3.8.4
+ * debian/patches: add remove_rpath.patch. (Closes: #569723)
+ * debian/rules: install gprbuild_gps.xml
+ * debian/aunit_example.adb: revert to aunit 1.03
+
+ -- Stephen Leake <stephen_leake@stephe-leake.org> Sun, 14 Feb 2010 09:14:28 -0500
+
gprbuild (1.2.0-3) unstable; urgency=low
* debian/patches/default_path.patch: new patch to use
============================================================
--- debian/control c2f0fe224e56874a88acc77532553a3893b40e1e
+++ debian/control 1b75d62ef6d63239f3ab6f09f2b4ec4e88384790
@@ -4,7 +4,7 @@ Build-Depends: debhelper (>= 6.0.7~), gn
Maintainer: Stephen Leake <stephen_leake@stephe-leake.org>
DM-Upload-Allowed: yes
Build-Depends: debhelper (>= 6.0.7~), gnat, gnat-4.4, libxmlada3.2-dev, quilt
-Standards-Version: 3.8.3
+Standards-Version: 3.8.4
Homepage: http://libre.adacore.com/libre/
XS-Vcs-Mtn: www.ada-france.org org.debian.gprbuild
XS-Vcs-Browser: http://www.ada-france.org:8081/branch/changes/org.debian.gprbuild
============================================================
--- debian/example_test.adb 9e351301ca49c36e1a1fff7740cdb2154cb99b2c
+++ debian/example_test.adb a15dd9cb2623543caef89a39319a4f57e2912b32
@@ -19,6 +19,7 @@ with AUnit.Assertions;
pragma License (GPL);
with AUnit.Assertions;
+with AUnit.Test_Cases.Registration;
package body Example_Test is
procedure Nominal (T : in out AUnit.Test_Cases.Test_Case'Class)
@@ -28,7 +29,7 @@ package body Example_Test is
AUnit.Assertions.Assert (1 + 1 = 2, "arithmetic");
end Nominal;
- overriding function Name (T : Test_Case) return AUnit.Message_String
+ overriding function Name (T : Test_Case) return Ada.Strings.Unbounded.String_Access
is
pragma Unreferenced (T);
begin
============================================================
--- debian/example_test.ads b01c1d5fbd4a284eb590b1da8f2966e4b35b9080
+++ debian/example_test.ads 2d2ffc71ab13144ef3f456622ef787d323bd8d76
@@ -18,6 +18,7 @@ pragma License (GPL);
pragma License (GPL);
+with Ada.Strings.Unbounded;
with AUnit.Test_Cases;
package Example_Test is
@@ -27,7 +28,7 @@ package Example_Test is
overriding procedure Register_Tests (T : in out Test_Case);
- overriding function Name (T : Test_Case) return AUnit.Message_String;
+ overriding function Name (T : Test_Case) return Ada.Strings.Unbounded.String_Access;
end Example_Test;
============================================================
--- debian/patches/series 751fefe5000046100517e4709014c9904884d4dd
+++ debian/patches/series a98295324bd3048c95199f780e52bcb46ef76242
@@ -2,3 +2,4 @@ info
default_path.patch
compilers.patch
info
+remove_rpath.patch
============================================================
--- debian/rules 7f3d9aad9da8890470347226f8a1f40a37c24d84
+++ debian/rules d9f14b51734120a4798f0821cb208217b025597a
@@ -37,7 +37,7 @@
# sudo schroot --chroot=unstable -- aptitude install g++-4.4
# sudo schroot --chroot=unstable -- aptitude install gfortran-4.4
# sudo schroot --chroot=unstable -- aptitude install liblapack3gf
-# sudo schroot --chroot=unstable -- aptitude install aunit-dev
+# sudo schroot --chroot=unstable -- aptitude install libaunit1-dev
# sudo shcroot --chroot=unstable -- rm /usr/bin/gcc
#
# sudo schroot --chroot=unstable -- ./test_installed.sh
@@ -124,10 +124,6 @@ binary: binary-indep binary-arch
binary: binary-indep binary-arch
-# we don't install /usr/share/gps/plug-ins/gprbuild_gps.xml, because
-# GPS is not (yet) packaged for Debian, and it's not clear how to
-# manage two packages installing to the same directory.
-
# we are not patching the doc sources, so we can just install the
# pre-built files from the orig tarball.
binary-indep:
@@ -155,6 +151,7 @@ binary-arch: build
dh_install -p gprbuild debian/tmp/gprbind usr/lib
dh_install -p gprbuild debian/tmp/gprlib usr/lib
dh_install -p gprbuild share/gprconfig/*.xml usr/share/gprconfig
+ dh_install -p gprbuild doc/gprbuild_gps.xml /usr/share/gps/plug-ins/
dh_strip -p gprbuild
dh_installdirs -p gprbuild /usr/share/gprconfig
dh_install -p gprbuild share/gprconfig/* /usr/share/gprconfig
============================================================
--- debian/source.lintian-overrides 1f16e3b132c25b3391d2b9aa1dcbf8fad2462948
+++ debian/source.lintian-overrides 413c5d0f19a5efd7417d181f565728a0a101d45e
@@ -1,2 +1,5 @@
-# we don't use autoconf, but upstream does, and has an out-of-date config.sub:
+# we don't use autoconf, but upstream does, and has an out-of-date config.sub
gprbuild source: ancient-autotools-helper-file config.sub 2001-09-07
+
+# sdefault.adb has an arch-specific value used as a default; it can't be handled by patch
+gprbuild source: patch-system-but-direct-changes-in-diff gnat/sdefault.adb
============================================================
--- debian/test_installed.sh a92cc501734877ee6724f0ba1b10120fbfef0663
+++ debian/test_installed.sh c58ee9339dd92b8921e1645e17160232e626e41b
@@ -8,8 +8,8 @@
# sudo schroot ./test_installed.sh
# This re-installs the latest version.
-dpkg --install ../../gprbuild_1.2.0-3_i386.deb
-dpkg --install ../../gprbuild-doc_1.2.0-3_all.deb
+dpkg --install ../../gprbuild_1.2.0-4_i386.deb
+dpkg --install ../../gprbuild-doc_1.2.0-4_all.deb
cd ../examples
make