ViewMTN: Diff from [3aee047c..] to [14154cf1..]

ViewMTN : Branches | Tags | Help | About
Revision [3aee047c..]: Info | Browse Files | Download (tar)
The unified diff between revisions [3aee047c..] and [14154cf1..] is displayed below. It can also be downloaded as a raw diff.
#
#
# patch ".mtn-ignore"
#  from [21e8b7366f6d9e108990ef8f5942603c97b37210]
#    to [a9b3225b0cf6617d34e494d855e6c61338bd5b75]
#
# patch "debian/changelog"
#  from [e6d5435e4c45032036eacbc609c67a8a64df48a9]
#    to [8e75ba086e29cbe906971fb957c37ac5536caca8]
#
# patch "debian/control"
#  from [a155ab49a082ba455454ee1c83eac9eadbc3e0de]
#    to [1e25098b9cdd0416592628e44323235088db9f06]
#
# patch "debian/patches/compilers.patch"
#  from [db92851bedcca4e7624cb56d8272377eeb7f3730]
#    to [94588e87dcd7afdc09d9330812f1cf71a4d2bd30]
#
# patch "debian/patches/default_path.patch"
#  from [31bddbb68eef095883a23c7e0513d827314c63fa]
#    to [8ee23bffa3f8cd910d88cf71bfdb94a43705df9f]
#
# patch "debian/patches/info"
#  from [28c86cc09ee1b3972785b70e38246970423374de]
#    to [78a3e25364d6782048017f013298154c9ec7a70c]
#
# patch "debian/patches/remove_rpath.patch"
#  from [85f9b346fcd3b9a8b3aa76e87a06820e18e5de15]
#    to [db03634befdc704907c9b97c643bfeef1baf7eb6]
#
# patch "debian/patches/sdefault.patch"
#  from [4744e9a99922e483a6acf135a218076280770b2d]
#    to [98da3eab72b3e6b02c22d9a8398a8db7ceb7bea4]
#
# patch "debian/patches/version.patch"
#  from [8a4f5bf758f8b6f65826148a18a7114009c6338c]
#    to [2ebe51d803b1fa9615fadedc0bd9cabb8f67cda4]
#
# patch "debian/rules"
#  from [4ff52b9ed80ae35c25b9fb6290ff1a6c253e7c40]
#    to [fd8f9c402e2622a277df8ab58fb92c2374a747c7]
#
============================================================
--- .mtn-ignore	21e8b7366f6d9e108990ef8f5942603c97b37210
+++ .mtn-ignore	a9b3225b0cf6617d34e494d855e6c61338bd5b75
@@ -15,6 +15,7 @@
 ^debian/files$
 ^debian/gprbuild$
 ^debian/gprbuild-doc$
+^debian/patches/debian-changes-.*$
 ^debian/stamp-patched$
 ^debian/tmp$
 ^debug\.adc$
============================================================
--- debian/changelog	e6d5435e4c45032036eacbc609c67a8a64df48a9
+++ debian/changelog	8e75ba086e29cbe906971fb957c37ac5536caca8
@@ -4,7 +4,8 @@ gprbuild (1.3.0-2) unstable; urgency=low

   * bump debhelper version

-  * debian/control (Suggests): add gnat, ada-compiler, as required by Debian Ada Policy
+  * debian/control (Suggests): add gnat, ada-compiler, as required by
+    Debian Ada Policy

  -- Stephen Leake <stephen_leake@stephe-leake.org>  Thu, 01 Jul 2010 20:02:22 -0400

============================================================
--- debian/control	a155ab49a082ba455454ee1c83eac9eadbc3e0de
+++ debian/control	1e25098b9cdd0416592628e44323235088db9f06
@@ -3,8 +3,8 @@ DM-Upload-Allowed: yes
 Priority: optional
 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.4
+Build-Depends: debhelper (>= 7.9.3), gnat, gnat-4.4, libxmlada3.2-dev, quilt
+Standards-Version: 3.9.0
 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/patches/compilers.patch	db92851bedcca4e7624cb56d8272377eeb7f3730
+++ debian/patches/compilers.patch	94588e87dcd7afdc09d9330812f1cf71a4d2bd30
@@ -1,12 +1,18 @@
-Regular expressions in share/gprconfig/compilers.xml that must match
-the version string output by 'gcc'; we patch these to allow "Debian"
-in the string.
+Subject: share/gprconfig/compilers.xml regexps must allow Debian
+Author: Stephen Leake <stephen_leake@stephe-leake.org>
+Forwarded: not-needed

+There are regular expressions in share/gprconfig/compilers.xml that
+must match the version string output by 'gcc'; patch these to allow
+"Debian" in the string.
+
 Change linker.xml and gnat.xml to find gprlib and gprbind in /usr/lib

