tags 332507 patch
thanks
I attached the diff.
Bastian
--
Wait! You have not been prepared!
-- Mr. Atoz, "Tomorrow is Yesterday", stardate 3113.2
diff -u smpeg-0.4.5+cvs20030824/debian/changelog
smpeg-0.4.5+cvs20030824/debian/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=low
+
+ * Non-maintainer upload.
+ * Build with g++-3.4 on s390. (closes: #332507)
+
+ -- Bastian Blank <[EMAIL PROTECTED]> Fri, 7 Oct 2005 01:51:22 +0200
+
smpeg (0.4.5+cvs20030824-1.3) unstable; urgency=medium
* Non-maintainer upload.
diff -u smpeg-0.4.5+cvs20030824/debian/control
smpeg-0.4.5+cvs20030824/debian/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 PROTECTED]>
-Build-Depends: dpkg (>= 1.7.2), debhelper (>= 3.0.0), libsdl1.2-dev (>=
1.2.2-3.1), xlibs-dev (>= 4.0.1-11), libgtk1.2-dev (>= 1.2.1), libglib1.2-dev
+Build-Depends: dpkg (>= 1.7.2), debhelper (>= 3.0.0), libsdl1.2-dev (>=
1.2.2-3.1), xlibs-dev (>= 4.0.1-11), libgtk1.2-dev (>= 1.2.1), libglib1.2-dev,
g++-3.4 [s390]
Standards-Version: 3.6.1
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 += -s
endif
+DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
+
+ifeq (s390,$(DEB_HOST_ARCH))
+CXX = g++-3.4
+else
+CXX = g++
+endif
+
build: build-stamp
build-stamp:
dh_testdir
@@ -34,7 +42,7 @@
touch stamp-h.in
touch configure
- CFLAGS="$(CFLAGS)" ./configure --prefix=/usr --enable-mmx=no
--enable-opengl-player=no
+ CFLAGS="$(CFLAGS)" CXX=$(CXX) ./configure --prefix=/usr --enable-mmx=no
--enable-opengl-player=no
$(MAKE)
touch build-stamp
