Tags 377781 + pending
Thanks

I'm planning on NMUing monotone today.  The diff that I'm attaching is the
output of interdiff for the package that I'm about to upload.

Basically, I just erased the conditional compiler choosing, and removed the
versioned dependency for arm, hppa or m68k.

I couldn't test the build on arm or hppa, because since the lockdown,
access to machines is a bit restricted, but I did test it on m68k.  If it
fails to build in any arch, I'll upload again fixing it.

-- 
 Bezos,     (o.
     Marga. (/)_
diff -u monotone-0.27/debian/rules monotone-0.27/debian/rules
--- monotone-0.27/debian/rules
+++ monotone-0.27/debian/rules
@@ -8,8 +7,0 @@
-GCC4_ICES_HERE := arm m68k hppa
-DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
-
-ifneq (,$(filter $(DEB_HOST_ARCH),$(GCC4_ICES_HERE)))
-       DEB_CONFIGURE_EXTRA_FLAGS = CC=gcc-3.4 CXX=g++-3.4
-else
-       DEB_CONFIGURE_EXTRA_FLAGS = CC=gcc-4.0 CXX=g++-4.0
-endif
diff -u monotone-0.27/debian/changelog monotone-0.27/debian/changelog
--- monotone-0.27/debian/changelog
+++ monotone-0.27/debian/changelog
@@ -1,3 +1,11 @@
+monotone (0.27-1.1) unstable; urgency=low
+
+  * NMU to fix Failure to Build From Source.  Fixed debian/rules applying the
+    patch suggested by Adeodato, fixed debian/control by not specifying a
+    special compiler for any arches. (Closes: #377781)
+
+ -- Margarita Manterola <[EMAIL PROTECTED]>  Thu, 20 Jul 2006 16:22:18 -0300
+
 monotone (0.27-1) unstable; urgency=low
 
   * Built (with pdebuild) for upload to debian archive.
only in patch2:
unchanged:
--- monotone-0.27.orig/debian/control
+++ monotone-0.27/debian/control
@@ -4,8 +4,7 @@
 Maintainer: Tomas Fasth <[EMAIL PROTECTED]>
 Build-Depends: cdbs (>= 0.4.28), debhelper (>= 4.0.0), autotools-dev,
  libboost-date-time-dev, libboost-filesystem-dev, libboost-regex-dev,
- libboost-test-dev, libboost-dev, texinfo, libz-dev,
- g++ [!arm !hppa !m68k], g++-3.4 [arm hppa m68k]
+ libboost-test-dev, libboost-dev, texinfo, libz-dev 
 Standards-Version: 3.6.2
 
 Package: monotone

Reply via email to