[Crosstoolchain-logs] [SCM] GNU GDB Debian packaging repository branch, master, updated. debian/7.6-3-27-g137d46c

[Samuel Bronson]

The following commit has been merged in the master branch:
commit 137d46caa3d1043f74be02a973237836cd9791d0
Author: Samuel Bronson <naesten at gmail.com>
Date:   Sun Jun 16 20:13:52 2013 -0400

    Revert "d/control{,.in}: disable gdb64 on i386 and s390 (use multi-arch instead)."
    
    This reverts commit 7a6d926978b54ceacf7bf709330a2a00086ee74e.
    
    The reason for this is that libpython2.7 does not support multi-arch
    yet, which would make it hard to install a foreign gdb, and we
    wouldn't want to force anybody to use gdb-minimal ...

diff --git a/debian/changelog b/debian/changelog
index 6adfaf3..2558264 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,7 +19,6 @@ gdb (7.6-4) UNRELEASED; urgency=low
       + solve_PATH_MAX_issue.patch
       + linuxthreads_signal_handling.patch
   * d/control{,.in}: Reformat relationship fields.
-  * d/control{,.in}: disable gdb64 on i386 and s390 (use multi-arch instead).
   * d/rules:
     - Allow gdb-minimal to use expat.
     - Get hardening flags working.
diff --git a/debian/control b/debian/control
index 8eb8feb..89c39e4 100644
--- a/debian/control
+++ b/debian/control
@@ -18,7 +18,7 @@ Build-Depends:
                dejagnu,
                flex | flex-old,
                procps,
-               g++-multilib [powerpc sparc],
+               g++-multilib [i386 powerpc s390 sparc],
                gcj-jdk | gcj,
                gobjc,
                mig [hurd-any],
@@ -26,9 +26,9 @@ Build-Depends:
                texinfo (>= 4.7-2.2),
                texlive-base,
 # Libdev deps
-               libexpat1-dev, lib64expat1-dev [powerpc sparc],
-               libncurses5-dev, lib64ncurses5-dev [powerpc sparc],
-               libreadline-dev, lib64readline6-dev [powerpc sparc],
+               libexpat1-dev, lib64expat1-dev [i386 powerpc s390 sparc],
+               libncurses5-dev, lib64ncurses5-dev [i386 powerpc s390 sparc],
+               libreadline-dev, lib64readline6-dev [i386 powerpc s390 sparc],
                zlib1g-dev,
                libbz2-dev,
                liblzma-dev,
@@ -68,7 +68,7 @@ Description: GNU Debugger (minimal version)
  disabled.
 
 Package: gdb64
-Architecture: powerpc sparc
+Architecture: i386 powerpc s390 sparc
 Replaces: gdb-multiarch (<< 7.6-1)
 Depends: gdb (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
 Description: GNU Debugger (64-bit)
diff --git a/debian/control.in b/debian/control.in
index e89bc2c..856d8d7 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -18,7 +18,7 @@ Build-Depends:
                dejagnu,
                flex | flex-old,
                procps,
-               g++-multilib [powerpc sparc],
+               g++-multilib [i386 powerpc s390 sparc],
                gcj-jdk | gcj,
                gobjc,
                mig [hurd-any],
@@ -26,9 +26,9 @@ Build-Depends:
                texinfo (>= 4.7-2.2),
                texlive-base,
 # Libdev deps
-               libexpat1-dev, lib64expat1-dev [powerpc sparc],
-               libncurses5-dev, lib64ncurses5-dev [powerpc sparc],
-               libreadline-dev, lib64readline6-dev [powerpc sparc],
+               libexpat1-dev, lib64expat1-dev [i386 powerpc s390 sparc],
+               libncurses5-dev, lib64ncurses5-dev [i386 powerpc s390 sparc],
+               libreadline-dev, lib64readline6-dev [i386 powerpc s390 sparc],
                zlib1g-dev,
                libbz2-dev,
                liblzma-dev,
@@ -68,7 +68,7 @@ Description: GNU Debugger (minimal version)
  disabled.
 
 Package: gdb64
-Architecture: powerpc sparc
+Architecture: i386 powerpc s390 sparc
 Replaces: gdb-multiarch (<< 7.6-1)
 Depends: gdb (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
 Description: GNU Debugger (64-bit)

-- 
GNU GDB Debian packaging repository