Commit 7dd8d77d authored by Jerome Benoit's avatar Jerome Benoit

Imported Debian patch 0.999e+ds-1

parent 9e450cca
usr/share/javascript/jquery/jquery.js usr/share/doc/apophenia-doc/html/jquery.js
usr/share/doc/apophenia-doc/examples/build.sh usr/share/doc/apophenia-doc/examples/clean.sh
usr/share/doc/apophenia-doc/examples usr/share/doc/apophenia-doc/eg
apophenia (0.999e+ds-1) UNRELEASED; urgency=medium
apophenia (0.999e+ds-1) unstable; urgency=medium
* Uploads to unstable.
* New upstream version (Closes: #777772, #781566).
* Debianization:
- debian/copyright:
......@@ -7,9 +8,15 @@ apophenia (0.999e+ds-1) UNRELEASED; urgency=medium
script debian/repack;
- update;
- debian/repack, discard (see above);
- debian/watch, revisit (see above).
- debian/watch, revisit (see above);
- debian/patches/debianization-documentation.patch, render the build
reproducible by removing $date (Closes: #788868);
- debian/patches/debianization-bug-597187_757967-mysql_config.patch, harden;
- debian/patches/upstream-*.patch, remove since they were integrated;
- debian/rules, clean up;
- debian/clean, drop off.
-- Jerome Benoit <calculus@rezozer.net> Thu, 02 Jul 2015 23:19:11 +0000
-- Jerome Benoit <calculus@rezozer.net> Fri, 10 Jul 2015 19:11:33 +0000
apophenia (0.999c+ds-1) experimental; urgency=medium
......
cmd/apop_db_to_crosstab.1
cmd/apop_plot_query.1
cmd/apop_text_to_db.1
tests/ff.db
tests/runs.db
tests/td.db
tests/draws-k
tests/draws-k2
tests/draws-mvN
tests/draws-N
tests/draws-std_multinormal
tests/draws-std_normal
tests/the_data.txt
tests/print_test.out
tests/xxx
docs/model_doc.h
docs/doxygen_sqlite3.db
docs/missing_model_parts
......@@ -10,6 +10,7 @@ Build-Depends:
zlib1g-dev, libmysqlclient-dev, libsqlite3-dev, libgsl0-dev,
bc, sqlite3
Build-Depends-Indep:
graphviz,
doxygen, texlive-latex-recommended, texlive-fonts-recommended, ghostscript,
rdfind, symlinks
Standards-Version: 3.9.6
......@@ -17,7 +18,7 @@ Homepage: http://apophenia.info/
Vcs-Git: git://anonscm.debian.org/debian-science/packages/apophenia.git
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-science/packages/apophenia.git
Package: libapophenia1
Package: libapophenia2
Provides: libapophenia
Section: libs
Architecture: any
......@@ -45,13 +46,13 @@ Description: Apophenia Statistical C Library -- library package
.
This package provides the shared libraries required to run programs
compiled against the Apophenia Statistical C Library. To compile your
own programs you also need to install the libapophenia1-dev package.
own programs you also need to install the libapophenia2-dev package.
Package: libapophenia1-dev
Package: libapophenia2-dev
Provides: libapophenia-dev
Section: libdevel
Architecture: any
Depends: libapophenia1 (= ${binary:Version}), ${misc:Depends}
Depends: libapophenia2 (= ${binary:Version}), ${misc:Depends}
Conflicts: libapophenia-dev
Suggests: pkg-config
Multi-Arch: same
......@@ -78,7 +79,7 @@ Description: Apophenia Statistical C Library -- development package
Package: apophenia-bin
Architecture: any
Depends: libapophenia1 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
Depends: libapophenia2 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
Suggests: sqlite3
Multi-Arch: foreign
Description: Apophenia Statistical C Library -- binary package
......@@ -100,12 +101,12 @@ Description: Apophenia Statistical C Library -- binary package
.
This package provides several command line utility examples.
Package: libapophenia1-dbg
Package: libapophenia2-dbg
Provides: libapophenia-dbg
Section: debug
Priority: extra
Architecture: any
Depends: libapophenia1 (= ${binary:Version}), ${misc:Depends}
Depends: libapophenia2 (= ${binary:Version}), ${misc:Depends}
Conflicts: libapophenia-dbg
Multi-Arch: same
Description: Apophenia Statistical C Library -- debug symbols package
......@@ -126,14 +127,14 @@ Description: Apophenia Statistical C Library -- debug symbols package
GNU General Public License version 2 (GPL2) with two modifications.
.
This package provides the debugging symbols for the libraries from
the libapophenia1-dev package.
the libapophenia2-dev package.
Package: apophenia-doc
Section: doc
Architecture: all
Depends: ${misc:Depends}
Depends: libjs-jquery, ${misc:Depends}
Suggests:
libapophenia1 (= ${binary:Version}), libapophenia1-dev (= ${binary:Version}),
libapophenia2 (= ${binary:Version}), libapophenia2-dev (= ${binary:Version}),
# pdf-viewer,
www-browser,
gsl-doc-pdf, gsl-ref-html
......
This diff is collapsed.
This diff is collapsed.
......@@ -5,27 +5,18 @@ Description: debianization -- ad hoc
has been reported to the upstream maintainer.
Origin: debian
Author: Jerome Benoit <calculus@rezozer.net>
Last-Update: 2014-09-08
Last-Update: 2015-07-08
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -31,6 +31,7 @@
doc: documentation.h model_doc.h $(apophenia_IMAGES) $(apophenia_JS)
doxygen doxygen.conf
cp $(apophenia_IMAGES) $(apophenia_JS) html/
+ cp $(top_srcdir)/debian/adhoc/images/structs.png html/
sed -i -f edit_outline.sed html/index.html html/outline.html
sed -i -f edit_globals.sed html/globals.html
sed -i -f edit_group.sed html/group__models.html
--- a/docs/documentation.h
+++ b/docs/documentation.h
@@ -2415,7 +2415,8 @@
which will be useful to you if only because it lists some of the functions that act on
GSL vectors and matrices that are useful (in fact, essential) but out of the scope of the Apophenia documentation.
-\image html http://apophenia.info/structs.png
+\image html structs.png
+\image latex structs.png
@@ -2618,8 +2618,8 @@
relate. It is taken from this
<a href="http://modelingwithdata.org/pdfs/cheatsheet.pdf">cheat sheet</a> on general C and SQL use (2 page PDF).
-\image html http://apophenia.info/structs.png width="100%"
-\image latex ../structs.png width=18cm
+\image html structs.png width="100%"
+\image latex structs.png width=18cm
All of the elements of the \ref apop_data structure are laid out at middle-left. You have
already met the vector, matrix, weights, and text grid.
......@@ -2,17 +2,17 @@ Description: debianization -- workaround around bugs
Meant to workaround bugs #597187 and #757967
Origin: debian
Author: Jerome Benoit <calculus@rezozer.net>
Last-Update: 2014-08-12
Last-Update: 2015-07-10
--- a/configure.ac
+++ b/configure.ac
@@ -68,6 +68,9 @@
@@ -87,6 +87,9 @@
## Debian package version
DEB_PKG_VERSION=$(dpkg-parsechangelog | sed -n -e '/^Version:/s/Version: //p')
AC_SUBST(DEB_PKG_VERSION)
+## work around for bugs #597187 and #757967
+MYSQL_CFLAGS=$(echo "${MYSQL_CFLAGS}" | sed -e 's/-DNDEBUG//' -e 's/-g//' -e 's/-fno-strict-aliasing//' -e 's/[ ]*$//')
+MYSQL_LDFLAGS=$(echo "${MYSQL_LDFLAGS}" | sed -e 's/-lz//' -e 's/-lrt//' -e 's/-ldl//' -e 's/[ ]*$//')
+MYSQL_CFLAGS=$(echo "${MYSQL_CFLAGS}" | sed -e 's/-DNDEBUG//g;s/-g//g;s/-fabi-version=2//g;s/-fno-omit-frame-pointer//g;s/-fno-strict-aliasing//g;s/[ ]*$//g' | tr -s ' ')
+MYSQL_LDFLAGS=$(echo "${MYSQL_LDFLAGS}" | sed -e 's/-lz//g;s/-lrt//g;s/-ldl//g' | tr -s ' ')
AC_CONFIG_FILES([
apophenia.pc
......@@ -2,13 +2,13 @@ Description: debianization -- documentation
Address Debian Policy requirements for documentation.
Origin: debian
Author: Jerome Benoit <calculus@rezozer.net>
Last-Update: 2014-08-11
Last-Update: 2015-07-09
--- a/docs/head.html
+++ b/docs/head.html
@@ -2,13 +2,7 @@
<html> <head>
<title>Apophenia: a library for scientific computing</title>
@@ -11,13 +11,7 @@
<script type="text/javascript" src="$relpath^jquery.js"></script>
<script type="text/javascript" src="$relpath^dynsections.js"></script>
-<!-- Google is watching. -->
-<script src="http://www.google-analytics.com/urchin.js" type="text/javascript">
......@@ -19,11 +19,10 @@ Last-Update: 2014-08-11
-</script>
+<!-- Google is no more watching. -->
<link rel="stylesheet" href="typical.css" type="text/css" >
$treeview
$search
--- a/docs/foot.html
+++ b/docs/foot.html
@@ -1,2 +1,2 @@
<p><p>
-<div class="tiny">Autogenerated by doxygen on $date.</div></body></html>
+<div class="tiny">Autogenerated by doxygen on $date (Debian $projectnumber).</div></body></html>
@@ -1 +1 @@
-</body></html>
+<div class="tiny">Autogenerated by doxygen (Debian $projectnumber).</div></body></html>
......@@ -3,32 +3,20 @@ Description: debianization
to address Debian specific stuff in general.
Origin: debian
Author: Jerome Benoit <calculus@rezozer.net>
Last-Update: 2014-10-09
Last-Update: 2015-07-09
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -35,6 +35,8 @@
sed -i -f edit_globals.sed html/globals.html
sed -i -f edit_group.sed html/group__models.html
sed -i -f edit_width.sed html/*.html
@@ -48,6 +48,9 @@
sed -i -f $(top_srcdir)/docs/edit_group.sed html/group__models.html
sed -i -f $(top_srcdir)/docs/edit_width.sed html/*.html
$(abs_top_srcdir)/docs/adjust
+ rdfind -outputname /dev/null -makesymlinks true html
+ symlinks -r -c -s -v html
+ -rm -f html/jquery.js
doc-clean:
-rm -rf html latex man
@@ -58,3 +60,12 @@
typical.css \
documentation.h
+
+if MAINTAINER_MODE
+
+DISTCLEANFILES = $(MAINTAINERCLEANFILES)
+
+distclean-local: doc-clean
+
+endif
+
-rm -rf include html latex man
--- a/docs/doxygen.conf.in
+++ b/docs/doxygen.conf.in
@@ -38,7 +38,7 @@
......@@ -40,7 +28,7 @@ Last-Update: 2014-10-09
# Using the PROJECT_BRIEF tag one can provide an optional one line description
# for a project that appears at the top of each page and should give viewer a
@@ -789,7 +789,7 @@
@@ -793,7 +793,7 @@
# Note that relative paths are relative to the directory from which doxygen is
# run.
......@@ -49,8 +37,8 @@ Last-Update: 2014-10-09
# The EXCLUDE_SYMLINKS tag can be used to select whether or not files or
# directories that are symbolic links (a Unix file system feature) are excluded
@@ -1552,7 +1552,7 @@
# If the GENERATE_LATEX tag is set to YES doxygen will generate LaTeX output.
@@ -1559,7 +1559,7 @@
# If the GENERATE_LATEX tag is set to YES, doxygen will generate LaTeX output.
# The default value is: YES.
-GENERATE_LATEX = YES
......@@ -58,7 +46,7 @@ Last-Update: 2014-10-09
# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. If a
# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
@@ -1754,7 +1754,7 @@
@@ -1784,7 +1784,7 @@
# classes and files.
# The default value is: NO.
......@@ -72,7 +60,7 @@ Last-Update: 2014-10-09
@@ -4,13 +4,13 @@
AC_PREREQ(2.60)
AC_INIT([apophenia], [0.999b], [fluffmail@f-m.fm])
AC_INIT([apophenia], [0.999e], [fluffmail@f-m.fm])
-AM_SILENT_RULES([yes])
+AM_SILENT_RULES([no])
AC_CONFIG_SRCDIR([apop_arms.c])
......@@ -85,9 +73,9 @@ Last-Update: 2014-10-09
# The normal /usr/local default confused too many people
##AC_PREFIX_DEFAULT([/usr])
@@ -63,6 +63,11 @@
AC_PATH_PROGS([SQLITE3],[sqlite3],[/usr/bin/sqlite3])
@@ -82,6 +82,11 @@
AC_MSG_RESULT([$enable_extended_tests])
AM_CONDITIONAL([EXTENDED_TESTS], [test "X$enable_extended_tests" != "Xno"])
+# Debian stuff
+## Debian package version
......@@ -96,21 +84,29 @@ Last-Update: 2014-10-09
+
AC_CONFIG_FILES([
apophenia.pc
Makefile
apop.h
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,7 +5,7 @@
dist-bzip2 \
dist-zip
@@ -9,7 +9,7 @@
--disable-maintainer-mode \
--enable-extended-tests
-AM_CFLAGS = -g -Wall -O3
+AM_CFLAGS = -Wno-unused-result
## Library versioning (C:R:A == current:revision:age)
## 0.999b 0:0:0
@@ -102,7 +102,3 @@
EXTRA_DIST += \
$(apop_db_INCLUDES)
-
-## compatibility
-doc:
- -$(MAKE) -C docs doc
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -46,6 +46,8 @@
@@ -66,6 +66,8 @@
-I$(top_srcdir) \
$(GSL_CFLAGS)
......
upstream-update-library_version.patch
upstream-update-docs_doxygen_conf_in.patch
debianization.patch
debianization-help2man.patch
debianization-documentation.patch
......
This source diff could not be displayed because it is too large. You can view the blob instead.
Description: update library version
Update the library version wrt to the Libtool Manual (section 7.3)
and the related material; meant to be submitted to the upstream maintainer.
Origin: debian
Author: Jerome Benoit <calculus@rezozer.net>
Last-Update: 2014-12-16
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,7 +8,9 @@
AM_CFLAGS = -g -Wall -O3
## Library versioning (C:R:A == current:revision:age)
-LIBAPOPHENIA_LT_VERSION = 0:0:0
+## 0.999b 0:0:0
+## 0.999c 1:0:0
+LIBAPOPHENIA_LT_VERSION = 1:0:0
SUBDIRS = transform model . cmd tests docs eg
--- a/apophenia.map
+++ b/apophenia.map
@@ -1,4 +1,4 @@
-LIBAPOPHENIA_0.0.0 {
+LIBAPOPHENIA_1.0.0 {
global:
apop_opts;
apop_name_alloc;
#!/usr/bin/make -f
## inspired from gsl material
## inspired from mpfr material
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
CFLAGS += -O0
else ifeq ($(DEB_HOST_ARCH), m68k)
CFLAGS += -O2
else ifeq ($(DEB_HOST_ARCH), alpha)
CFLAGS += -O2 -mieee
CFLAGS += -mieee
else ifeq ($(DEB_HOST_ARCH),sha4)
CFLAGS += -mieee
else
CFLAGS += -O3
CFLAGS := $(subst -O2,-O3,$(CFLAGS))
endif
export ACLOCAL_PATH=/usr/share/gnulib/m4
......@@ -17,23 +17,21 @@ default:
@uscan --no-conf --dehs --report || true
%:
dh $@ --with autoreconf
dh $@ --with autoreconf --builddirectory=_build --parallel
override_dh_auto_configure:
dh_auto_configure -- --enable-maintainer-mode --enable-extended-tests
override_dh_auto_build-indep:
$(MAKE) -C docs doc
$(MAKE) -C _build/docs doc
override_dh_auto_test-indep:
override_dh_auto_configure:
dh_auto_configure -- --enable-maintainer-mode
override_dh_auto_test:
ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
$(MAKE) -C tests check || cat tests/test-suite.log
endif
override_dh_strip:
dh_strip --dbg-package=libapophenia1-dbg
dh_strip --dbg-package=libapophenia2-dbg
override_dh_compress-indep:
dh_compress -X.pdf -Xexamples
get-orig-source:
uscan --no-conf --download-current-version --compression xz --verbose
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment