Comment 5 for bug 23366

Message-ID: <email address hidden>
Date: Fri, 7 Oct 2005 01:59:34 +0200
From: Bastian Blank <email address hidden>
To: <email address hidden>
Subject: Re: Bug#332507: smpeg_0.4.5+cvs20030824-1.4 (unstable): is uninstallable

--dc+cDN39EJAMEtIO
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

tags 332507 patch
thanks

I attached the diff.

Bastian

--=20
Wait! You have not been prepared!
  -- Mr. Atoz, "Tomorrow is Yesterday", stardate 3113.2

--dc+cDN39EJAMEtIO
Content-Type: text/plain; charset=utf-8
Content-Disposition: attachment; filename=diff
Content-Transfer-Encoding: quoted-printable

diff -u smpeg-0.4.5+cvs20030824/debian/changelog smpeg-0.4.5+cvs20030824/de=
bian/changelog
--- smpeg-0.4.5+cvs20030824/debian/changelog
+++ smpeg-0.4.5+cvs20030824/debian/changelog
@@ -1,3 +1,10 @@
+smpeg (0.4.5+cvs20030824-1.4) unstable; urgency=3Dlow
+
+ * Non-maintainer upload.
+ * Build with g++-3.4 on s390. (closes: #332507)
+
+ -- Bastian Blank <email address hidden> Fri, 7 Oct 2005 01:51:22 +0200
+
 smpeg (0.4.5+cvs20030824-1.3) unstable; urgency=3Dmedium
=20
   * Non-maintainer upload.
diff -u smpeg-0.4.5+cvs20030824/debian/control smpeg-0.4.5+cvs20030824/debi=
an/control
--- smpeg-0.4.5+cvs20030824/debian/control
+++ smpeg-0.4.5+cvs20030824/debian/control
@@ -2,7 +2,7 @@
 Section: libs
 Priority: optional
 Maintainer: Joe Drew <email address hidden>
-Build-Depends: dpkg (>=3D 1.7.2), debhelper (>=3D 3.0.0), libsdl1.2-dev (>=
=3D 1.2.2-3.1), xlibs-dev (>=3D 4.0.1-11), libgtk1.2-dev (>=3D 1.2.1), libg=
lib1.2-dev
+Build-Depends: dpkg (>=3D 1.7.2), debhelper (>=3D 3.0.0), libsdl1.2-dev (>=
=3D 1.2.2-3.1), xlibs-dev (>=3D 4.0.1-11), libgtk1.2-dev (>=3D 1.2.1), libg=
lib1.2-dev, g++-3.4 [s390]
 Standards-Version: 3.6.1
=20
 Package: libsmpeg0c2
diff -u smpeg-0.4.5+cvs20030824/debian/rules smpeg-0.4.5+cvs20030824/debian=
/rules
--- smpeg-0.4.5+cvs20030824/debian/rules
+++ smpeg-0.4.5+cvs20030824/debian/rules
@@ -20,6 +20,14 @@
 INSTALL_PROGRAM +=3D -s
 endif
=20
+DEB_HOST_ARCH ?=3D $(shell dpkg-architecture -qDEB_HOST_ARCH)
+
+ifeq (s390,$(DEB_HOST_ARCH))
+CXX =3D g++-3.4
+else
+CXX =3D g++
+endif
+
 build: build-stamp
 build-stamp:
  dh_testdir
@@ -34,7 +42,7 @@
  touch stamp-h.in
  touch configure
=20
- CFLAGS=3D"$(CFLAGS)" ./configure --prefix=3D/usr --enable-mmx=3Dno --enab=
le-opengl-player=3Dno
+ CFLAGS=3D"$(CFLAGS)" CXX=3D$(CXX) ./configure --prefix=3D/usr --enable-mm=
x=3Dno --enable-opengl-player=3Dno
=20
  $(MAKE)
  touch build-stamp

--dc+cDN39EJAMEtIO--