-Ensure we use gcc-4.4 explicitly, so gpbuild does not depend
-on which top-level gcc is installed.
+Use gcc-4.4 explicitly, so gpbuild does not depend on which top-level
+gcc is installed.

+---
+
 Index: gprbuild-1.3.0/share/gprconfig/compilers.xml
 ===================================================================
 --- gprbuild-1.3.0.orig/share/gprconfig/compilers.xml	2009-04-22 09:41:49.000000000 -0400
============================================================
--- debian/patches/default_path.patch	31bddbb68eef095883a23c7e0513d827314c63fa
+++ debian/patches/default_path.patch	8ee23bffa3f8cd910d88cf71bfdb94a43705df9f
@@ -1,4 +1,6 @@
-# set default project path to match Debian Ada policy
+Description: set default project path to match Debian Ada policy
+Author: Stephen Leake <stephen_leake@stephe-leake.org>
+Forwarded: not-needed

 Index: gprbuild-1.3.0/gnat/prj-ext.adb
 ===================================================================
============================================================
# debian/patches/info is binary
============================================================
--- debian/patches/remove_rpath.patch	85f9b346fcd3b9a8b3aa76e87a06820e18e5de15
+++ debian/patches/remove_rpath.patch	db03634befdc704907c9b97c643bfeef1baf7eb6
@@ -1,5 +1,8 @@
-Avoid rpath on Debian, at least in default configuration.
-See http://wiki.debian.org/RpathIssue.
+Description: Avoid rpath on Debian, at least in default configuration.
+ See http://wiki.debian.org/RpathIssue.
+Origin: vendor, http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=569723
+Reviewed-by: Stephen Leake <stephen_leake@stephe-leake.org>
+Forwarded: not-needed

 Index: gprbuild-1.3.0/share/gprconfig/linker.xml
 ===================================================================
============================================================
--- debian/patches/sdefault.patch	4744e9a99922e483a6acf135a218076280770b2d
+++ debian/patches/sdefault.patch	98da3eab72b3e6b02c22d9a8398a8db7ceb7bea4
@@ -1,5 +1,7 @@
-sdefault.adb is overwritten by rules, with arch specific values.
-avoid warning from dpkg-source about changes
+Description: sdefault.adb is overwritten by rules, with arch specific values.
+ We patch it here first, to avoid a warning from dpkg-source about changes.
+Author: Stephen Leake <stephen_leake@stephe-leake.org>
+Forwarded: not-needed

 Index: gprbuild-1.3.0/gnat/sdefault.adb
 ===================================================================
============================================================
--- debian/patches/version.patch	8a4f5bf758f8b6f65826148a18a7114009c6338c
+++ debian/patches/version.patch	2ebe51d803b1fa9615fadedc0bd9cabb8f67cda4
@@ -1,8 +1,10 @@
-# patch version string to indicate Debian upload
+Description:patch version string to indicate Debian upload
+ .
+ patch Build_Type to FSF, since that affects copyright, bug report,
+ and warranty notices.
+Author: Stephen Leake <stephen_leake@stephe-leake.org>
+Forwarded: not-needed

-# patch Build_Type to FSF, since that affects copyright, bug report,
-# and warranty notices.
-
 Index: gprbuild-1.3.0/src/gpr_version.ads
 ===================================================================
 --- gprbuild-1.3.0.orig/src/gpr_version.ads	2009-04-22 11:03:57.000000000 -0400
@@ -12,7 +14,7 @@ Index: gprbuild-1.3.0/src/gpr_version.ad
  package GPR_Version is

 -   Gpr_Version : constant String := "1.3.0";
-+   Gpr_Version : constant String := "1.3.0 (Debian 1.3.0-1)";
++   Gpr_Version : constant String := "1.3.0 (Debian 1.3.0-2)";
     --  Static string identifying this version

     function Gpr_Version_String return String;
============================================================
--- debian/rules	4ff52b9ed80ae35c25b9fb6290ff1a6c253e7c40
+++ debian/rules	fd8f9c402e2622a277df8ab58fb92c2374a747c7
@@ -18,6 +18,10 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #
 # To build this package in a chroot:
+#
+# edit version in ../src/gpr_version.ads
+# edit patches/version.patch to match
+#
 # schroot -d `cd ..; pwd` --chroot=unstable -- dpkg-buildpackage -uc -us -i"_MTN|\\.mtn-ignore"
 #
 # To run lintian:
@@ -162,7 +166,9 @@ binary-arch: build
 	dh_md5sums -p gprbuild
 	dh_builddeb -p gprbuild

+lint: version := $(shell dpkg-parsechangelog | grep "Version: " | sed "s/Version: //")
+lint: arch := $(shell dpkg-architecture -qDEB_BUILD_ARCH)
 lint:
-	cd ..; lintian -i gprbuild*.changes
+	cd ..; lintian -i gnade_$(version)_$(arch).changes

 # end of file