* Enrique Robledo-Arnuncio <[EMAIL PROTECTED]> [2006-05-13 10:15]:
> Please, go ahead with the NMU.

Okay, thanks.  I've done the following upload now:

diff -u rosegarden4-1.0/debian/changelog rosegarden4-1.0/debian/changelog
--- rosegarden4-1.0/debian/changelog
+++ rosegarden4-1.0/debian/changelog
@@ -1,3 +1,12 @@
+rosegarden4 (1.0-1.3) unstable; urgency=low
+
+  * NMU with the permission of the maintainer.
+  * Remove g++-3.4 as a build-dependency on arm, hppa and m68k which
+    was put in to work around a compiler error that is no longer
+    present in gcc 4.x (Closes: #343018).
+
+ -- Martin Michlmayr <[EMAIL PROTECTED]>  Sat, 13 May 2006 18:23:52 +0200
+
 rosegarden4 (1.0-1.2) unstable; urgency=medium
 
   * Non-maintainer upload.
diff -u rosegarden4-1.0/debian/control rosegarden4-1.0/debian/control
--- rosegarden4-1.0/debian/control
+++ rosegarden4-1.0/debian/control
@@ -2,7 +2,7 @@
 Section: sound
 Priority: optional
 Maintainer: Enrique Robledo Arnuncio <[EMAIL PROTECTED]>
-Build-Depends: g++-3.4 [arm hppa m68k], debhelper (>> 4.0.0), automake1.7, 
autoconf, libtool, kdelibs4-dev, libasound2-dev, libjack-dev, ladspa-sdk, 
liblrdf0-dev, liblo-dev
+Build-Depends: debhelper (>> 4.0.0), automake1.7, autoconf, libtool, 
kdelibs4-dev, libasound2-dev, libjack-dev, ladspa-sdk, liblrdf0-dev, liblo-dev
 Standards-Version: 3.6.1
 
 Package: rosegarden4
diff -u rosegarden4-1.0/debian/rules rosegarden4-1.0/debian/rules
--- rosegarden4-1.0/debian/rules
+++ rosegarden4-1.0/debian/rules
@@ -20,19 +20,6 @@
 # export CXXFLAGS
 # export DEB_BUILD_OPTIONS
 
-###
-
-GCC4_ICES_HERE := arm m68k hppa
-DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
-
-ifneq (,$(findstring $(DEB_BUILD_ARCH),$(GCC4_ICES_HERE)))
-    export CC=gcc-3.4
-    export CPP=cpp-3.4
-    export CXX=g++-3.4
-endif
-
-###
-
 # This is the debhelper compatability version to use.
 export DH_COMPAT=4
 
-- 
Martin Michlmayr
http://www.cyrius.com/


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]

Reply via email to