summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2018-05-13 20:49:10 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2018-05-13 20:51:45 +0000
commit4bbcf02108abca6ad9ea2c77218e766ee4d0d4b2 (patch)
tree86469358ef00ca30cdb7a703f902300d9d92610f
parentMerging upstream version 1:0.1.9998svn3149+dfsg. (diff)
downloadkbuild-4bbcf02108abca6ad9ea2c77218e766ee4d0d4b2.zip
kbuild-4bbcf02108abca6ad9ea2c77218e766ee4d0d4b2.tar.xz
Merging debian version 1:0.1.9998svn3149+dfsg-1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
-rw-r--r--debian/changelog12
-rw-r--r--debian/control5
-rw-r--r--debian/copyright4
-rw-r--r--debian/patches/09_read.c_record_files_SV_33034_Changes_fatal_to_error.patch58
-rw-r--r--debian/patches/do-not-build-docs.patch16
-rw-r--r--debian/patches/make-dfsg-glob-glibc227.diff86
-rw-r--r--debian/patches/missing-makefile.patch15
-rw-r--r--debian/patches/series4
8 files changed, 50 insertions, 150 deletions
diff --git a/debian/changelog b/debian/changelog
index 7ef7650..a75ee1d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+kbuild (1:0.1.9998svn3149+dfsg-1) unstable; urgency=low
+
+ * New upstream version 0.1.9998svn3149+dfsg (Closes: #891372)
+ * Drop patches upstreamed, hopefully not useful anymore
+ - drop 09_read.c_record_files_SV_33034_Changes_fatal_to_error.patch
+ * Add patch to disable doc and po builds
+ * Bump copyright years
+ * Bump std-version to 4.1.3
+ * Add pkg-config dependency
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org> Thu, 15 Mar 2018 18:44:34 +0100
+
kbuild (1:0.1.9998svn3127+dfsg-2~dschinn1) dschinn-backports; urgency=medium
* Uploading to dschinn-backports, remaining changes:
diff --git a/debian/control b/debian/control
index 4ca3fbe..328a15b 100644
--- a/debian/control
+++ b/debian/control
@@ -11,8 +11,9 @@ Build-Depends: debhelper (>= 10),
byacc,
flex,
libacl1-dev,
- texinfo
-Standards-Version: 4.1.1
+ texinfo,
+ pkg-config
+Standards-Version: 4.1.3
Homepage: http://svn.netlabs.org/kbuild
Vcs-Browser: https://sources.progress-linux.org/distributions/dschinn-backports/packages/kbuild
Vcs-Git: https://sources.progress-linux.org/distributions/dschinn-backports/packages/kbuild
diff --git a/debian/copyright b/debian/copyright
index 9d0c570..5b6127a 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,7 +3,7 @@ Source: http://svn.netlabs.org/kbuild/
Upstream-Contact: Knut St. Osmundsen <bird-kBuild-spam@anduin.net>
Files: *
-Copyright: 2004-2017 Knut St. Osmundsen <bird-kBuild-spam@anduin.net>
+Copyright: 2004-2018 Knut St. Osmundsen <bird-kBuild-spam@anduin.net>
License: GPL-3+
Files: src/kash/*
@@ -43,7 +43,7 @@ Copyright:
2010-2014 Felix Geyer <fgeyer@debian.org>
2010-2013 Michael Meskes <meskes@debian.org>
2013-2015 Ritesh Raj Sarraf <rrs@debian.org>
- 2014-2016 Gianfranco Costamagna <locutusofborg@debian.org>
+ 2014-2018 Gianfranco Costamagna <locutusofborg@debian.org>
License: GPL-3+
License: GPL-2+
diff --git a/debian/patches/09_read.c_record_files_SV_33034_Changes_fatal_to_error.patch b/debian/patches/09_read.c_record_files_SV_33034_Changes_fatal_to_error.patch
deleted file mode 100644
index f62eba9..0000000
--- a/debian/patches/09_read.c_record_files_SV_33034_Changes_fatal_to_error.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From 7d297494b7e8f413fee67f3a2e86b33c9c5d5ffb Mon Sep 17 00:00:00 2001
-From: Paul Smith <psmith@gnu.org>
-Date: Sun, 20 Oct 2013 12:49:01 -0400
-Subject: [PATCH 1/2] * read.c (record_files): [SV 33034] Change fatal() to
- error()
-
-Allows deprecated syntax. However we don't guarantee this syntax
-will continue to be legal in the future.
-Change suggested by David Boyce <david.s.boyce@gmail.com>
----
- src/kmk/NEWS | 10 ++++++++--
- src/kmk/read.c | 2 +-
- 2 files changed, 9 insertions(+), 3 deletions(-)
-
-diff --git a/src/kmk/NEWS b/src/kmk/NEWS
-index 523c9a7..c3e0c8b 100644
---- a/src/kmk/NEWS
-+++ b/src/kmk/NEWS
-@@ -114,6 +114,12 @@ http://sv.gnu.org/bugs/index.php?group=make&report_id=111&fix_release_id=104&set
- after the variable name, to allow for simple, conditional, or appending
- multi-line variable assignment.
-
-+* Change the fatal error for mixed explicit and implicit rules, that was
-+ introduced in GNU make 3.82, to a non-fatal error. However, this syntax is
-+ still deprecated and may return to being illegal in a future version of GNU
-+ make. Makefiles that rely on this syntax should be fixed.
-+ See https://savannah.gnu.org/bugs/?33034
-+
-
- Version 3.81
-
-@@ -128,8 +134,8 @@ Version 3.81
- any prerequisite that does not exist, even though that prerequisite
- might have caused the target to rebuild. Starting with the _next_
- release of GNU make, '$?' will contain all prerequisites that caused
-- the target to be considered out of date. See this Savannah bug:
-- http://savannah.gnu.org/bugs/index.php?func=detailitem&item_id=16051
-+ the target to be considered out of date.
-+ See http://savannah.gnu.org/bugs/?16051
-
- * WARNING: Backward-incompatibility!
- GNU make now implements a generic "second expansion" feature on the
-diff --git a/src/kmk/read.c b/src/kmk/read.c
-index ebc6a63..9a326bb 100644
---- a/src/kmk/read.c
-+++ b/src/kmk/read.c
-@@ -2786,7 +2786,7 @@ l_next:
- /* Reduce escaped percents. If there are any unescaped it's an error */
- name = filenames->name;
- if (find_percent_cached (&name))
-- fatal (flocp, _("mixed implicit and normal rules"));
-+ error (flocp, _("*** mixed implicit and normal rules: deprecated syntax"));
- }
- }
-
---
-2.1.1
-
diff --git a/debian/patches/do-not-build-docs.patch b/debian/patches/do-not-build-docs.patch
new file mode 100644
index 0000000..53a88b6
--- /dev/null
+++ b/debian/patches/do-not-build-docs.patch
@@ -0,0 +1,16 @@
+Description: Docs are non-DFSG
+Author: Gianfranco Costamagna <locutusofborg@debian.org>
+
+Last-Update: 2018-03-15
+
+--- kbuild-0.1.9998svn3149+dfsg.orig/src/kmk/configure.ac
++++ kbuild-0.1.9998svn3149+dfsg/src/kmk/configure.ac
+@@ -507,7 +507,7 @@ AS_IF([test "x$make_cv_load" = xno && te
+
+ # Specify what files are to be created.
+ AC_CONFIG_FILES([Makefile glob/Makefile po/Makefile.in config/Makefile \
+- doc/Makefile w32/Makefile tests/config-flags.pm])
++ w32/Makefile tests/config-flags.pm])
+
+ # OK, do it!
+
diff --git a/debian/patches/make-dfsg-glob-glibc227.diff b/debian/patches/make-dfsg-glob-glibc227.diff
deleted file mode 100644
index e6a944b..0000000
--- a/debian/patches/make-dfsg-glob-glibc227.diff
+++ /dev/null
@@ -1,86 +0,0 @@
-commit 48c8a116a914a325a0497721f5d8b58d5bba34d4
-Author: Paul Smith <psmith@gnu.org>
-Date: Sun Nov 19 15:09:16 2017 -0500
-
- * configure.ac: Support GLIBC glob interface version 2
-
-commit 193f1e81edd6b1b56b0eb0ff8aa4b41c7b4257b4
-Author: Paul Eggert <eggert@cs.ucla.edu>
-Date: Sun Sep 24 09:12:58 2017 -0400
-
- glob: Do not assume glibc glob internals.
-
- It has been proposed that glibc glob start using gl_lstat,
- which the API allows it to do. GNU 'make' should not get in
- the way of this. See:
- https://sourceware.org/ml/libc-alpha/2017-09/msg00409.html
-
- * dir.c (local_lstat): New function, like local_stat.
- (dir_setup_glob): Use it to initialize gl_lstat too, as the API
- requires.
-
---- kbuild-0.1.9998svn3127+dfsg.orig/src/kmk/configure.in
-+++ kbuild-0.1.9998svn3127+dfsg/src/kmk/configure.in
-@@ -360,10 +360,9 @@ AC_CACHE_VAL(make_cv_sys_gnu_glob, [
- #include <glob.h>
- #include <fnmatch.h>
-
--#define GLOB_INTERFACE_VERSION 1
- #if !defined _LIBC && defined __GNU_LIBRARY__ && __GNU_LIBRARY__ > 1
- # include <gnu-versions.h>
--# if _GNU_GLOB_INTERFACE_VERSION == GLOB_INTERFACE_VERSION
-+# if _GNU_GLOB_INTERFACE_VERSION == 1 || _GNU_GLOB_INTERFACE_VERSION == 2
- gnu glob
- # endif
- #endif
---- kbuild-0.1.9998svn3127+dfsg.orig/src/kmk/dir.c
-+++ kbuild-0.1.9998svn3127+dfsg/src/kmk/dir.c
-@@ -1465,12 +1465,39 @@ static int dir_exists_p (const char *dir
- }
- #endif
-
-+/* Similarly for lstat. */
-+#if !defined(lstat) && !defined(WINDOWS32) || defined(VMS)
-+# ifndef VMS
-+# ifndef HAVE_SYS_STAT_H
-+int lstat (const char *path, struct stat *sbuf);
-+# endif
-+# else
-+ /* We are done with the fake lstat. Go back to the real lstat */
-+# ifdef lstat
-+# undef lstat
-+# endif
-+# endif
-+# define local_lstat lstat
-+#elif defined(WINDOWS32)
-+/* Windows doesn't support lstat(). */
-+# define local_lstat local_stat
-+#else
-+static int
-+local_lstat (const char *path, struct stat *buf)
-+{
-+ int e;
-+ EINTRLOOP (e, lstat (path, buf));
-+ return e;
-+}
-+#endif
-+
- void
- dir_setup_glob (glob_t *gl)
- {
- gl->gl_opendir = open_dirstream;
- gl->gl_readdir = read_dirstream;
- gl->gl_closedir = ansi_free;
-+ gl->gl_lstat = local_lstat;
- gl->gl_stat = local_stat;
- #ifdef __EMX__ /* The FreeBSD implementation actually uses gl_lstat!! */
- gl->gl_lstat = local_stat;
-@@ -1479,8 +1506,6 @@ dir_setup_glob (glob_t *gl)
- gl->gl_exists = file_exists_p;
- gl->gl_isdir = dir_exists_p;
- #endif
-- /* We don't bother setting gl_lstat, since glob never calls it.
-- The slot is only there for compatibility with 4.4 BSD. */
- }
-
- void
diff --git a/debian/patches/missing-makefile.patch b/debian/patches/missing-makefile.patch
new file mode 100644
index 0000000..e2e9fe1
--- /dev/null
+++ b/debian/patches/missing-makefile.patch
@@ -0,0 +1,15 @@
+Description: Missing po/Makefile.in.in
+Author: Gianfranco Costamagna <locutusofborg@debian.org>
+Last-Update: 2018-03-15
+
+--- kbuild-0.1.9998svn3149+dfsg.orig/src/kmk/configure.ac
++++ kbuild-0.1.9998svn3149+dfsg/src/kmk/configure.ac
+@@ -506,7 +506,7 @@ AS_IF([test "x$make_cv_load" = xno && te
+ ])
+
+ # Specify what files are to be created.
+-AC_CONFIG_FILES([Makefile glob/Makefile po/Makefile.in config/Makefile \
++AC_CONFIG_FILES([Makefile glob/Makefile config/Makefile \
+ w32/Makefile tests/config-flags.pm])
+
+ # OK, do it!
diff --git a/debian/patches/series b/debian/patches/series
index 827f696..aaa1fcc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,3 @@
07_special-chars-build-path.diff
-09_read.c_record_files_SV_33034_Changes_fatal_to_error.patch
-make-dfsg-glob-glibc227.diff
+do-not-build-docs.patch
+missing-makefile.patch