tags 556496 + pending
tags 609115 + patch
tags 609115 + pending
thanks

Dear maintainer,

I've prepared an NMU for tokyocabinet (versioned as 1.4.37-6.1) and
uploaded it to DELAYED/10. Please feel free to tell me if I
should delay it longer.

Cheers,
Antonio Radici
diff -Nru tokyocabinet-1.4.37/debian/changelog tokyocabinet-1.4.37/debian/changelog
--- tokyocabinet-1.4.37/debian/changelog	2011-04-23 15:24:54.000000000 +0100
+++ tokyocabinet-1.4.37/debian/changelog	2011-04-23 15:17:44.000000000 +0100
@@ -1,3 +1,12 @@
+tokyocabinet (1.4.37-6.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * debian/control: switch Priority to standard (Closes: 609115)
+  * debian/patches:
+    + 0007-fix-FTBFS-with-binutils-gold.patch (Closes: 556496)
+
+ -- Antonio Radici <anto...@dyne.org>  Sat, 23 Apr 2011 10:09:15 +0100
+
 tokyocabinet (1.4.37-6) unstable; urgency=high
 
   * Woops, the test-suite was incorrectly disabled, enable it again.
diff -Nru tokyocabinet-1.4.37/debian/control tokyocabinet-1.4.37/debian/control
--- tokyocabinet-1.4.37/debian/control	2011-04-23 15:24:54.000000000 +0100
+++ tokyocabinet-1.4.37/debian/control	2011-04-23 15:17:44.000000000 +0100
@@ -1,5 +1,5 @@
 Source: tokyocabinet
-Priority: extra
+Priority: standard
 Maintainer: Pierre Habouzit <madco...@debian.org>
 Build-Depends:
  autotools-dev,
diff -Nru tokyocabinet-1.4.37/debian/patches/0007-fix-FTBFS-with-binutils-gold.patch tokyocabinet-1.4.37/debian/patches/0007-fix-FTBFS-with-binutils-gold.patch
--- tokyocabinet-1.4.37/debian/patches/0007-fix-FTBFS-with-binutils-gold.patch	1970-01-01 01:00:00.000000000 +0100
+++ tokyocabinet-1.4.37/debian/patches/0007-fix-FTBFS-with-binutils-gold.patch	2011-04-23 15:17:44.000000000 +0100
@@ -0,0 +1,47 @@
+From 410bd3316f71bcf776687dd2073185cf791a7715 Mon Sep 17 00:00:00 2001
+From: Antonio Radici <anto...@dyne.org>
+Date: Sat, 23 Apr 2011 14:53:11 +0100
+Subject: [PATCH] fix FTBFS with binutils-gold
+
+---
+ Makefile.in |   33 ++++++++++++++++-----------------
+ 1 files changed, 16 insertions(+), 17 deletions(-)
+
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -715,7 +715,7 @@
+ 
+ 
+ tcumttest : tcumttest.o $(LIBRARYFILES)
+-	$(LDENV) $(CC) $(CFLAGS) -o $@ $< $(LDFLAGS) $(CMDLDFLAGS) -ltokyocabinet
++	$(LDENV) $(CC) $(CFLAGS) -o $@ $< $(LDFLAGS) $(CMDLDFLAGS) -ltokyocabinet -lpthread
+ 
+ 
+ tcucodec : tcucodec.o $(LIBRARYFILES)
+@@ -727,7 +727,7 @@
+ 
+ 
+ tchmttest : tchmttest.o $(LIBRARYFILES)
+-	$(LDENV) $(CC) $(CFLAGS) -o $@ $< $(LDFLAGS) $(CMDLDFLAGS) -ltokyocabinet
++	$(LDENV) $(CC) $(CFLAGS) -o $@ $< $(LDFLAGS) $(CMDLDFLAGS) -ltokyocabinet -lpthread
+ 
+ 
+ tchmgr : tchmgr.o $(LIBRARYFILES)
+@@ -739,7 +739,7 @@
+ 
+ 
+ tcbmttest : tcbmttest.o $(LIBRARYFILES)
+-	$(LDENV) $(CC) $(CFLAGS) -o $@ $< $(LDFLAGS) $(CMDLDFLAGS) -ltokyocabinet
++	$(LDENV) $(CC) $(CFLAGS) -o $@ $< $(LDFLAGS) $(CMDLDFLAGS) -ltokyocabinet -lpthread
+ 
+ 
+ tcbmgr : tcbmgr.o $(LIBRARYFILES)
+@@ -751,7 +751,7 @@
+ 
+ 
+ tcfmttest : tcfmttest.o $(LIBRARYFILES)
+-	$(LDENV) $(CC) $(CFLAGS) -o $@ $< $(LDFLAGS) $(CMDLDFLAGS) -ltokyocabinet
++	$(LDENV) $(CC) $(CFLAGS) -o $@ $< $(LDFLAGS) $(CMDLDFLAGS) -ltokyocabinet -lpthread
+ 
+ 
+ tcfmgr : tcfmgr.o $(LIBRARYFILES)
diff -Nru tokyocabinet-1.4.37/debian/patches/debian-changes-1.4.37-6 tokyocabinet-1.4.37/debian/patches/debian-changes-1.4.37-6
--- tokyocabinet-1.4.37/debian/patches/debian-changes-1.4.37-6	2011-04-23 15:25:30.000000000 +0100
+++ tokyocabinet-1.4.37/debian/patches/debian-changes-1.4.37-6	1970-01-01 01:00:00.000000000 +0100
@@ -1,66 +0,0 @@
-Description: Upstream changes introduced in version 1.4.37-6
- This patch has been created by dpkg-source during the package build.
- Here's the last changelog entry, hopefully it gives details on why
- those changes were made:
- .
- tokyocabinet (1.4.37-6) unstable; urgency=high
- .
-   * Woops, the test-suite was incorrectly disabled, enable it again.
-   * Bump the urgency to high as this fixes the last RC issue of the package
-     (unbuildable on s390). The RC bug isn't closed as it isn't really an
-     tokyocabinet bug but likely a glibc one (see #555540).
- .
- The person named in the Author field signed this changelog entry.
-Author: Pierre Habouzit <madco...@debian.org>
-
----
-The information above should follow the Patch Tagging Guidelines, please
-checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
-are templates for supplementary fields that you might want to add:
-
-Origin: <vendor|upstream|other>, <url of original patch>
-Bug: <url in upstream bugtracker>
-Bug-Debian: http://bugs.debian.org/<bugnumber>
-Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
-Forwarded: <no|not-needed|url proving that it has been forwarded>
-Reviewed-By: <name and email of someone who approved the patch>
-Last-Update: <YYYY-MM-DD>
-
---- tokyocabinet-1.4.37.orig/Makefile.in
-+++ tokyocabinet-1.4.37/Makefile.in
-@@ -715,7 +715,7 @@ tcutest : tcutest.o $(LIBRARYFILES)
- 
- 
- tcumttest : tcumttest.o $(LIBRARYFILES)
--	$(LDENV) $(CC) $(CFLAGS) -o $@ $< $(LDFLAGS) $(CMDLDFLAGS) -ltokyocabinet
-+	$(LDENV) $(CC) $(CFLAGS) -o $@ $< $(LDFLAGS) $(CMDLDFLAGS) -ltokyocabinet -lpthread
- 
- 
- tcucodec : tcucodec.o $(LIBRARYFILES)
-@@ -727,7 +727,7 @@ tchtest : tchtest.o $(LIBRARYFILES)
- 
- 
- tchmttest : tchmttest.o $(LIBRARYFILES)
--	$(LDENV) $(CC) $(CFLAGS) -o $@ $< $(LDFLAGS) $(CMDLDFLAGS) -ltokyocabinet
-+	$(LDENV) $(CC) $(CFLAGS) -o $@ $< $(LDFLAGS) $(CMDLDFLAGS) -ltokyocabinet -lpthread
- 
- 
- tchmgr : tchmgr.o $(LIBRARYFILES)
-@@ -739,7 +739,7 @@ tcbtest : tcbtest.o $(LIBRARYFILES)
- 
- 
- tcbmttest : tcbmttest.o $(LIBRARYFILES)
--	$(LDENV) $(CC) $(CFLAGS) -o $@ $< $(LDFLAGS) $(CMDLDFLAGS) -ltokyocabinet
-+	$(LDENV) $(CC) $(CFLAGS) -o $@ $< $(LDFLAGS) $(CMDLDFLAGS) -ltokyocabinet -lpthread
- 
- 
- tcbmgr : tcbmgr.o $(LIBRARYFILES)
-@@ -751,7 +751,7 @@ tcftest : tcftest.o $(LIBRARYFILES)
- 
- 
- tcfmttest : tcfmttest.o $(LIBRARYFILES)
--	$(LDENV) $(CC) $(CFLAGS) -o $@ $< $(LDFLAGS) $(CMDLDFLAGS) -ltokyocabinet
-+	$(LDENV) $(CC) $(CFLAGS) -o $@ $< $(LDFLAGS) $(CMDLDFLAGS) -ltokyocabinet -lpthread
- 
- 
- tcfmgr : tcfmgr.o $(LIBRARYFILES)
diff -Nru tokyocabinet-1.4.37/debian/patches/series tokyocabinet-1.4.37/debian/patches/series
--- tokyocabinet-1.4.37/debian/patches/series	2011-04-23 15:25:06.000000000 +0100
+++ tokyocabinet-1.4.37/debian/patches/series	2011-04-23 15:17:44.000000000 +0100
@@ -4,4 +4,4 @@
 0004-Cherry-pick-alignment-fixes-from-1.4.38.patch
 0005-Pick-patch-from-upstream-to-fix-unaligned-accesses-o.patch
 0006-disable-UBC-feature-on-hppa-since-it-causes-test-sui.patch
-debian-changes-1.4.37-6
+0007-fix-FTBFS-with-binutils-gold.patch

Reply via email to