Imported Debian patch 0.9.1-5

debian/changelog

@@ -0,0 +1,93 @@
+mydumper (0.9.1-5) unstable; urgency=medium
+
+  * add patch to FindMySQL cmake module to find libatomic when it's needed
+
+ -- Mateusz Kijowski <mateusz.kijowski@gmail.com>  Wed, 18 Jan 2017 01:09:19 +0100
+
+mydumper (0.9.1-4) unstable; urgency=medium
+
+  * manpages are generated by Sphinx, so moving back python-sphinx
+    to B-D (Closes: #851433)
+  * Add a Breaks+Replaces relation to mydumper-doc since it replaces
+    doc-base files from main package (Closes: #851221)
+
+ -- Mateusz Kijowski <mateusz.kijowski@gmail.com>  Sun, 15 Jan 2017 16:57:52 +0100
+
+mydumper (0.9.1-3) unstable; urgency=medium
+
+  * use sphinxdoc dh helper only in appropriate targets (Closes: #850847,
+    #850969)
+
+ -- Mateusz Kijowski <mateusz.kijowski@gmail.com>  Wed, 11 Jan 2017 11:44:34 +0100
+
+mydumper (0.9.1-2) unstable; urgency=medium
+
+  * Depend on default-libmysqlclient-dev (Closes: #845877, #841607)
+  * bump standards version to 3.9.8
+  * Separate doc package to comply with standards 3.9.7
+  * dh compat level bumped to 9
+  * changed homepage and debian/watch to github
+
+ -- Mateusz Kijowski <mateusz.kijowski@gmail.com>  Mon, 02 Jan 2017 15:40:34 +0100
+
+mydumper (0.9.1-1) unstable; urgency=medium
+
+  * Imported Upstream version 0.9.1
+
+ -- Mateusz Kijowski <mateusz.kijowski@gmail.com>  Tue, 10 Nov 2015 17:59:57 +0100
+
+mydumper (0.6.2-1) unstable; urgency=medium
+
+  * Imported Upstream version 0.6.2 (Closes: #790640)
+  * fix manpage inconsistencies (Closes: #773990) (LP: #1402381)
+  * bump standards version to 3.9.6 (no changes needed)
+  * allow uscan to verify upstream tarball
+
+ -- Mateusz Kijowski <mateusz.kijowski@gmail.com>  Wed, 01 Jul 2015 13:54:15 +0200
+
+mydumper (0.6.1-1) unstable; urgency=medium
+
+  * updated standards version
+  * move sphinxdoc depends to recommends (Closes: #730443)
+  * homepage updated (Closes: #714921)
+  * explicitly tell CMAKE to link libm
+    patch 0003-explicitly-link-libm.patch
+  * Imported Upstream version 0.6.1 (Closes: #735851) (LP: #1270330)
+
+ -- Mateusz Kijowski <mateusz.kijowski@gmail.com>  Thu, 20 Mar 2014 01:17:43 +0100
+
+mydumper (0.5.2-1) unstable; urgency=low
+
+  * Imported Upstream version 0.5.2 (Closes: #707458)
+  * removed patches merged by upstream
+
+ -- Mateusz Kijowski <mateusz.kijowski@gmail.com>  Thu, 09 May 2013 12:08:05 +0200
+
+mydumper (0.5.1-3) unstable; urgency=low
+
+  * fix FTBFS in multiarch env (Closes: #673262) (LP: #1002291) 
+    patch 0006-fix-runaway-regexp-in-in-cmake.patch
+
+ -- Mateusz Kijowski <mateusz.kijowski@gmail.com>  Mon, 04 Jun 2012 17:35:01 +0200
+
+mydumper (0.5.1-2) unstable; urgency=low
+
+  * fixed watch file
+  * updated standards version
+  * patch 0005-zlib-file-type-change-fixes.patch added
+    fix FTBFS from zlib > 1.2.4 (Closes: #662582) (LP: #948122)
+
+ -- Mateusz Kijowski <mateusz.kijowski@gmail.com>  Fri, 23 Mar 2012 17:27:57 +0100
+
+mydumper (0.5.1-1) unstable; urgency=low
+
+  * Initial release (Closes: #648711)
+  * This is my first Debian package, be gentle
+  * Patched CMakeLists.txt so that generated config.h file is put in the
+    sources dir, where it is expected during the build
+  * Patched documenation CMakeLists.txt so that it won't install 
+    documentation source files
+  * Patch added to fix missing description in the manpages
+  * Fixed typo in myloader
+
+ -- Mateusz Kijowski <mateusz.kijowski@gmail.com>  Thu, 15 Nov 2011 11:26:38 +0100

debian/compat

@@ -0,0 +1 @@
+9

debian/control

@@ -0,0 +1,48 @@
+Source: mydumper
+Section: database
+Priority: extra
+Maintainer: Mateusz Kijowski <mateusz.kijowski@gmail.com>
+Build-Depends: debhelper (>= 9.0.0), cmake, quilt, default-libmysqlclient-dev, libglib2.0-dev, libpcre3-dev, zlib1g-dev, python-sphinx (>= 1.0.7+dfsg), python-docutils, libatomic1
+Standards-Version: 3.9.8
+Homepage: https://github.com/maxbube/mydumper
+#Vcs-Git: git://git.debian.org/collab-maint/mydumper.git
+#Vcs-Browser: http://git.debian.org/?p=collab-maint/mydumper.git;a=summary
+
+Package: mydumper
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Suggests: mydumper-doc
+Description: High-performance MySQL backup tool
+ Mydumper (aka. MySQL Data Dumper) is a high-performance multi-threaded
+ backup (and restore) toolset for MySQL and Drizzle.  The main developers
+ originally worked as Support Engineers at MySQL (one has moved to
+ Facebook and another to SkySQL) and this is how they would envisage
+ mysqldump based on years of user feedback.
+ .
+ Mydumper features
+ .
+  Lightweight C source
+  Up to 10x faster dumps compared to mysqldump
+  Consistent snapshots for transactional and non-transactional tables
+  File compression on-the-fly
+  Binary log dumps
+  Multi-threaded restore utility
+  Daemon mode for timed snapshots and continuous binary logs
+ .
+ Mydumper is still under active development but is well tested/used in
+ production on some large installations.
+
+Package: mydumper-doc
+Architecture: all
+Depends: ${misc:Depends}, ${sphinxdoc:Depends}
+Breaks: mydumper (<< 0.9.1-2)
+Replaces: mydumper (<< 0.9.1-2)
+Section: doc
+Description: High-performance MySQL backup tool - documentation
+ Mydumper (aka. MySQL Data Dumper) is a high-performance multi-threaded
+ backup (and restore) toolset for MySQL and Drizzle.  The main developers
+ originally worked as Support Engineers at MySQL (one has moved to
+ Facebook and another to SkySQL) and this is how they would envisage
+ mysqldump based on years of user feedback.
+ .
+ This package contains documentation for mydumper generated by sphinx

debian/copyright

@@ -0,0 +1,30 @@
+Format: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?revision=174
+Upstream-Name: mydumper
+Source: https://launchpad.net/mydumper/+download
+
+Files: *
+Copyright: 2009-2011 Domas Mituzas ( domas at fb dot com ) 
+           2009-2011 Andrew Hutchings ( andrew at skysql dot com )
+           2009-2011 Mark Leith ( mark dot leith at oracle dot com )
+License: GPL-3.0+
+
+Files: debian/*
+Copyright: 2011 Mateusz Kijowski <mateusz.kijowski@gmail.com>
+License: GPL-3.0+
+
+License: GPL-3.0+
+ 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 version 3 of the License, or
+ (at your option) any later version.
+ .
+ This package 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 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 systems, the complete text of the GNU General
+ Public License version 3 can be found in "/usr/share/common-licenses/GPL-3".

debian/docs

@@ -0,0 +1 @@
+README

debian/install

@@ -0,0 +1 @@
+usr/bin/*

debian/manpages

@@ -0,0 +1,2 @@
+debian/tmp/usr/share/man/man1/mydumper.1
+debian/tmp/usr/share/man/man1/myloader.1

debian/mydumper-doc.doc-base

@@ -0,0 +1,11 @@
+Document: mydumper
+Title: MySQL Data Dumper documentation
+Author: Domas Mituzas, Andrew Hutchings, Mark Leith
+ Max Bubenick
+Abstract: This is the documentation shipped with
+ mydumper, describing usage and prvoding examples
+Section: Data Management
+
+Format: HTML
+Index: /usr/share/doc/mydumper-doc/html/index.html
+Files: /usr/share/doc/mydumper-doc/html/*.html

debian/mydumper-doc.docs

@@ -0,0 +1 @@
+debian/tmp/usr/share/doc/mydumper/html

debian/patches/0001-manpage-whatis-description.patch

@@ -0,0 +1,39 @@
+From: Mateusz Kijowski <mkijowski@trojmiasto.pl>
+Date: Tue, 15 Nov 2011 11:19:01 +0100
+Subject: manpage whatis description
+
+---
+ docs/CMakeLists.txt    | 4 ++++
+ docs/_build/conf.py.in | 4 ++--
+ 2 files changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
+index 8fdb6b4..c43d246 100644
+--- a/docs/CMakeLists.txt
++++ b/docs/CMakeLists.txt
+@@ -27,6 +27,10 @@ if(GENERATE_DOC)
+   # master document with modules index
+   set(REF_MASTER_DOC "modules")
+ 
++  # vars necessary for manpages generation
++  set(MYDUMPER_PROGRAM_DESC "multi-threaded MySQL dumping")
++  set(MYLOADER_PROGRAM_DESC "multi-threaded MySQL loader")
++
+   # substitute variables in configuration and scripts
+   foreach(file
+       conf.py
+diff --git a/docs/_build/conf.py.in b/docs/_build/conf.py.in
+index 9985c74..4844933 100644
+--- a/docs/_build/conf.py.in
++++ b/docs/_build/conf.py.in
+@@ -211,8 +211,8 @@ latex_documents = [
+ # One entry per manual page. List of tuples
+ # (source start file, name, description, authors, manual section).
+ man_pages = [
+-    ('mydumper_usage', 'mydumper', u'@PROGRAM_DESC@',
++    ('mydumper_usage', 'mydumper', u'@MYDUMPER_PROGRAM_DESC@',
+      [u'Andrew Hutchings'], 1),
+-    ('myloader_usage', 'myloader', u'@PROGRAM_DESC@',
++    ('myloader_usage', 'myloader', u'@MYLOADER_PROGRAM_DESC@',
+      [u'Andrew Hutchings'], 1)
+ ]

debian/patches/0002-dont-install-documentation-source.patch

@@ -0,0 +1,24 @@
+From: Mateusz Kijowski <mkijowski@trojmiasto.pl>
+Date: Tue, 22 Nov 2011 17:44:04 +0100
+Subject: dont install documentation source
+
+---
+ docs/CMakeLists.txt | 5 -----
+ 1 file changed, 5 deletions(-)
+
+diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
+index c43d246..7c75c99 100644
+--- a/docs/CMakeLists.txt
++++ b/docs/CMakeLists.txt
+@@ -61,11 +61,6 @@ if(GENERATE_DOC)
+     "${SOURCES_DIR}"
+   )
+ 
+-  # note the trailing slash to exclude directory name
+-  install(DIRECTORY "${SOURCES_DIR}/"
+-    DESTINATION "share/doc/mydumper"
+-  )
+-
+   # Sphinx cache with pickled ReST documents
+   set(SPHINX_CACHE_DIR "${CMAKE_CURRENT_BINARY_DIR}/_doctrees")
+   # HTML output directory

debian/patches/0003-explicitly-link-libm.patch

@@ -0,0 +1,40 @@
+From: Mateusz Kijowski <mateusz.kijowski@gmail.com>
+Date: Mon, 20 Jan 2014 21:42:40 +0100
+Subject: explicitly link libm
+
+---
+ CMakeLists.txt | 7 +++----
+ 1 file changed, 3 insertions(+), 4 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 5da3828..0a6f7e7 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -9,6 +9,7 @@ find_package(MySQL)
+ find_package(ZLIB)
+ find_package(GLIB2)
+ find_package(PCRE)
++find_library(M_LIB m)
+ 
+ option(BUILD_DOCS "Build the documentation" ON)
+ 
+@@ -29,17 +30,15 @@ MARK_AS_ADVANCED(CMAKE)
+ 
+ CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/config.h.in ${CMAKE_CURRENT_SOURCE_DIR}/config.h)
+ 
+-
+ if (WITH_BINLOG)
+   add_executable(mydumper mydumper.c binlog.c server_detect.c g_unix_signal.c)
+ else (WITH_BINLOG)
+   add_executable(mydumper mydumper.c server_detect.c g_unix_signal.c)
+ endif (WITH_BINLOG)
+-target_link_libraries(mydumper ${MYSQL_LIBRARIES} ${GLIB2_LIBRARIES} ${GTHREAD2_LIBRARIES} ${PCRE_PCRE_LIBRARY} ${ZLIB_LIBRARIES})
+-
++target_link_libraries(mydumper ${MYSQL_LIBRARIES} ${GLIB2_LIBRARIES} ${GTHREAD2_LIBRARIES} ${PCRE_PCRE_LIBRARY} ${ZLIB_LIBRARIES} ${M_LIB})
+ 
+ add_executable(myloader myloader.c)
+-target_link_libraries(myloader ${MYSQL_LIBRARIES} ${GLIB2_LIBRARIES} ${GTHREAD2_LIBRARIES} ${PCRE_PCRE_LIBRARY} ${ZLIB_LIBRARIES})
++target_link_libraries(myloader ${MYSQL_LIBRARIES} ${GLIB2_LIBRARIES} ${GTHREAD2_LIBRARIES} ${PCRE_PCRE_LIBRARY} ${ZLIB_LIBRARIES} ${M_LIB})
+ 
+ INSTALL(TARGETS mydumper myloader
+   RUNTIME DESTINATION bin

debian/patches/0004-add-library-suffix-for-libatomic.patch

@@ -0,0 +1,21 @@
+From: Mateusz Kijowski <mateusz@kijowski.info>
+Date: Tue, 17 Jan 2017 12:57:43 +0100
+Subject: add library suffix for libatomic
+
+---
+ cmake/modules/FindMySQL.cmake | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/cmake/modules/FindMySQL.cmake b/cmake/modules/FindMySQL.cmake
+index ef64646..23470a8 100644
+--- a/cmake/modules/FindMySQL.cmake
++++ b/cmake/modules/FindMySQL.cmake
+@@ -84,7 +84,7 @@ find_path(MYSQL_INCLUDE_DIR mysql.h
+ )
+ 
+ set(TMP_MYSQL_LIBRARIES "")
+-set(CMAKE_FIND_LIBRARY_SUFFIXES .so .a .lib)
++set(CMAKE_FIND_LIBRARY_SUFFIXES .so .a .lib .so.1)
+ foreach(MY_LIB ${MYSQL_ADD_LIBRARIES})
+     find_library("MYSQL_LIBRARIES_${MY_LIB}" NAMES ${MY_LIB}
+         HINTS

debian/patches/series

@@ -0,0 +1,4 @@
+0001-manpage-whatis-description.patch
+0002-dont-install-documentation-source.patch
+0003-explicitly-link-libm.patch
+0004-add-library-suffix-for-libatomic.patch

debian/rules

@@ -0,0 +1,13 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+# Sample debian/rules that uses debhelper.
+# This file was originally written by Joey Hess and Craig Small.
+# As a special exception, when this file is copied by dh-make into a
+# dh-make output file, you may use that output file without restriction.
+# This special exception was added by Craig Small in version 0.37 of dh-make.
+
+# Uncomment this to turn on verbose mode.
+export DH_VERBOSE=1
+
+%:
+	dh $@ --with=sphinxdoc

debian/source/format

@@ -0,0 +1 @@
+3.0 (quilt)

debian/upstream/signing-key.asc

@@ -0,0 +1,39 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1
+
+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
+XmBM/2ByCbTTKokM+QivLrDB9Paf+xRmag==
+=zxkn
+-----END PGP PUBLIC KEY BLOCK-----

debian/watch

@@ -0,0 +1,3 @@
+version=3
+opts=filenamemangle=s/.+\/v?(\d\S+)\.tar\.gz/mydumper-$1\.tar\.gz/ \
+  https://github.com/maxbube/mydumper/releases .*/v?(\d\S+)\.tar\.gz