Am Samstag, den 11.02.2012, 21:07 +0100 schrieb Pierre Habouzit:
> On Sat, Feb 11, 2012 at 09:06:47PM +0100, Tobias Frost wrote:
> > Am Samstag, den 11.02.2012, 19:53 +0100 schrieb Pierre Habouzit:
> > > Well don't NMU, tokyocabinet is on collab-maint, please just update and
> > > upload.
> >
> > After realizing that its orphaned, I switchted to an QA uploae ;-)
> >
> > However, I don't have access to collab-maint, so maybe you can do me
> > that favour to push it for me?
>
> of course, that I can do, just provide me with the git patches or even
> better some git repository somewhere I can pull from and I will do.
>
Attached is diff against the debian directory.
Tobias
diff -Naur tokyocabinet-1.4.37/debian/changelog tokyocabinet-1.4.37_new/debian/changelog
--- tokyocabinet-1.4.37/debian/changelog 2011-04-23 16:17:44.000000000 +0200
+++ tokyocabinet-1.4.37_new/debian/changelog 2012-02-11 19:23:35.000000000 +0100
@@ -1,3 +1,16 @@
+tokyocabinet (1.4.37-7) unstable; urgency=low
+
+ * QA upload
+ * Orphaned for more than 14 days: Setting maintainer to QA.
+ * Disable pthread support on s390x (Closes: #638625)
+ * Do not use msync-syscall on hurd (Closes: #659510)
+ * update -dbg Package description (Closes: #596502)
+ * Fixes lintian warning "manpage-section-mismatch"
+ * Fixes lintian warning "debug-package-should-be-priority-extra"
+ on libtokyocabinet-dbg
+
+ -- Tobias Frost <t...@coldtobi.de> Sat, 11 Feb 2012 19:22:42 +0100
+
tokyocabinet (1.4.37-6.1) unstable; urgency=low
* Non-maintainer upload.
diff -Naur tokyocabinet-1.4.37/debian/control tokyocabinet-1.4.37_new/debian/control
--- tokyocabinet-1.4.37/debian/control 2011-04-23 16:17:44.000000000 +0200
+++ tokyocabinet-1.4.37_new/debian/control 2012-02-11 19:19:23.000000000 +0100
@@ -1,6 +1,6 @@
Source: tokyocabinet
Priority: standard
-Maintainer: Pierre Habouzit <madco...@debian.org>
+Maintainer: Debian QA Group <packa...@qa.debian.org>
Build-Depends:
autotools-dev,
chrpath,
@@ -26,10 +26,11 @@
library.
Package: libtokyocabinet-dbg
+Priority: extra
Section: debug
Architecture: any
Depends: libtokyocabinet8 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
-Description: Tokyo Cabinet Database Libraries [runtime]
+Description: Tokyo Cabinet Database Libraries [debug]
Tokyo Cabinet is an efficient database library like GDBM and NDBM.
It features hash database and B+ tree database and is developed as the
successor of QDBM, for the purpose of the following three points: higher
diff -Naur tokyocabinet-1.4.37/debian/.gitattributes tokyocabinet-1.4.37_new/debian/.gitattributes
--- tokyocabinet-1.4.37/debian/.gitattributes 2011-04-23 16:17:44.000000000 +0200
+++ tokyocabinet-1.4.37_new/debian/.gitattributes 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-changelog merge=merge-debchangelog
diff -Naur tokyocabinet-1.4.37/debian/patches/manpages-section-fix.patch tokyocabinet-1.4.37_new/debian/patches/manpages-section-fix.patch
--- tokyocabinet-1.4.37/debian/patches/manpages-section-fix.patch 1970-01-01 01:00:00.000000000 +0100
+++ tokyocabinet-1.4.37_new/debian/patches/manpages-section-fix.patch 2012-02-11 19:22:35.000000000 +0100
@@ -0,0 +1,16 @@
+--- a/man/tcamgr.1
++++ b/man/tcamgr.1
+@@ -1,4 +1,4 @@
+-.TH "TCATEST" 3 "2009-10-13" "Man Page" "Tokyo Cabinet"
++.TH "TCATEST" 1 "2009-10-13" "Man Page" "Tokyo Cabinet"
+
+ .SH NAME
+ tcamgr \- the command line utility of the abstract database API
+--- a/man/tcatest.1
++++ b/man/tcatest.1
+@@ -1,4 +1,4 @@
+-.TH "TCATEST" 3 "2009-10-13" "Man Page" "Tokyo Cabinet"
++.TH "TCATEST" 1 "2009-10-13" "Man Page" "Tokyo Cabinet"
+
+ .SH NAME
+ tcatest \- test cases of the abstract database API
diff -Naur tokyocabinet-1.4.37/debian/patches/nomysnconhurd.patch tokyocabinet-1.4.37_new/debian/patches/nomysnconhurd.patch
--- tokyocabinet-1.4.37/debian/patches/nomysnconhurd.patch 1970-01-01 01:00:00.000000000 +0100
+++ tokyocabinet-1.4.37_new/debian/patches/nomysnconhurd.patch 2012-02-11 18:26:41.000000000 +0100
@@ -0,0 +1,32 @@
+# From: Tobias Frost <t...@coldtobi.de>
+# Subject: Disable msync calls on hurd
+--- a/tcfdb.c
++++ b/tcfdb.c
+@@ -1129,10 +1129,12 @@
+ tcfdbdumpmeta(fdb, hbuf);
+ memcpy(fdb->map, hbuf, FDBOPAQUEOFF);
+ if(phys){
++#ifndef __GNU__
+ if(msync(fdb->map, fdb->limsiz, MS_SYNC) == -1){
+ tcfdbsetecode(fdb, TCEMMAP, __FILE__, __LINE__, __func__);
+ err = true;
+ }
++#endif
+ if(fsync(fdb->fd) == -1){
+ tcfdbsetecode(fdb, TCESYNC, __FILE__, __LINE__, __func__);
+ err = true;
+--- a/tchdb.c
++++ b/tchdb.c
+@@ -1336,10 +1336,12 @@
+ memcpy(hdb->map, hbuf, HDBOPAQUEOFF);
+ if(phys){
+ size_t xmsiz = (hdb->xmsiz > hdb->msiz) ? hdb->xmsiz : hdb->msiz;
++#ifndef __GNU__
+ if(msync(hdb->map, xmsiz, MS_SYNC) == -1){
+ tchdbsetecode(hdb, TCEMMAP, __FILE__, __LINE__, __func__);
+ err = true;
+ }
++#endif
+ if(fsync(hdb->fd) == -1){
+ tchdbsetecode(hdb, TCESYNC, __FILE__, __LINE__, __func__);
+ err = true;
diff -Naur tokyocabinet-1.4.37/debian/patches/series tokyocabinet-1.4.37_new/debian/patches/series
--- tokyocabinet-1.4.37/debian/patches/series 2011-04-23 16:17:44.000000000 +0200
+++ tokyocabinet-1.4.37_new/debian/patches/series 2012-02-11 19:21:23.000000000 +0100
@@ -5,3 +5,5 @@
0005-Pick-patch-from-upstream-to-fix-unaligned-accesses-o.patch
0006-disable-UBC-feature-on-hppa-since-it-causes-test-sui.patch
0007-fix-FTBFS-with-binutils-gold.patch
+nomysnconhurd.patch
+manpages-section-fix.patch
diff -Naur tokyocabinet-1.4.37/debian/rules tokyocabinet-1.4.37_new/debian/rules
--- tokyocabinet-1.4.37/debian/rules 2011-04-23 16:17:44.000000000 +0200
+++ tokyocabinet-1.4.37_new/debian/rules 2012-02-11 18:29:05.000000000 +0100
@@ -39,7 +39,7 @@
override_dh_auto_configure: check-tarball
dh_auto_configure -- \
- $(if $(findstring $(DEB_BUILD_ARCH),s390),--disable-pthread) \
+ $(if $(findstring $(DEB_BUILD_ARCH),s390 s390x),--disable-pthread) \
--enable-devel --enable-off64 --enable-swab \
\
CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)"
