Skip to contentSkip to conversation

debian/ realted changes

PATCH Applied Henning Schild 2 participants 5 messages Feb 13, 2018 – Feb 20, 2018

lore
Share & tools
lore
#0 lore raw

cover debian/ realted changes

The first one actually fixes a regression where debian packages can not be generated anymore. And the remaining two fix minor issues.

Henning Schild (3):
debian: drop prebuild docs from packages
debian: add mssing build dependency
debian: increase debian compat level

 debian/compat                  |  2 +-
 debian/control                 | 25 ++++---------------------
 debian/xenomai-doc.install     |  1 -
 debian/xenomai-runtime.install |  1 -
 4 files changed, 5 insertions(+), 24 deletions(-)
 delete mode 100644 debian/xenomai-doc.install
Signature · 1 line
2.13.6
#1 lore raw

PATCH 1/3 debian: drop prebuild docs from packages

commit 65e1b75629 dropped the prebuild documentation, as a result the debian package build will fail trying to include it into packages We could actually build the docs to package them, this patch just drops them as well.

---
 debian/control                 | 22 +++-------------------
 debian/xenomai-doc.install     |  1 -
 debian/xenomai-runtime.install |  1 -
 3 files changed, 3 insertions(+), 21 deletions(-)
 delete mode 100644 debian/xenomai-doc.install
debian/control +3 -19
index 86e8e37e3..425f00741 100644
@@ -11,7 +11,7 @@ Package: xenomai-runtime
 Section: devel
 Architecture: amd64 arm armeb armel armhf i386 powerpc powerpcspe
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Suggests: xenomai-kernel-source, xenomai-doc
+Suggests: xenomai-kernel-source
 Replaces: xenomai
 Conflicts: xenomai
 Description: Xenomai runtime utilities
@@ -48,7 +48,7 @@ Package: libxenomai1
 Section: libs
 Architecture: amd64 arm armeb armel armhf i386 powerpc powerpcspe
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Suggests: xenomai-kernel-source, xenomai-doc
+Suggests: xenomai-kernel-source
 Replaces: xenomai
 Conflicts: xenomai
 Description: Shared libraries for Xenomai
@@ -64,7 +64,7 @@ Package: libxenomai-dev
 Section: libdevel
 Architecture: amd64 arm armeb armel armhf i386 powerpc powerpcspe
 Depends: libxenomai1 (= ${binary:Version}), ${misc:Depends}
-Suggests: xenomai-kernel-source, xenomai-doc
+Suggests: xenomai-kernel-source
 Replaces: xenomai
 Conflicts: xenomai
 Description: Headers and static libs for Xenomai
@@ -76,19 +76,3 @@ Description: Headers and static libs for Xenomai
  .
  This package contains development files (header files), the static libraries
  and scripts used to compile realtime applications.
-
-Package: xenomai-doc
-Section: doc
-Architecture: all
-Depends: ${misc:Depends}
-Suggests: xenomai
-Conflicts: xenomai-docs
-Replaces: xenomai-docs
-Description: Xenomai documentation
- Xenomai is a real-time development framework cooperating with the Linux
- kernel in order to provide a pervasive, interface-agnostic, hard real-time
- support to user-space applications, seamlessly integrated into the GNU/Linux
- environment. Xenomai provides its own API and emulation layers ("skins") to
- make migration from other RTOS easier. Examples are: pSOS+, VxWorks, POSIX.
- .
- Documentation for Xenomai realtime API.
debian/xenomai-doc.install deleted +0 -1
deleted file mode 100644
index f8521db50..000000000
@@ -1 +0,0 @@
-usr/share/doc/xenomai/* usr/share/doc/xenomai-doc
debian/xenomai-runtime.install +0 -1
index e5f1cd6ad..372b0e402 100644
@@ -1,4 +1,3 @@
 usr/bin
 usr/sbin
-usr/share/man
 usr/lib/xenomai
Signature · 1 line
2.13.6
#2 lore raw

PATCH 2/3 debian: add mssing build dependency

In reply to Henning Schild

Fixes the following error:

Quoted 4 lines

configure.ac:93: error: possibly undefined macro: LT_SYS_SYMBOL_USCORE
If this token and others are legitimate, please use m4_pattern_allow. See the Autoconf documentation.
autoreconf: /usr/bin/autoconf failed with exit status: 1

---
 debian/control | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
debian/control +1 -2
index 425f00741..3427987e1 100644
@@ -2,8 +2,7 @@ Source: xenomai
 Section: devel
 Priority: extra
 Maintainer: Xenomai <[email protected]>
-Build-Depends: debhelper (>= 8), findutils (>= 4.2.28), autotools-dev, autoconf, automake, libtool,
- pkg-config
+Build-Depends: debhelper (>= 8), findutils (>= 4.2.28), autotools-dev, autoconf, automake, libtool, pkg-config, libltdl-dev
 Standards-Version: 3.9.3
 Homepage: http://www.xenomai.org/
 
Signature · 1 line
2.13.6
#3 lore raw

PATCH 3/3 debian: increase debian compat level

In reply to Henning Schild

We currently use level 8 which is marked deprecated in Debian stable, increase the number by one to suppress the following warnings:

Quoted 1 line

dh_*: Compatibility levels before 9 are deprecated (level 8 in use)

---
 debian/compat | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
debian/compat +1 -1
index 45a4fb75d..ec635144f 100644
@@ -1 +1 @@
-8
+9
Signature · 1 line
2.13.6
#4 lore raw
In reply to Henning Schild
Quoted 8 lines · Henning Schild

The first one actually fixes a regression where debian packages can not be generated anymore. And the remaining two fix minor issues.

Henning Schild (3):
debian: drop prebuild docs from packages
debian: add mssing build dependency
debian: increase debian compat level

Quoted 7 lines
 debian/compat                  |  2 +-
 debian/control                 | 25 ++++---------------------
 debian/xenomai-doc.install     |  1 -
 debian/xenomai-runtime.install |  1 -
 4 files changed, 5 insertions(+), 24 deletions(-)
 delete mode 100644 debian/xenomai-doc.install

Merged, thanks.

Signature · 1 line
Philippe.