Merge lp:~nigelbabu/ubuntu/oneiric/redis/fix-ftbfs into lp:ubuntu/oneiric/redis

[Nigel Babu]

Fixed the FTBFS

[lp:~nigelbabu/ubuntu/oneiric/redis/fix-ftbfs]

30. By Nigel Babu on 2011-05-25

Fixed FTBFS (LP: #771061), updated changelog with bug number

31. By Nigel Babu on 2011-05-25

Moved the linking to the right on two lines

32. By Nigel Babu on 2011-05-25

Update maintainter

33. By Nigel Babu on 2011-05-25

Remove the change from the source to a patch file

34. By Nigel Babu on 2011-05-26

Added information about upstream and debian bug

[Marc Deslauriers (mdeslaur)]

Looks good, thanks!

review: Approve

[Jerry Seutter (jseutter)]

Description is spelled Descrption in the diff.

=== added file '.pc/.quilt_patches'
--- .pc/.quilt_patches	1970-01-01 00:00:00 +0000
+++ .pc/.quilt_patches	2011-05-26 18:45:21 +0000
@@ -0,0 +1,1 @@
+debian/patches

=== added file '.pc/.quilt_series'
--- .pc/.quilt_series	1970-01-01 00:00:00 +0000
+++ .pc/.quilt_series	2011-05-26 18:45:21 +0000
@@ -0,0 +1,1 @@
+series

=== modified file 'debian/changelog'
--- debian/changelog	2011-04-25 14:04:29 +0000
+++ debian/changelog	2011-05-26 18:45:21 +0000
@@ -1,3 +1,9 @@
+redis (2:2.2.5-1ubuntu1) oneiric; urgency=low
+
+  * Fixed FTBFS (LP: #771061)
+
+ -- Nigel Babu <[e-mail]>  Wed, 25 May 2011 09:30:02 +0530
+
 redis (2:2.2.5-1) unstable; urgency=low
 
   * New upstream release.

=== modified file 'debian/control'
--- debian/control	2011-02-24 19:39:43 +0000
+++ debian/control	2011-05-26 18:45:21 +0000
@@ -1,7 +1,8 @@
 Source: redis
 Section: database
 Priority: optional
-Maintainer: Chris Lamb <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Chris Lamb <[e-mail]>
 Build-Depends: debhelper (>= 7.0.50)
 Standards-Version: 3.9.1
 Homepage: http://redis.io/

=== added file 'debian/patches/fix-link-ordering'
--- debian/patches/fix-link-ordering	1970-01-01 00:00:00 +0000
+++ debian/patches/fix-link-ordering	2011-05-26 18:45:21 +0000
@@ -0,0 +1,48 @@
+# Descrption: Fix the failed to build from source due to the --as-needed linking
+# Bug: http://code.google.com/p/redis/issues/detail?id=562
+# Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=628056
+# Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/redis/+bug/771061
+# Author: Nigel Babu <[e-mail]>
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -19,7 +19,7 @@
+   CCLINK+= -ltcmalloc
+   CFLAGS+= -DUSE_TCMALLOC
+ endif
+-CCOPT= $(CFLAGS) $(CCLINK) $(ARCH) $(PROF)
++CCOPT= $(CFLAGS) $(ARCH) $(PROF)
+ 
+ PREFIX= /usr/local
+ INSTALL_BIN= $(PREFIX)/bin
+@@ -111,26 +111,26 @@
+ 	cd ../deps/linenoise && $(MAKE) ARCH="$(ARCH)"
+ 
+ redis-server: $(OBJ)
+-	$(CC) -o $(PRGNAME) $(CCOPT) $(DEBUG) $(OBJ)
++	$(CC) -o $(PRGNAME) $(CCOPT) $(DEBUG) $(OBJ) $(CCLINK)
+ 
+ redis-benchmark: dependencies $(BENCHOBJ)
+ 	cd ../deps/hiredis && $(MAKE) static
+-	$(CC) -o $(BENCHPRGNAME) $(CCOPT) $(DEBUG) $(BENCHOBJ) ../deps/hiredis/libhiredis.a
++	$(CC) -o $(BENCHPRGNAME) $(CCOPT) $(DEBUG) $(BENCHOBJ) ../deps/hiredis/libhiredis.a $(CCLINK)
+ 
+ redis-benchmark.o:
+ 	$(CC) -c $(CFLAGS) -I../deps/hiredis $(DEBUG) $(COMPILE_TIME) $<
+ 
+ redis-cli: dependencies $(CLIOBJ)
+-	$(CC) -o $(CLIPRGNAME) $(CCOPT) $(DEBUG) $(CLIOBJ) ../deps/hiredis/libhiredis.a ../deps/linenoise/linenoise.o
++	$(CC) -o $(CLIPRGNAME) $(CCOPT) $(DEBUG) $(CLIOBJ) ../deps/hiredis/libhiredis.a ../deps/linenoise/linenoise.o $(CCLINK)
+ 
+ redis-cli.o:
+ 	$(CC) -c $(CFLAGS) -I../deps/hiredis -I../deps/linenoise $(DEBUG) $(COMPILE_TIME) $<
+ 
+ redis-check-dump: $(CHECKDUMPOBJ)
+-	$(CC) -o $(CHECKDUMPPRGNAME) $(CCOPT) $(DEBUG) $(CHECKDUMPOBJ)
++	$(CC) -o $(CHECKDUMPPRGNAME) $(CCOPT) $(DEBUG) $(CHECKDUMPOBJ) $(CCLINK)
+ 
+ redis-check-aof: $(CHECKAOFOBJ)
+-	$(CC) -o $(CHECKAOFPRGNAME) $(CCOPT) $(DEBUG) $(CHECKAOFOBJ)
++	$(CC) -o $(CHECKAOFPRGNAME) $(CCOPT) $(DEBUG) $(CHECKAOFOBJ) $(CCLINK)
+ 
+ .c.o:
+ 	$(CC) -c $(CFLAGS) $(DEBUG) $(COMPILE_TIME) $<

=== modified file 'debian/patches/series'
--- debian/patches/series	2011-04-25 14:04:29 +0000
+++ debian/patches/series	2011-05-26 18:45:21 +0000
@@ -1,1 +1,2 @@
 debian-changes-2:2.2.5-1
+fix-link-ordering