On Fri, Jul 06, 2012 at 09:47:49PM -0700, shawn wrote:
> Supposedly I have an approval of -2 + -3 for unblock: (?)
> ===========
> Do you plan to go for an unblock for 1.2.76-4 ? The changes between
> 1.2.76-2 and 1.2.76-3 seemed OK for an unblock in my opinion, but this
> 1.2.76-4 has too many changes in my opinion. I haven't verified the
> changes between 1.2.76-1 and 1.2.76-2. You already have an unblock for
> 1.2.76-1. Maybe the changes between 1.2.76-3 and 1.2.76-4 should be
> reduced to only the minimal changes to fix the RC bug.
>
> Bart Martens at 2012-07-06 06:30:28.340977
>
> from: http://mentors.debian.net/package/kyotocabinet (after which i
> scaled back changes)
> ============
Hi Shawn,
I see that you are now requesting an unblock for kyotocabinet 1.2.76-4.
http://lists.debian.org/debian-release/2012/07/msg00327.html
At this point you have an unblock for 1.2.76-1.
http://packages.qa.debian.org/k/kyotocabinet.html
I have attached the differences between 1.2.76-1 and 1.2.76-4, and I think that
the differences are not yet OK for an unblock.
If you want an unblock for 1.2.76-4 then I suggest to follow these steps:
Please download 1.2.76-1 from snapshots:
http://snapshot.debian.org/package/kyotocabinet/1.2.76-1/
Please download 1.2.76-4 from mentors:
http://mentors.debian.net/package/kyotocabinet
Please run one of these commands:
debdiff kyotocabinet_1.2.76-1.dsc kyotocabinet_1.2.76-4.dsc
debdiff kyotocabinet_1.2.76-4.dsc kyotocabinet_1.2.76-1.dsc
The former command makes more sense to me but the latter is suggested in the
freeze policy.
http://release.debian.org/wheezy/freeze_policy.html
Please modify 1.2.76-4 at mentors so that every change conforms to the freeze
policy. That includes documenting every change verbosely in the changelog.
Please attach the debdiff output to your request for an unblock.
Regards,
Bart Martens
diff -Nru kyotocabinet-1.2.76/debian/changelog kyotocabinet-1.2.76/debian/changelog
--- kyotocabinet-1.2.76/debian/changelog 2012-06-17 10:09:08.000000000 +0000
+++ kyotocabinet-1.2.76/debian/changelog 2012-07-06 16:34:15.000000000 +0000
@@ -1,3 +1,30 @@
+kyotocabinet (1.2.76-4) unstable; urgency=low
+
+ * use breaks/replaces for smooth upgrades following man page move
+ from -doc -> -utils
+ * do not unconditionally use -m64 when available (Closes: #680058)
+ * link with --as-needed on GNU/kFreeBSD as well as Linux
+
+ -- Shawn Landden <shawnland...@gmail.com> Fri, 06 Jul 2012 09:33:36 -0700
+
+kyotocabinet (1.2.76-3) unstable; urgency=low
+
+ * workaround for dh_installdoc leaving empty folder is not necessary
+ on buildds
+
+ -- Shawn Landden <shawnland...@gmail.com> Sun, 01 Jul 2012 18:50:23 -0700
+
+kyotocabinet (1.2.76-2) unstable; urgency=low
+
+ * include static library (libkyotocabinet.a) in -dev deb per §8.3
+ * consolidate and clean up docs
+ - fixed api/index.html link to work without a web server
+ * include examples in doc package
+ * improve test for atomics to remove special casing, could be prettier however
+ - fixes FTBFS on 32-bit powerpc
+
+ -- Shawn Landden <shawnland...@gmail.com> Sat, 30 Jun 2012 10:39:24 -0700
+
kyotocabinet (1.2.76-1) unstable; urgency=low
* Initial release. (Closes: #613450)
diff -Nru kyotocabinet-1.2.76/debian/control kyotocabinet-1.2.76/debian/control
--- kyotocabinet-1.2.76/debian/control 2012-06-17 12:00:39.000000000 +0000
+++ kyotocabinet-1.2.76/debian/control 2012-07-06 16:25:52.000000000 +0000
@@ -35,8 +35,7 @@
Section: debug
Architecture: any
Priority: extra
-Depends: libkyotocabinet16 (= ${binary:Version}), ${shlibs:Depends},
- ${misc:Depends}
+Depends: libkyotocabinet16 (= ${binary:Version}), ${misc:Depends}
Multi-Arch: same
Description: Straightforward implementation of DBM - debugging symbols
Kyoto Cabinet is a library of routines for managing a database. The
@@ -51,7 +50,10 @@
Package: kyotocabinet-utils
Architecture: any
-Depends: kyotocabinet-doc, ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Replaces: kyotocabinet-doc (<< 1.2.76-2)
+Breaks: kyotocabinet-doc (<< 1.2.76-2)
+Recommends: kyotocabinet-doc
Multi-Arch: foreign
Description: Straightforward implementation of DBM - utilities
Kyoto Cabinet is a library of routines for managing a database. The
@@ -62,13 +64,15 @@
concept of data tables nor data types. Records are organized in
hash table or B+ tree.
.
- This package contains the test utilities.
+ This package contains the kcutilmgr tool, used to compile kyotocabinet
+ language bindings without Debian patches applied, and well as testing
+ and debugging utilities.
Package: kyotocabinet-doc
Section: doc
Architecture: all
Depends: ${shlibs:Depends}, ${misc:Depends}
-Multi-Arch: foreign
+Suggests: libkyotocabinet-dev
Description: Straightforward implementation of DBM - docs
Kyoto Cabinet is a library of routines for managing a database. The
database is a simple data file containing records, each is a pair of
@@ -95,7 +99,7 @@
Section: libdevel
Multi-Arch: same
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: libkyotocabinet16 (= ${binary:Version}), ${misc:Depends}
Description: Straightforward implementation of DBM - development headers
Kyoto Cabinet is a library of routines for managing a database. The
database is a simple data file containing records, each is a pair of
diff -Nru kyotocabinet-1.2.76/debian/copyright kyotocabinet-1.2.76/debian/copyright
--- kyotocabinet-1.2.76/debian/copyright 2012-06-17 10:08:27.000000000 +0000
+++ kyotocabinet-1.2.76/debian/copyright 2012-07-03 19:59:33.000000000 +0000
@@ -2,8 +2,18 @@
Source: http://fallabs.com/kyotocabinet/
Files: *
-Copyright: Copyright (C) 2009-2011 FAL Labs
-License: GPL-3+ with "link" and "FOSS" exceptions
+Copyright: Copyright © 2009-2011 FAL Labs
+License: GPL-3+ or FOSS Exception or Link Exception
+
+Files: debian/*
+Copyright: Copyright © 2012 Shawn Landden <shawnland...@gmail.com>
+License: GPL-3+ or FOSS Exception or Link Exception
+Comment:
+ If you modify this program, you may extend the link and/or FOSS exceptions to
+ your version, but you are not obligated to do so. If you do not wish to do so,
+ delete one or both exception statements and/or files from your version.
+
+License: GPL-3+
This program is free software; you can redistribute it
and/or modify it under the terms of the GNU General Public
License as published by the Free Software Foundation; either
@@ -21,8 +31,8 @@
.
On Debian GNU/Linux systems, the complete text of the GNU General
Public License can be found in `/usr/share/common-licenses/GPL-3'.
- .
- FOSSEXCEPTION:
+
+License: FOSS Exception
Kyoto Products FOSS License Exception
Version 1.0, 9 March 2011
.
@@ -100,9 +110,9 @@
PHP License 3.0/3.01
Python Software Foundation License 2.1.1
X11 License "2001"
- Zlib/libpng License
- .
- LINKEXCEPTION:
+ Zlib/libpng License
+
+License: Link Exception
Kyoto Products Specific FOSS Library Linking Exception
Version 1.0, 10 June 2011
.
@@ -160,27 +170,3 @@
Name: GraphLab
Description: a parallel framework for machine learning
URL: http://www.graphlab.ml.cmu.edu/
-
-Files: debian/*
-Copyright: Copyright 2012 Shawn Landden <shawnland...@gmail.com>
-License: LGPL-3+ with "link" and "FOSS" exceptions
- This program is free software; you can redistribute it
- and/or modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 3 of the License, or (at your option) any later
- version.
- .
- This program is distributed in the hope that it will be
- useful, but WITHOUT ANY WARRANTY; without even the implied
- warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the GNU Lesser General Public License for more
- details.
- .
- You should have received a copy of the GNU General Public
- License along with this program. If not, see <http://www.gnu.org/licenses/>.
- .
- On Debian GNU/Linux systems, the complete text of the GNU Lesser General
- Public License can be found in `/usr/share/common-licenses/LGPL-3'.
- .
- As an additional exception, you may apply the FOSSEXCEPTION and LINKEXCEPTION.
- You do not need to apply these exceptions to your changes.
diff -Nru kyotocabinet-1.2.76/debian/gbp.conf kyotocabinet-1.2.76/debian/gbp.conf
--- kyotocabinet-1.2.76/debian/gbp.conf 1970-01-01 00:00:00.000000000 +0000
+++ kyotocabinet-1.2.76/debian/gbp.conf 2012-07-03 19:59:33.000000000 +0000
@@ -0,0 +1,2 @@
+[DEFAULT]
+pristine-tar = True
diff -Nru kyotocabinet-1.2.76/debian/kyotocabinet-doc.doc-base kyotocabinet-1.2.76/debian/kyotocabinet-doc.doc-base
--- kyotocabinet-1.2.76/debian/kyotocabinet-doc.doc-base 2012-06-17 10:08:27.000000000 +0000
+++ kyotocabinet-1.2.76/debian/kyotocabinet-doc.doc-base 2012-07-03 19:59:33.000000000 +0000
@@ -1,8 +1,8 @@
Document: kyotocabinent
-Title: Oshikoji Cabinet: a straightforward implementation of DBM
+Title: Kyoto Cabinet: a straightforward implementation of DBM
Author: Copyright (C) 2009-2012 FAL Labs
Section: Programming/C++
Format: HTML
-Index: /usr/share/doc/kyotocabinet/doc/index.html
-Files: /usr/share/doc/kyotocabinet/doc/*
+Index: /usr/share/doc/kyotocabinet-doc/doc/index.html
+Files: /usr/share/doc/kyotocabinet-doc/doc
diff -Nru kyotocabinet-1.2.76/debian/kyotocabinet-doc.docs kyotocabinet-1.2.76/debian/kyotocabinet-doc.docs
--- kyotocabinet-1.2.76/debian/kyotocabinet-doc.docs 1970-01-01 00:00:00.000000000 +0000
+++ kyotocabinet-1.2.76/debian/kyotocabinet-doc.docs 2012-07-03 19:59:33.000000000 +0000
@@ -0,0 +1,2 @@
+doc
+example
diff -Nru kyotocabinet-1.2.76/debian/kyotocabinet-doc.install kyotocabinet-1.2.76/debian/kyotocabinet-doc.install
--- kyotocabinet-1.2.76/debian/kyotocabinet-doc.install 2012-06-17 10:08:27.000000000 +0000
+++ kyotocabinet-1.2.76/debian/kyotocabinet-doc.install 2012-07-03 19:59:33.000000000 +0000
@@ -1,4 +1,2 @@
-usr/share/man/man1/*
-usr/share/doc/kyotocabinet/kyotocabinet.idl
-usr/share/doc/kyotocabinet/doc/*
-
+usr/share/doc/kyotocabinet/kyotocabinet.idl usr/share/doc/kyotocabinet-doc
+debian/copyright usr/share/doc/kyotocabinet-doc
diff -Nru kyotocabinet-1.2.76/debian/kyotocabinet-utils.install kyotocabinet-1.2.76/debian/kyotocabinet-utils.install
--- kyotocabinet-1.2.76/debian/kyotocabinet-utils.install 2012-06-17 10:08:27.000000000 +0000
+++ kyotocabinet-1.2.76/debian/kyotocabinet-utils.install 2012-07-03 19:59:33.000000000 +0000
@@ -1,2 +1,3 @@
usr/bin/*
+usr/share/man
diff -Nru kyotocabinet-1.2.76/debian/libkyotocabinet-dev.install kyotocabinet-1.2.76/debian/libkyotocabinet-dev.install
--- kyotocabinet-1.2.76/debian/libkyotocabinet-dev.install 2012-06-17 10:08:27.000000000 +0000
+++ kyotocabinet-1.2.76/debian/libkyotocabinet-dev.install 2012-07-03 19:59:33.000000000 +0000
@@ -1,3 +1,4 @@
usr/include/*.h
usr/lib/*/libkyotocabinet.so
+usr/lib/*/libkyotocabinet.a
usr/lib/*/pkgconfig/kyotocabinet.pc
diff -Nru kyotocabinet-1.2.76/debian/patches/0001-Disable-failing-transaction-tests-for-the-directory-.patch kyotocabinet-1.2.76/debian/patches/0001-Disable-failing-transaction-tests-for-the-directory-.patch
--- kyotocabinet-1.2.76/debian/patches/0001-Disable-failing-transaction-tests-for-the-directory-.patch 2012-06-17 10:08:27.000000000 +0000
+++ kyotocabinet-1.2.76/debian/patches/0001-Disable-failing-transaction-tests-for-the-directory-.patch 1970-01-01 00:00:00.000000000 +0000
@@ -1,31 +0,0 @@
-From 1c058abae4ca93f294134f890c3baaa804efc337 Mon Sep 17 00:00:00 2001
-From: Shawn Landden <shawnland...@gmail.com>
-Date: Thu, 7 Jun 2012 15:47:55 -0700
-Subject: [PATCH] Disable failing transaction tests for the directory hash
- database
-
-From my tests, this doesn't fail on ext4 (but does on btrfs and tmpfs)
-I've heard reports of buildds wanting to move to btrfs so I'm keeping this.
----
- Makefile.in | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile.in b/Makefile.in
-index be4bdbb..5a9efc3 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -538,9 +538,9 @@ check-dir :
- $(RUNENV) $(RUNCMD) ./kcdirtest order -th 4 casket 500
- $(RUNENV) $(RUNCMD) ./kcdirtest order -th 4 -rnd -etc casket 500
- $(RUNENV) $(RUNCMD) ./kcdirmgr check -onr casket
-- $(RUNENV) $(RUNCMD) ./kcdirtest order -th 4 -rnd -etc -tran casket 500
-+# $(RUNENV) $(RUNCMD) ./kcdirtest order -th 4 -rnd -etc -tran casket 500
- $(RUNENV) $(RUNCMD) ./kcdirmgr check -onr casket
-- $(RUNENV) $(RUNCMD) ./kcdirtest order -th 4 -rnd -etc -oat casket 500
-+# $(RUNENV) $(RUNCMD) ./kcdirtest order -th 4 -rnd -etc -oat casket 500
- $(RUNENV) $(RUNCMD) ./kcdirmgr check -onr casket
- $(RUNENV) $(RUNCMD) ./kcdirtest order -th 4 -rnd -etc -tc casket 500
- $(RUNENV) $(RUNCMD) ./kcdirmgr check -onr casket
---
-1.7.9.5
-
diff -Nru kyotocabinet-1.2.76/debian/patches/0001-disable-march-native.patch kyotocabinet-1.2.76/debian/patches/0001-disable-march-native.patch
--- kyotocabinet-1.2.76/debian/patches/0001-disable-march-native.patch 2012-06-17 10:08:27.000000000 +0000
+++ kyotocabinet-1.2.76/debian/patches/0001-disable-march-native.patch 1970-01-01 00:00:00.000000000 +0000
@@ -1,27 +0,0 @@
-From 08adb17f76c5b31053698f13c57caa27417185bb Mon Sep 17 00:00:00 2001
-From: Shawn Landden <shawnland...@gmail.com>
-Date: Fri, 8 Jun 2012 00:28:44 -0700
-Subject: [PATCH] disable march=native
-
----
- configure | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/configure b/configure
-index a07063d..6e624fa 100755
---- a/configure
-+++ b/configure
-@@ -3991,8 +3991,8 @@ then
- printf 'checking for CPU optimization availability... '
- if printf 'main() {}' | $CC -xc -march=native -o config.tmp - >config.tmp 2>&1
- then
-- MYCFLAGS="-march=native $MYCFLAGS"
-- MYCXXFLAGS="-march=native $MYCXXFLAGS"
-+# MYCFLAGS="-march=native $MYCFLAGS"
-+# MYCXXFLAGS="-march=native $MYCXXFLAGS"
- printf 'yes\n'
- else
- printf 'no\n'
---
-1.7.9.5
-
diff -Nru kyotocabinet-1.2.76/debian/patches/Disable-failing-transaction-tests-for-the-directory-.patch kyotocabinet-1.2.76/debian/patches/Disable-failing-transaction-tests-for-the-directory-.patch
--- kyotocabinet-1.2.76/debian/patches/Disable-failing-transaction-tests-for-the-directory-.patch 1970-01-01 00:00:00.000000000 +0000
+++ kyotocabinet-1.2.76/debian/patches/Disable-failing-transaction-tests-for-the-directory-.patch 2012-07-04 17:28:52.000000000 +0000
@@ -0,0 +1,27 @@
+From: Shawn Landden <shawnland...@gmail.com>
+Date: Thu, 7 Jun 2012 15:47:55 -0700
+Subject: Disable failing transaction tests for the directory hash database
+
+From my tests, this doesn't fail on ext4 (but does on btrfs and tmpfs)
+I've heard reports of buildds wanting to move to btrfs so I'm keeping this.
+---
+ Makefile.in | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index be4bdbb..5a9efc3 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -538,9 +538,9 @@ check-dir :
+ $(RUNENV) $(RUNCMD) ./kcdirtest order -th 4 casket 500
+ $(RUNENV) $(RUNCMD) ./kcdirtest order -th 4 -rnd -etc casket 500
+ $(RUNENV) $(RUNCMD) ./kcdirmgr check -onr casket
+- $(RUNENV) $(RUNCMD) ./kcdirtest order -th 4 -rnd -etc -tran casket 500
++# $(RUNENV) $(RUNCMD) ./kcdirtest order -th 4 -rnd -etc -tran casket 500
+ $(RUNENV) $(RUNCMD) ./kcdirmgr check -onr casket
+- $(RUNENV) $(RUNCMD) ./kcdirtest order -th 4 -rnd -etc -oat casket 500
++# $(RUNENV) $(RUNCMD) ./kcdirtest order -th 4 -rnd -etc -oat casket 500
+ $(RUNENV) $(RUNCMD) ./kcdirmgr check -onr casket
+ $(RUNENV) $(RUNCMD) ./kcdirtest order -th 4 -rnd -etc -tc casket 500
+ $(RUNENV) $(RUNCMD) ./kcdirmgr check -onr casket
+--
diff -Nru kyotocabinet-1.2.76/debian/patches/configure-fix-up-configure-test-to-handle-lack-of-8-.patch kyotocabinet-1.2.76/debian/patches/configure-fix-up-configure-test-to-handle-lack-of-8-.patch
--- kyotocabinet-1.2.76/debian/patches/configure-fix-up-configure-test-to-handle-lack-of-8-.patch 1970-01-01 00:00:00.000000000 +0000
+++ kyotocabinet-1.2.76/debian/patches/configure-fix-up-configure-test-to-handle-lack-of-8-.patch 2012-07-04 17:28:52.000000000 +0000
@@ -0,0 +1,98 @@
+From: Shawn Landden <shawnland...@gmail.com>
+Date: Thu, 21 Jun 2012 20:34:28 -0700
+Subject: configure: fix up configure test to handle lack of 8 byte atomics
+ correctly
+
+as is the case with all ARM targets currently
+---
+ configure | 34 +++++++++++++++++++---------------
+ configure.in | 26 +++++++++++++++++++++++---
+ 2 files changed, 42 insertions(+), 18 deletions(-)
+
+diff --git a/configure b/configure
+index a07063d..e8342cd 100755
+--- a/configure
++++ b/configure
+@@ -4012,25 +4012,29 @@ fi
+ # Atomic operations
+ if test "$enable_atomic" != "no"
+ then
+- printf 'checking for atomic operations... '
+- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h. */
++ printf 'checking for 8 byte atomic operations... '
++ printf '
++/* Some targets support 4 byte atomics, but not 8 byte atomics,
++ * and will fail at link time if they are used.
++ *
++ * http://gcc.gnu.org/onlinedocs/gcc-4.6.3/gcc/Atomic-Builtins.html
++ * http://gcc.gnu.org/wiki/Atomic
++ */
++#include <stdio.h>
++#include <stdint.h>
++#include <stdlib.h>
+
+ int
+ main ()
+ {
+-__sync_fetch_and_add
+- ;
+- return 0;
+-}
+-_ACEOF
+-if ac_fn_cxx_try_compile "$LINENO"; then :
+- MYGCCATOMIC=yes
+-else
+- MYGCCATOMIC=no
+-fi
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+- if test "$MYGCCATOMIC" = "yes"
++ uint64_t n = 0xdeadbeaf;
++ if(__sync_bool_compare_and_swap(&n, 0xdeadbeaf, 6))
++ if(n == 6)
++ return EXIT_SUCCESS;
++
++ return EXIT_FAILURE;
++}' | gcc -xc -o config.tmp - >/dev/null 2>&1; chmod +x config.tmp;
++ if ./config.tmp
+ then
+ MYCPPFLAGS="$MYCPPFLAGS -D_MYGCCATOMIC"
+ printf 'yes\n'
+diff --git a/configure.in b/configure.in
+index 7808806..84f155a 100644
+--- a/configure.in
++++ b/configure.in
+@@ -238,9 +238,29 @@ fi
+ # Atomic operations
+ if test "$enable_atomic" != "no"
+ then
+- printf 'checking for atomic operations... '
+- AC_TRY_COMPILE([], [__sync_fetch_and_add], [MYGCCATOMIC=yes], [MYGCCATOMIC=no])
+- if test "$MYGCCATOMIC" = "yes"
++ printf 'checking for 8 byte atomic operations... '
++ printf '
++/* Some targets support 4 byte atomics, but not 8 byte atomics,
++ * and will fail at link time if they are used.
++ *
++ * http://gcc.gnu.org/onlinedocs/gcc-4.6.3/gcc/Atomic-Builtins.html
++ * http://gcc.gnu.org/wiki/Atomic
++ */
++#include <stdio.h>
++#include <stdint.h>
++#include <stdlib.h>
++
++int
++main ()
++{
++ uint64_t n = 0xdeadbeaf;
++ if(__sync_bool_compare_and_swap(&n, 0xdeadbeaf, 6))
++ if(n == 6)
++ return EXIT_SUCCESS;
++
++ return EXIT_FAILURE;
++}' | gcc -xc -o config.tmp - >/dev/null 2>&1; chmod +x config.tmp;
++ if ./config.tmp
+ then
+ MYCPPFLAGS="$MYCPPFLAGS -D_MYGCCATOMIC"
+ printf 'yes\n'
+--
diff -Nru kyotocabinet-1.2.76/debian/patches/disable-march-native-don-t-build-64-bit-always-when-.patch kyotocabinet-1.2.76/debian/patches/disable-march-native-don-t-build-64-bit-always-when-.patch
--- kyotocabinet-1.2.76/debian/patches/disable-march-native-don-t-build-64-bit-always-when-.patch 1970-01-01 00:00:00.000000000 +0000
+++ kyotocabinet-1.2.76/debian/patches/disable-march-native-don-t-build-64-bit-always-when-.patch 2012-07-04 17:28:52.000000000 +0000
@@ -0,0 +1,77 @@
+From: Shawn Landden <shawnland...@gmail.com>
+Date: Fri, 8 Jun 2012 00:28:44 -0700
+Subject: disable march=native, don't build 64-bit always when -m64 is
+ available
+
+---
+ configure | 22 ----------------------
+ configure.in | 22 ----------------------
+ 2 files changed, 44 deletions(-)
+
+diff --git a/configure b/configure
+index e8342cd..3b62442 100755
+--- a/configure
++++ b/configure
+@@ -3976,28 +3976,6 @@ $as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h
+ esac
+
+
+-# System-depending optimization
+-printf 'checking for 64-bit availability... '
+-if printf 'main() {}' | $CC -xc -m64 -o config.tmp - >config.tmp 2>&1
+-then
+- MYCFLAGS="-m64 $MYCFLAGS"
+- MYCXXFLAGS="-m64 $MYCXXFLAGS"
+- printf 'yes\n'
+-else
+- printf 'no\n'
+-fi
+-if test "$enable_opt" != "no"
+-then
+- printf 'checking for CPU optimization availability... '
+- if printf 'main() {}' | $CC -xc -march=native -o config.tmp - >config.tmp 2>&1
+- then
+- MYCFLAGS="-march=native $MYCFLAGS"
+- MYCXXFLAGS="-march=native $MYCXXFLAGS"
+- printf 'yes\n'
+- else
+- printf 'no\n'
+- fi
+-fi
+ printf 'checking for useless warnings... '
+ if printf 'main() {}' | $CC -xc \
+ -Wno-unused-but-set-variable -Wno-unused-but-set-parameter -o config.tmp - >config.tmp 2>&1
+diff --git a/configure.in b/configure.in
+index 84f155a..88f22ea 100644
+--- a/configure.in
++++ b/configure.in
+@@ -202,28 +202,6 @@ test -n "$LDFLAGS" && MYLDFLAGS="$LDFLAGS $MYLDFLAGS"
+ # Byte order
+ AC_C_BIGENDIAN(MYCPPFLAGS="$MYCPPFLAGS -D_MYBIGEND")
+
+-# System-depending optimization
+-printf 'checking for 64-bit availability... '
+-if printf 'main() {}' | $CC -xc -m64 -o config.tmp - >config.tmp 2>&1
+-then
+- MYCFLAGS="-m64 $MYCFLAGS"
+- MYCXXFLAGS="-m64 $MYCXXFLAGS"
+- printf 'yes\n'
+-else
+- printf 'no\n'
+-fi
+-if test "$enable_opt" != "no"
+-then
+- printf 'checking for CPU optimization availability... '
+- if printf 'main() {}' | $CC -xc -march=native -o config.tmp - >config.tmp 2>&1
+- then
+- MYCFLAGS="-march=native $MYCFLAGS"
+- MYCXXFLAGS="-march=native $MYCXXFLAGS"
+- printf 'yes\n'
+- else
+- printf 'no\n'
+- fi
+-fi
+ printf 'checking for useless warnings... '
+ if printf 'main() {}' | $CC -xc \
+ -Wno-unused-but-set-variable -Wno-unused-but-set-parameter -o config.tmp - >config.tmp 2>&1
+--
diff -Nru kyotocabinet-1.2.76/debian/patches/docs-fix-up-links-in-docs-that-otherwise-need-index..patch kyotocabinet-1.2.76/debian/patches/docs-fix-up-links-in-docs-that-otherwise-need-index..patch
--- kyotocabinet-1.2.76/debian/patches/docs-fix-up-links-in-docs-that-otherwise-need-index..patch 1970-01-01 00:00:00.000000000 +0000
+++ kyotocabinet-1.2.76/debian/patches/docs-fix-up-links-in-docs-that-otherwise-need-index..patch 2012-07-04 17:28:52.000000000 +0000
@@ -0,0 +1,23 @@
+From: Shawn Landden <shawnland...@gmail.com>
+Date: Tue, 3 Jul 2012 08:19:16 -0700
+Subject: docs: fix up links in docs that otherwise need index.html
+ functionality
+
+---
+ doc/index.html | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/doc/index.html b/doc/index.html
+index 62aed07..a058f18 100644
+--- a/doc/index.html
++++ b/doc/index.html
+@@ -72,7 +72,7 @@
+ <li><a href="spex.html">Fundamental Specifications</a></li>
+ <li><a href="command.html">Specifications of Command Line Utilities</a></li>
+ <li><a href="kyotoproducts.pdf">Presentation</a></li>
+-<li><a href="api/">API Documents of the core library (C/C++)</a></li>
++<li><a href="api/index.html">API Documents of the core library (C/C++)</a></li>
+ </ul>
+
+ <ul>
+--
diff -Nru kyotocabinet-1.2.76/debian/patches/series kyotocabinet-1.2.76/debian/patches/series
--- kyotocabinet-1.2.76/debian/patches/series 2012-06-17 10:08:27.000000000 +0000
+++ kyotocabinet-1.2.76/debian/patches/series 2012-07-06 16:33:06.000000000 +0000
@@ -1,3 +1,5 @@
-0001-Disable-failing-transaction-tests-for-the-directory-.patch
-0001-disable-march-native.patch
-
+configure-fix-up-configure-test-to-handle-lack-of-8-.patch
+docs-fix-up-links-in-docs-that-otherwise-need-index..patch
+Disable-failing-transaction-tests-for-the-directory-.patch
+disable-march-native-don-t-build-64-bit-always-when-.patch
+use-as-needed-on-GNU-kFreeBSD-as-well-as-Linux.patch
diff -Nru kyotocabinet-1.2.76/debian/patches/use-as-needed-on-GNU-kFreeBSD-as-well-as-Linux.patch kyotocabinet-1.2.76/debian/patches/use-as-needed-on-GNU-kFreeBSD-as-well-as-Linux.patch
--- kyotocabinet-1.2.76/debian/patches/use-as-needed-on-GNU-kFreeBSD-as-well-as-Linux.patch 1970-01-01 00:00:00.000000000 +0000
+++ kyotocabinet-1.2.76/debian/patches/use-as-needed-on-GNU-kFreeBSD-as-well-as-Linux.patch 2012-07-06 16:33:06.000000000 +0000
@@ -0,0 +1,36 @@
+From: Shawn Landden <shawnland...@gmail.com>
+Date: Tue, 3 Jul 2012 12:54:54 -0700
+Subject: use --as-needed on GNU/kFreeBSD as well as Linux
+
+---
+ configure | 2 +-
+ configure.in | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure b/configure
+index 3b62442..614e9de 100755
+--- a/configure
++++ b/configure
+@@ -4518,7 +4518,7 @@ then
+ fi
+
+ # As-needed linking
+-if uname | grep Linux >config.tmp
++if uname -o | egrep "GNU/Linux|GNU/kFreeBSD" >config.tmp
+ then
+ MYLDFLAGS="$MYLDFLAGS -Wl,-rpath-link,.:/usr/local/lib:$MYLDLIBPATH"
+ MYLDFLAGS="$MYLDFLAGS -Wl,--as-needed"
+diff --git a/configure.in b/configure.in
+index 88f22ea..0d17923 100644
+--- a/configure.in
++++ b/configure.in
+@@ -298,7 +298,7 @@ then
+ fi
+
+ # As-needed linking
+-if uname | grep Linux >config.tmp
++if uname -o | egrep "GNU/Linux|GNU/kFreeBSD" >config.tmp
+ then
+ MYLDFLAGS="$MYLDFLAGS -Wl,-rpath-link,.:/usr/local/lib:$MYLDLIBPATH"
+ MYLDFLAGS="$MYLDFLAGS -Wl,--as-needed"
+--
diff -Nru kyotocabinet-1.2.76/debian/rules kyotocabinet-1.2.76/debian/rules
--- kyotocabinet-1.2.76/debian/rules 2012-06-17 10:08:27.000000000 +0000
+++ kyotocabinet-1.2.76/debian/rules 2012-07-06 16:31:47.000000000 +0000
@@ -2,17 +2,6 @@
include /usr/share/dpkg/architecture.mk
-# kyotocabinet uses 8 byte atomics by default
-# http://gcc.gnu.org/wiki/Atomic
-ifeq (arm,$(DEB_HOST_ARCH_CPU))
-CONFIG_OPTS += --disable-atomic
-endif
-
-ifeq (sh,$(DEB_HOST_ARCH_CPU))
-CONFIG_OPTS += --disable-atomic
-endif
-
-
override_dh_auto_configure:
dh_auto_configure -- \
--enable-zlib \
@@ -23,9 +12,12 @@
override_dh_auto_install:
$(MAKE) DESTDIR=$$(pwd)/debian/tmp prefix=/usr install
- ln -s $$(pwd)/debian/tmp/usr/share/doc/libkyotocabinet16 $$(pwd)/debian/tmp/usr/share/doc/libkyotocabinet16-dbg
- ln -s $$(pwd)/debian/tmp/usr/share/doc/libkyotocabinet16 $$(pwd)/debian/tmp/usr/share/doc/libkyotocabinet16-dev
- ln -s $$(pwd)/debian/tmp/usr/share/doc/libkyotocabinet16 $$(pwd)/debian/tmp/usr/share/doc/libkyotocabinet16-utils
+
+override_dh_installdocs:
+ #kyotocabinet-doc doc's created in install file, so this doesn't apply there
+ dh_installdocs --link-doc=libkyotocabinet16
+ # mega-lameness, seem to not be necessary on buildds, but with cowbuilder/pbuilder?
+ rm -rf $$(pwd)/debian/kyotocabinet-doc/usr/share/doc/libkyotocabinet16
override_dh_strip:
dh_strip --package=libkyotocabinet16 --dbg-package=libkyotocabinet16-dbg
