summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Glassey <wdg@debian.org>2018-11-02 23:05:52 +0700
committerglasseyes <dglassey@gmail.com>2018-11-03 12:24:58 +0700
commit621e6f2f9a992485c5d70b7db0d8ed970bca3c8e (patch)
treeb5491b88b36f9ce189b06e0493aa988918c7cd9d
parent88ad066477c57b1244e88d837d7b3aa42be40820 (diff)
release 1.8.1-4 to experimentaldebian/1.8.1-4
remove cmake dependency remove automake subdir-object patch - doesn't work comment on patches libsword1.8.1 to go through NEW queue
-rw-r--r--debian/changelog8
-rw-r--r--debian/control1
-rw-r--r--debian/patches/0004-automake-subdir-objects.patch41
-rw-r--r--debian/patches/series1
4 files changed, 7 insertions, 44 deletions
diff --git a/debian/changelog b/debian/changelog
index 3592e41..a59d6be 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,18 @@
-sword (1.8.1-4~pre1) UNRELEASED; urgency=medium
+sword (1.8.1-4) experimental; urgency=medium
* d/watch file to use https
* d/control don't need libsword-dbg any more
+ remove dep on cmake
* d/rules remove unused overrides
don't run usrinst or autogen
* new lib so version
d/control rename lib package to libsword1.8.1
rename d/libsword11v5.* to 1.8.1
+ * d/patches
+ 0005-untgz-sprintf.patch to remove strtime
+ 0006-powerpc64.patch to build on powerpc64
+ 0007-gbfwordjs.patch unlikely overflow
+ * for transition
-- Daniel Glassey <wdg@debian.org> Fri, 02 Nov 2018 10:19:32 +0700
diff --git a/debian/control b/debian/control
index 7964b00..10f5813 100644
--- a/debian/control
+++ b/debian/control
@@ -1,6 +1,5 @@
Source: sword
Build-Depends: debhelper (>= 10),
- cmake,
libz-dev,
pkg-config,
libcurl4-gnutls-dev,
diff --git a/debian/patches/0004-automake-subdir-objects.patch b/debian/patches/0004-automake-subdir-objects.patch
deleted file mode 100644
index f5a47d7..0000000
--- a/debian/patches/0004-automake-subdir-objects.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From: Daniel Glassey <wdg@debian.org>
-Date: Thu, 1 Nov 2018 13:34:07 +0700
-Subject: use subdir-objects in automake
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -11,10 +11,10 @@
- AC_REVISION($Revision: 1.45 $)
-
- AC_CANONICAL_TARGET
--AM_INIT_AUTOMAKE
-+#AM_INIT_AUTOMAKE
-
- # this doesn't work
--#AM_INIT_AUTOMAKE([subdir-objects])
-+AM_INIT_AUTOMAKE([subdir-objects])
-
- AM_CONFIG_HEADER(include/config.h)
-
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -4,7 +4,7 @@
- LDADD = $(top_builddir)/lib/libsword.la
-
- # Global config directory
--globalconfdir := @sysconfdir@
-+globalconfdir = @sysconfdir@
-
- SUBDIRS = lib .
-
---- a/lib/Makefile.am
-+++ b/lib/Makefile.am
-@@ -10,7 +10,7 @@
- AM_CPPFLAGS += -I$(includedir) -DUSE_AUTOTOOLS -DUNIX -Dunix -D__unix__
-
- # Global config directory
--globalconfdir := @sysconfdir@
-+globalconfdir = @sysconfdir@
-
- lib_LTLIBRARIES = libsword.la
-
diff --git a/debian/patches/series b/debian/patches/series
index 540a5e1..dd2695b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,7 +1,6 @@
13_curl.diff
abicompare.patch
0003-use-PKG_PROG_PKG_CONFIG-cross-compilation.patch
-0004-automake-subdir-objects.patch
0005-untgz-sprintf.patch
0006-powerpc64.patch
0007-gbfwordjs.patch