[Pkg-voip-commits] r2594 - in openh323/trunk/debian: . patches

[Kilian Krause]

Author: kilian
Date: 2006-10-22 11:24:13 +0000 (Sun, 22 Oct 2006)
New Revision: 2594

Modified:
   openh323/trunk/debian/changelog
   openh323/trunk/debian/control
   openh323/trunk/debian/patches/10_openh323u.mak.dpatch
Log:
let's be as nice as to fix #374374 also in this upload.


Modified: openh323/trunk/debian/changelog
===================================================================
--- openh323/trunk/debian/changelog	2006-10-22 11:13:55 UTC (rev 2593)
+++ openh323/trunk/debian/changelog	2006-10-22 11:24:13 UTC (rev 2594)
@@ -9,6 +9,8 @@
   * Minor cleanups to debian/rules like renaming Makefile target to
     config.status and making the autotools target somewhat more violent to
     keep somewhat a consistency among the libs. (Closes: #393647)
+  * Build without the xgot hack on mips. Add build-depends causing bintutils
+    to be >= 2.17-1 (Closes: #374374)
 
   [ Mark Purcell ]
   * Update debian/watch for numerics

Modified: openh323/trunk/debian/control
===================================================================
--- openh323/trunk/debian/control	2006-10-22 11:13:55 UTC (rev 2593)
+++ openh323/trunk/debian/control	2006-10-22 11:24:13 UTC (rev 2594)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian VoIP Team <pkg-voip-maintainers at lists.alioth.debian.org>
 Uploaders: Kilian Krause <kilian at debian.org>, Jose Carlos Garcia Sogo <jsogo at debian.org>, Mark Purcell <msp at debian.org>, Santiago Garcia Mantinan <manty at debian.org>
-Build-Depends: debhelper (>=4.0.2), libpt-dev (>=1.10.2-1), libssl-dev, libgsm1-dev (>=1.0.10-11), libspeex-dev (>=1.1.11-1), dpatch (>=1.11), libsasl2-dev, doxygen, autotools-dev
+Build-Depends: debhelper (>=4.0.2), libpt-dev (>=1.10.2-1), libssl-dev, libgsm1-dev (>=1.0.10-11), libspeex-dev (>=1.1.11-1), dpatch (>=1.11), libsasl2-dev, doxygen, autotools-dev, binutils (>= 2.17-1)
 Build-Depends-Indep: doxygen
 Build-Conflicts: linux-kernel-headers (<< 2.5.999-test7-bk-14), libopenh323-dev, libopenh323-1.15.3c2, libopenh323-1.15.6
 Standards-Version: 3.6.2

Modified: openh323/trunk/debian/patches/10_openh323u.mak.dpatch
===================================================================
--- openh323/trunk/debian/patches/10_openh323u.mak.dpatch	2006-10-22 11:13:55 UTC (rev 2593)
+++ openh323/trunk/debian/patches/10_openh323u.mak.dpatch	2006-10-22 11:24:13 UTC (rev 2594)
@@ -26,17 +26,6 @@
 diff -urNad openh323-1.17.3~/openh323u.mak.in openh323-1.17.3/openh323u.mak.in
 --- openh323-1.17.3~/openh323u.mak.in	2006-01-29 17:51:48.000000000 +0000
 +++ openh323-1.17.3/openh323u.mak.in	2006-01-29 17:52:16.000000000 +0000
-@@ -194,6 +194,10 @@
- 
- LIBDIRS += $(OPENH323DIR)
- 
-+ifneq (,$(findstring mips, $(MACHTYPE)))
-+STDCCFLAGS += -Wa,-xgot
-+endif
-+
- #OH323_SUPPRESS_H235	= 1
- 
- OH323_SRCDIR = $(OPENH323DIR)/src
 @@ -286,8 +290,8 @@
  LDLIBS     += -lvich263
  endif # H323_VICH263