patch against rpm/for-upstream

Stefan
From 68882152f383e36ecde8cbb3e0f6474deb64197b Mon Sep 17 00:00:00 2001
From: Stefan Kisdaroczi <ki...@hispeed.ch>
Date: Thu, 15 Apr 2010 11:11:26 +0200
Subject: [PATCH] debian: sync with 2.5.2-1 from debian.org

---
 debian/changelog               |    6 ++++++
 debian/libxenomai1.lintian     |    7 ++++++-
 debian/rules                   |    1 +
 debian/xenomai-runtime.install |    1 +
 4 files changed, 14 insertions(+), 1 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6d2d3cf..3e4a44b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xenomai (2.5.2-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Roland Stigge <sti...@antcom.de>  Mon, 29 Mar 2010 20:51:07 +0200
+
 xenomai (2.5.1-4) unstable; urgency=low
 
   * Added patches by Stefan Kisdaroczi <ki...@hispeed.ch>:
diff --git a/debian/libxenomai1.lintian b/debian/libxenomai1.lintian
index fe0da46..f5694a3 100644
--- a/debian/libxenomai1.lintian
+++ b/debian/libxenomai1.lintian
@@ -1,2 +1,7 @@
-# no contained shared library names refer to "xenomai", therefore own name
+# The package libxenomai1 first didn't contain a library called *xenomai*.
+# Therefore, I called it libxenomai1. Now, upstream introduced libxenomai0 in
+# the package.  I'm leaving the package name libxenomai1 for now since
+# downgrading the number in the package name is probably a bad idea, and
+# synchronizing the package name with the SO version number isn't easily
+# possible anyway since the package contains several libraries.
 libxenomai1: package-name-doesnt-match-sonames libanalogy1 libnative3 libpsos0 
libpthread-rt1 librtai0 librtdk0 librtdm1 libuitron0 libvrtx0 libvxworks1 
libxenomai0
diff --git a/debian/rules b/debian/rules
index 4cb53a3..38991e2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -38,6 +38,7 @@ endif
        CONFIG_OPTS += --prefix=/usr \
                    --includedir=/usr/include/xenomai \
                    --mandir=/usr/share/man \
+                   --with-testdir=/usr/lib/xenomai
 
 ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE))
        CONFIG_OPTS += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
diff --git a/debian/xenomai-runtime.install b/debian/xenomai-runtime.install
index c9eee75..d1dbe13 100644
--- a/debian/xenomai-runtime.install
+++ b/debian/xenomai-runtime.install
@@ -2,3 +2,4 @@ usr/bin
 usr/sbin
 usr/share/man
 usr/share/xenomai
+usr/lib/xenomai
-- 
1.5.6.5

Attachment: signature.asc
Description: OpenPGP digital signature

_______________________________________________
Xenomai-core mailing list
Xenomai-core@gna.org
https://mail.gna.org/listinfo/xenomai-core

Reply via email to