tags 635962 + patch tags 635962 + pending thanks Dear Heiko,
I've prepared an NMU for libnl3 (versioned as 3.0-1.1). As you already gave me permission to directly upload it, it's now in unstable. Regards. -- Ever tried. Ever failed. No matter. Try again. Fail again. Fail better. ~ Samuel Beckett ~
diff -u libnl3-3.0/debian/control libnl3-3.0/debian/control
--- libnl3-3.0/debian/control
+++ libnl3-3.0/debian/control
@@ -58,0 +59,12 @@
+
+Package: libnl3-udeb
+Architecture: linux-any
+XC-Package-Type: udeb
+Section: debian-installer
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Description: library for dealing with netlink sockets
+ This is a library for applications dealing with netlink sockets.
+ The library provides an interface for raw netlink messaging and various
+ netlink family specific interfaces.
+ .
+ This package is a udeb. It's only usefull inside of debian-installer.
\ Kein Zeilenumbruch am Dateiende.
diff -u libnl3-3.0/debian/rules libnl3-3.0/debian/rules
--- libnl3-3.0/debian/rules
+++ libnl3-3.0/debian/rules
@@ -3,10 +3,28 @@
+DEB_BUILDDIR = debian/build
+DEB_MAKE_FLAVORS = main udeb
+
+udeb=libnl3-udeb
+
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/autotools.mk
include /usr/share/cdbs/1/rules/simple-patchsys.mk
+# FIXME: not honoured
+#CFLAGS_udeb += $(CFLAGS) -Os
+CFLAGS += $(if $(findstring udeb,$(cdbs_make_curflavor)),-Os)
+
DEB_DH_STRIP_ARGS := --dbg-package=libnl3-dbg
-DEB_DH_MAKESHLIBS_ARGS_libnl3 := -V"libnl3 (>= $(DEB_UPSTREAM_VERSION))"
+DEB_DH_MAKESHLIBS_ARGS_libnl3 := -V"libnl3 (>= $(DEB_UPSTREAM_VERSION))" --add-udeb=$(udeb)
+
+DEB_MAKE_DESTDIRSKEL = $(CURDIR)/debian/tmp
+DEB_MAKE_DESTDIRSKEL_udeb = $(CURDIR)/debian/tmp/udeb
+
+DEB_DH_INSTALL_ARGS_$(udeb) += --sourcedir=debian/tmp/udeb
build/libnl3-doc::
- cd doc && $(MAKE) gendoc
+ cd $(DEB_BUILDDIR)/main/doc && $(MAKE) gendoc
+
+clean::
+ # from some unknown reason CDBS does not remove the builddir
+ rm -rf $(DEB_BUILDDIR)
diff -u libnl3-3.0/debian/libnl3-doc.install libnl3-3.0/debian/libnl3-doc.install
--- libnl3-3.0/debian/libnl3-doc.install
+++ libnl3-3.0/debian/libnl3-doc.install
@@ -1,5 +1,5 @@
-doc/html/*.html usr/share/doc/libnl3-doc/html
-doc/html/*.css usr/share/doc/libnl3-doc/html
-doc/html/*.png usr/share/doc/libnl3-doc/html
-doc/html/*.map usr/share/doc/libnl3-doc/html
-doc/html/*.md5 usr/share/doc/libnl3-doc/html
+debian/build/main/doc/html/*.html usr/share/doc/libnl3-doc/html
+debian/build/main/doc/html/*.css usr/share/doc/libnl3-doc/html
+debian/build/main/doc/html/*.png usr/share/doc/libnl3-doc/html
+debian/build/main/doc/html/*.map usr/share/doc/libnl3-doc/html
+debian/build/main/doc/html/*.md5 usr/share/doc/libnl3-doc/html
diff -u libnl3-3.0/debian/changelog libnl3-3.0/debian/changelog
--- libnl3-3.0/debian/changelog
+++ libnl3-3.0/debian/changelog
@@ -1,3 +1,11 @@
+libnl3 (3.0-1.1) unstable; urgency=low
+
+ * Non-maintainer upload with agreement from Heiko Stübner
+ * Add libnl3-udeb package with seperate build for
+ debian-installer (Closes: #635962).
+
+ -- Gaudenz Steinlin <gaud...@debian.org> Fri, 29 Jul 2011 23:25:48 +0200
+
libnl3 (3.0-1) unstable; urgency=low
* New upstream release (Closes: #626098)
only in patch2:
unchanged:
--- libnl3-3.0.orig/debian/libnl3-udeb.install
+++ libnl3-3.0/debian/libnl3-udeb.install
@@ -0,0 +1,2 @@
+usr/lib/libnl.so.*
+usr/lib/libnl-genl.so.*
\ No newline at end of file
only in patch2:
unchanged:
--- libnl3-3.0.orig/debian/patches/0003-fix-out-of-tree-build.patch
+++ libnl3-3.0/debian/patches/0003-fix-out-of-tree-build.patch
@@ -0,0 +1,84 @@
+From 913579b460b6e081e119e0ebdb662115857e0b43 Mon Sep 17 00:00:00 2001
+From: Thierry Reding <thierry.red...@avionic-design.de>
+Date: Fri, 14 Jan 2011 11:38:05 +0100
+Subject: [PATCH] Fix out-of-tree build.
+
+This patch fixes out-of-tree build, that is, when building with
+$builddir != $srcdir. In such a case, some generated header files are
+not found because they live in a different tree and can be fixed by
+adding the directories to the compiler's include search path.
+---
+ lib/Makefile.am | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/lib/Makefile.am b/lib/Makefile.am
+index ccedf43..5999113 100644
+--- a/lib/Makefile.am
++++ b/lib/Makefile.am
+@@ -1,6 +1,6 @@
+ # -*- Makefile -*-
+
+-AM_CPPFLAGS = -Wall -I${top_srcdir}/include -I${top_builddir}/include -D_GNU_SOURCE -DSYSCONFDIR=\"$(sysconfdir)/libnl\"
++AM_CPPFLAGS = -Wall -I${top_srcdir}/include -I${top_builddir}/include -I${builddir}/route -I${builddir}/route/cls -D_GNU_SOURCE -DSYSCONFDIR=\"$(sysconfdir)/libnl\"
+ AM_LDFLAGS = -version-info 3:0:0
+
+ lib_LTLIBRARIES = \
+--- libnl3-3.0.orig/lib/Makefile.in 2011-03-21 17:07:26.000000000 +0100
++++ libnl3-3.0/lib/Makefile.in 2011-07-29 23:22:02.162604056 +0200
+@@ -324,7 +324,7 @@
+ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-AM_CPPFLAGS = -Wall -I${top_srcdir}/include -I${top_builddir}/include -D_GNU_SOURCE -DSYSCONFDIR=\"$(sysconfdir)/libnl\"
++AM_CPPFLAGS = -Wall -I${top_srcdir}/include -I${top_builddir}/include -I${builddir}/route -I${builddir}/route/cls -D_GNU_SOURCE -DSYSCONFDIR=\"$(sysconfdir)/libnl\"
+ AM_LDFLAGS = -version-info 3:0:0
+ lib_LTLIBRARIES = \
+ libnl.la libnl-genl.la libnl-route.la libnl-nf.la
+--- libnl3-3.0.orig/doc/Doxyfile.in 2011-03-21 17:07:20.000000000 +0100
++++ libnl3-3.0/doc/Doxyfile.in 2011-07-30 00:36:26.348783732 +0200
+@@ -581,10 +581,14 @@
+ # directories like "/usr/src/myproject". Separate the files or directories
+ # with spaces.
+
+-INPUT = ../lib \
+- ../src/lib \
+- ../include/netlink \
+- src
++INPUT = @top_srcdir@/lib \
++ @top_srcdir@/src/lib \
++ @top_srcdir@/include/netlink \
++ @top_srcdir@/doc/src \
++ @top_builddir@/lib \
++ @top_builddir@/lib/route \
++ @top_builddir@/lib/route/cls \
++ @top_builddir@/include/netlink
+
+ # This tag can be used to specify the character encoding of the source files
+ # that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is
+@@ -642,7 +644,7 @@
+ # directories that contain example code fragments that are included (see
+ # the \include command).
+
+-EXAMPLE_PATH = src/examples
++EXAMPLE_PATH = @top_srcdir@/src/examples
+
+ # If the value of the EXAMPLE_PATH tag contains directories, you can use the
+ # EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
+@@ -662,7 +664,7 @@
+ # directories that contain image that are included in the documentation (see
+ # the \image command).
+
+-IMAGE_PATH = src/img
++IMAGE_PATH = @top_srcdir@/src/img
+
+ # The INPUT_FILTER tag can be used to specify a program that doxygen should
+ # invoke to filter for each input file. Doxygen will invoke the filter program
+@@ -816,7 +818,7 @@
+ # the style sheet file to the HTML output directory, so don't put your own
+ # stylesheet in the HTML output directory as well, or it will be erased!
+
+-HTML_STYLESHEET = libnl.css
++HTML_STYLESHEET = @srcdir@/libnl.css
+
+ # The HTML_COLORSTYLE_HUE tag controls the color of the HTML output.
+ # Doxygen will adjust the colors in the stylesheet and background images
signature.asc
Description: Digital signature
