Package: zeroc-ice
Version: 3.4.2-4
Followup-For: Bug #646169
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu precise ubuntu-patch

In Debian sid, the attached patch can be applied to achieve the following:

  * make-rules.patch: Don't attempt to link against libncurses. Fixes
    FTBFS. (Closes: #646169)
  * debian/control: Because zeroc-ice is distributed under GPLv2, we
    must use libreadline-gplv2-dev and not libreadline-dev.


Thanks for considering the patch.


-- System Information:
Debian Release: wheezy/sid
  APT prefers oneiric-updates
  APT policy: (500, 'oneiric-updates'), (500, 'oneiric-security'), (500, 
'oneiric-proposed'), (500, 'oneiric')
Architecture: amd64 (x86_64)

Kernel: Linux 3.0.0-12-generic (SMP w/8 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru zeroc-ice-3.4.2/debian/control zeroc-ice-3.4.2/debian/control
--- zeroc-ice-3.4.2/debian/control	2011-06-27 15:31:52.000000000 -0400
+++ zeroc-ice-3.4.2/debian/control	2011-10-26 22:55:03.000000000 -0400
@@ -5,7 +5,7 @@
 Uploaders: Cleto Martín <cleto.mar...@gmail.com>
 Build-Depends: cdbs (>= 0.4.43), debhelper (>= 5.0.37.2), quilt,
  patchutils (>= 0.2.25), libdb5.1++-dev | libdb++-dev, libmcpp-dev (>=
- 2.7.1), libreadline-dev, libexpat1-dev, libssl-dev, libbz2-dev,
+ 2.7.1), libreadline-gplv2-dev, libexpat1-dev, libssl-dev, libbz2-dev,
  zlib1g-dev | libz-dev, python-all-dev (>= 2.3.5-11), python-support
  (>= 0.3), php5-dev, ruby1.8-dev, ruby1.8, libqt4-dev
 Build-Depends-Indep: cli-common-dev (>= 0.4.4),
diff -Nru zeroc-ice-3.4.2/debian/patches/make-rules.patch zeroc-ice-3.4.2/debian/patches/make-rules.patch
--- zeroc-ice-3.4.2/debian/patches/make-rules.patch	1969-12-31 19:00:00.000000000 -0500
+++ zeroc-ice-3.4.2/debian/patches/make-rules.patch	2011-10-26 17:41:30.000000000 -0400
@@ -0,0 +1,13 @@
+Index: zeroc-ice-3.4.2/cpp/config/Make.rules
+===================================================================
+--- zeroc-ice-3.4.2.orig/cpp/config/Make.rules	2011-10-26 17:21:57.000000000 -0400
++++ zeroc-ice-3.4.2/cpp/config/Make.rules	2011-10-26 17:22:04.000000000 -0400
+@@ -210,7 +210,7 @@
+ ifeq ($(PLATFORM_HAS_READLINE),yes)
+     ifeq ($(USE_READLINE),yes)
+         READLINE_FLAGS  = -DHAVE_READLINE $(if $(READLINE_HOME),-I$(READLINE_HOME)/include)
+-        READLINE_LIBS   = $(if $(READLINE_HOME),-L$(READLINE_HOME)/$(libsubdir)) -lreadline -lncurses        
++        READLINE_LIBS   = $(if $(READLINE_HOME),-L$(READLINE_HOME)/$(libsubdir)) -lreadline
+     endif
+ endif
+ 
diff -Nru zeroc-ice-3.4.2/debian/patches/series zeroc-ice-3.4.2/debian/patches/series
--- zeroc-ice-3.4.2/debian/patches/series	2011-06-27 15:31:52.000000000 -0400
+++ zeroc-ice-3.4.2/debian/patches/series	2011-10-26 17:08:17.000000000 -0400
@@ -11,3 +11,4 @@
 archs.patch
 libdb5.1.patch
 ptrdiff_t-gcc-4.6.patch
+make-rules.patch

Reply via email to