--- libnl2-2.0.orig/debian/libnl2.install +++ libnl2-2.0/debian/libnl2.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/libnl*.so.* --- libnl2-2.0.orig/debian/libnl2-doc.doc-base +++ libnl2-2.0/debian/libnl2-doc.doc-base @@ -0,0 +1,9 @@ +Document: libnl2-doc +Title: libnl API documentation +Author: Thomas Graf +Abstract: Library for dealing with netlink sockets. +Section: Programming + +Format: HTML +Index: /usr/share/doc/libnl2-doc/html/index.html +Files: /usr/share/doc/libnl2-doc/html/* --- libnl2-2.0.orig/debian/compat +++ libnl2-2.0/debian/compat @@ -0,0 +1 @@ +7 --- libnl2-2.0.orig/debian/gbp.conf +++ libnl2-2.0/debian/gbp.conf @@ -0,0 +1,53 @@ +# Configuration file for git-buildpackage and friends + +[DEFAULT] +# the default build command: +#builder = debuild -i\.git/ -I.git +# the default clean command: +#cleaner = debuild clean +# the default branch for upstream sources: +upstream-branch = upstream-dist +# the default branch for the debian patch: +debian-branch = debian +# the default tag formats used: +#upstream-tag = upstream/%(version)s +#debian-tag = debian/%(version)s +# use pristine-tar: +pristine-tar = True + +# Options only affecting git-buildpackage +[git-buildpackage] +#upstream-branch = dfsgclean +# uncomment this to automatically GPG sign tags +#sign-tags = True +# keyid to GPG sign tags with +#keyid = 0xdeadbeef +# push to a remote repository after a successful tag: +#posttag = git-push git.example.com +# use this for more svn-buildpackage like behaviour: +#export-dir = ../build-area/ +#tarball-dir = ../tarballs/ +#ignore-new = True + +# Options only affecting git-import-orig +[git-import-orig] +#upstream-branch = newupstream +#debian-branch = dfsgclean +#filter = .svn + +# Options only affecting git-import-dsc +[git-import-dsc] +#upstream-branch = svn-upstream +#filter = [ 'CVS', '.cvsignore' ] + +# Options only affecting git-dch +[git-dch] +#git-log = --no-merges +#snapshot-number = snapshot + 1 +# include 0 digits of the commit id in the changelog enty +#id-length = 0 +# don't include information from meta tags +#meta = False +# what tags to look for to generate bug-closing changelog entries +#meta-closes = Closes|LP + --- libnl2-2.0.orig/debian/README.source +++ libnl2-2.0/debian/README.source @@ -0,0 +1,10 @@ +This package uses the simple-patchsys of cdbs. + +The following patches are used: +0001: Fixes the header inclusion in the Makefiles. + This for example make distcheck +0002: Includes all generated libraries as linktargets in the pkg-config file. + Reason: Currently libnl2 generates a bunch of child libraries. + These don't get individual .pc files from upstream at the moment but + programs linking against libnl2 using the .pc file mostly need these + additional libraries too. --- libnl2-2.0.orig/debian/libnl2-dev.install +++ libnl2-2.0/debian/libnl2-dev.install @@ -0,0 +1,3 @@ +debian/tmp/usr/include/* +debian/tmp/usr/lib/pkgconfig/* +debian/tmp/usr/lib/libnl*.so --- libnl2-2.0.orig/debian/libnl2-doc.install +++ libnl2-2.0/debian/libnl2-doc.install @@ -0,0 +1 @@ +doc/html/*.html usr/share/doc/libnl2-doc/html --- libnl2-2.0.orig/debian/copyright +++ libnl2-2.0/debian/copyright @@ -0,0 +1,102 @@ +This package was debianized by Heiko Stuebner on +Tue, 16 Jan 2006 12:00:46 +0000. +The packaging is based on Michael Biebl's original packaging +of libnl1. + +It was downloaded from http://people.suug.ch/~tgr/libnl/ + +Upstream Author: + Thomas Graf + + +Copyright: + +lib/route/addr.c +include/netlink/route/addr.h + + Copyright (c) Thomas Graf + Baruch Even + + +lib/route/cls/u32.c +lib/route/cls/fw.c +lib/route/sch/htb.c +include/netlink/route/cls/fw.h +include/netlink/route/sch/htb.h + + Copyright (c) Thomas Graf + Copyright (c) Petr Gotthard + Copyright (c) Siemens AG Oesterreich + + + +lib/netfilter/log_msg.c +lib/netfilter/ct.c +include/netlink/netfilter/log_msg.h +include/netlink/netfilter/log.h +lib/netfilter/log_obj.c + + Copyright (c) Thomas Graf + Copyright (c) Philip Craig + Copyright (c) Patrick McHardy + Copyright (c) Secure Computing Corporation + + + +include/netlink/netfilter/queue_msg.h +lib/netfilter/queue_msg_obj.c +lib/netfilter/queue_msg.c +lib/netfilter/queue.c +lib/netfilter/netfilter.c +lib/netfilter/queue_obj.c +include/netlink/netfilter/netfilter.h +include/netlink/netfilter/queue.h +src/nf-queue.c + + Copyright (c) Patrick McHardy + + + +All other *.c and *.h files not mentioned above are copyright of: + + Copyright (c) 2003-2006 Thomas Graf + + +License: + +src/nl-addr-add.c +src/nl-addr-list.c +src/nl-cls-add.c +src/cls/utils.c +src/cls/cgroup.c +src/cls/utils.h +src/cls/basic.c +src/nl-addr-delete.c: + + This library is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published + by the Free Software Foundation version 2 of the License. + + This program is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. + +On Debian GNU/Linux systems, the complete text of the GNU General +Public License can be found in /usr/share/common-licenses/GPL-2 + + +All other *.c and *.h files not mentioned above: + + This library is free software; you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as published + by the Free Software Foundation version 2.1 of the License. + + This program is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. + +On Debian GNU/Linux systems, the complete text of the GNU Lesser General +Public License can be found in /usr/share/common-licenses/LGPL-2.1 + --- libnl2-2.0.orig/debian/rules +++ libnl2-2.0/debian/rules @@ -0,0 +1,12 @@ +#!/usr/bin/make -f + +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 + +DEB_DH_STRIP_ARGS := --dbg-package=libnl2-dbg +DEB_DH_MAKESHLIBS_ARGS_libnl2 := -V"libnl2 (>= $(DEB_UPSTREAM_VERSION))" + + +build/libnl2-doc:: + cd doc && $(MAKE) gendoc --- libnl2-2.0.orig/debian/control +++ libnl2-2.0/debian/control @@ -0,0 +1,58 @@ +Source: libnl2 +Section: net +Priority: optional +Maintainer: Heiko Stuebner +DM-Upload-Allowed: yes +Build-Depends: debhelper (>= 7), cdbs, doxygen, bison, flex, mscgen, graphviz +Standards-Version: 3.9.1 +Homepage: http://people.suug.ch/~tgr/libnl/ + +Package: libnl2 +Architecture: linux-any +Section: libs +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. + +Package: libnl2-dev +Architecture: linux-any +Section: libdevel +Depends: libnl2 (= ${binary:Version}), ${misc:Depends} +Conflicts: libnl-dev +Suggests: libnl2-doc +Description: development library and headers for libnl2 + 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 contains all files that are needed to build applications using + libnl2. + +Package: libnl2-dbg +Architecture: linux-any +Section: debug +Depends: libnl2 (= ${binary:Version}), ${misc:Depends} +Priority: extra +Description: debug symbols for libnl2 + 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 contains unstripped shared libraries. It is provided primarily + to provide a backtrace with names in a debugger, this makes it somewhat easier + to interpret core dumps. The libraries are installed in /usr/lib/debug and + are automatically used by gdb. + +Package: libnl2-doc +Architecture: all +Section: doc +Depends: ${misc:Depends} +Suggests: doc-base +Description: API documentation for libnl2 + 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 contains the API reference documentation for libnl2. --- libnl2-2.0.orig/debian/changelog +++ libnl2-2.0/debian/changelog @@ -0,0 +1,212 @@ +libnl2 (2.0-1~asac1) maverick; urgency=low + + * backport to maverick; attention: here is a soname breakage from 1.99 to 2.0 + + -- Alexander Sack Sat, 26 Mar 2011 19:51:42 +0100 + +libnl2 (2.0-1) unstable; urgency=low + + * New upstream release (Closes: #603765) + * Fix compilation with binutils-gold or ld --no-add-needed + (Closes: #615745) + * Update standards + * Update build dependencies - tetex-live is not necessary + anymore (Closes: #616260) + + -- Heiko Stuebner Sun, 06 Mar 2011 18:20:47 +0100 + +libnl2 (1.99+git20091216-2) unstable; urgency=low + + * add README.source describing the patches in use. + * remove libnl*-provides - libnl2 should stay sepparate + from libnl1 for now + + -- Heiko Stuebner Wed, 10 Mar 2010 18:03:35 +0100 + +libnl2 (1.99+git20091216-1) unstable; urgency=low + + * New upstream snapshot + * New source name to enable installing libnl and libnl2 side by side + * Set myself as new maintainer for libnl2 according to agreement + with Michael Biebl + * Add debug package + * README.Debian warns of possible breakage in this snapshot + * Add Patch 0001 which fixes some errors in the build system + * Add Patch 0002 which adds libnl-?? libs to linker statement + until I can resolve this with upstream + + -- Heiko Stuebner Mon, 15 Feb 2010 21:50:35 +0100 + +libnl (1.1-5) unstable; urgency=low + + * Add symbols file for libnl1. + + -- Michael Biebl Wed, 25 Feb 2009 00:26:05 +0100 + +libnl (1.1-4) unstable; urgency=low + + * debian/control + - Add ${misc:Depends} to all binary packages. + - Bump Build-Depends on debhelper to (>= 7). + * debian/compat + - Bump debhelper compat level to 7. + * debian/rules + - Include debhelper.mk before other files as recommended by the cdbs + documentation. + + -- Michael Biebl Wed, 18 Feb 2009 13:26:53 +0100 + +libnl (1.1-3) unstable; urgency=low + + * debian/control + - Bump Standards-Version to 3.8.0. + * Switch to quilt for patch management. + * Add README.source which refers to the quilt documentation. + * debian/patches/limits.patch + - Add missing include to limits.h. This is required when compiling against + glibc 2.8. Thanks to Kees Cook for the patch. Closes: #501485 + + -- Michael Biebl Wed, 08 Oct 2008 21:34:34 +0200 + +libnl (1.1-2) unstable; urgency=low + + * debian/libnl-doc.doc-base + - Register the API documentation with doc-base. + * debian/control + - Add Suggests: doc-base to libnl-doc. + + -- Michael Biebl Wed, 05 Mar 2008 00:42:54 +0100 + +libnl (1.1-1) unstable; urgency=low + + * New stable upstream release. + * debian/patches/01-ip_mg_alg_internal_only.patch + - Removed, merged upstream. + * debian/control + - Rename binary package libnl1-pre8 to libnl1. + - [libnl1] Add Conflicts/Replaces: libnl1-pre8. + - [libnl-dev] Change Depends to libnl1. + * Rename debian/libnl1-pre8.install to debian/libnl1.install + * debian/copyright + - Minor updates and additions. + + -- Michael Biebl Thu, 10 Jan 2008 16:58:12 +0100 + +libnl (1.0~pre8-1) unstable; urgency=low + + * New upstream release. Closes: #456175 + * debian/control + - Bump Standards-Version to 3.7.3. No further changes required. + - The Vcs-* fields are now officially supported, so remove the XS- prefix. + - Rename binary package libnl1-pre6 to libnl1-pre8. + - [libnl1-pre8] Add Conflicts/Replaces: libnl1-pre6. The two versions are + not coinstallable. + - [libnl-dev] Change Depends to libnl1-pre8. + * Rename debian/libnl1-pre6.install to debian/libnl1-pre8.install. + * debian/patches/10-amd64-linux-types.patch + - Removed, merged upstream. + * debian/patches/01-ip_mg_alg_internal_only.patch + - Pull a fix from upstream. The header linux/ip_mp_alg.h is no longer part + of the linux kernel headers (i.e. linux-libc-dev) so remove it from + netlink/netlink.h. + + -- Michael Biebl Thu, 20 Dec 2007 07:45:03 +0100 + +libnl (1.0~pre6-6) unstable; urgency=low + + * debian/control + - Use the new "Homepage:" field to specify the upstream URL. + - Replace deprecated ${Source-Version} substvar with ${binary:Version}. + - Change Build-Depends: gs-gpl | gs-esp to Build-Depends: ghostscript. + + -- Michael Biebl Mon, 22 Oct 2007 07:15:29 +0200 + +libnl (1.0~pre6-5) unstable; urgency=low + + * debian/control + - Add XS-Vcs-* fields. + - Replace Build-Depends: tetex-bin with texlive-latex-base. teTeX is now + gone, superseded by texlive. + - Add Build-Depends: graphviz, gs-gpl | gs-esp. + The "dot" program is needed for generating the diagram image and "gs" + for the ps to png conversion. + + -- Michael Biebl Sun, 15 Apr 2007 15:45:48 +0200 + +libnl (1.0~pre6-4) unstable; urgency=medium + + * Autobuilders do not distinguish between build-arch and build-indep, they + simply run build. So we have to move doxygen and tetex-bin from + Build-Depends-Indep to Build-Depends. Closes: #408719 + * Urgency medium, as it fixes a FTBFS bug. + + -- Michael Biebl Fri, 12 Jan 2007 11:23:52 +0100 + +libnl (1.0~pre6-3) unstable; urgency=low + + * Build and package the API documentation. Closes: #406497 + * debian/control + - Add Build-Depends-Indep on doxygen and tetex-bin (dvips). + - Add new package libnl-doc. + - Add a "Suggests: libnl-doc" to libnl-dev. + * debian/rules + - Call "make gendoc" to build the API documentation. + * debian/libnl-doc.install + - Added. List the files that should be installed. + + -- Michael Biebl Fri, 12 Jan 2007 10:30:40 +0100 + +libnl (1.0~pre6-2) unstable; urgency=low + + * Update maintainer email address to biebl@debian.org. + + -- Michael Biebl Thu, 19 Oct 2006 20:16:09 +0200 + +libnl (1.0~pre6-1) unstable; urgency=low + + * New upstream release. + * Removed 20-autoconf-dirs.patch, merged upstream. + * Updated debian/copyright, libnl is now licensed under the LGPL 2.1. + * Updated debian/watch. + + -- Michael Biebl Fri, 18 Aug 2006 00:40:34 +0200 + +libnl (1.0~pre6~svn30-1) unstable; urgency=low + + * Updated to svn revision 30. + * Bumped Standards-Version to 3.7.2, no further changes required. + * Now that dak officially supports ~ in the version number, let's make use + of it. + * Some install directories were not set correctly, 20-autoconf-dirs.patch + fixes that. + + -- Michael Biebl Thu, 10 Aug 2006 19:51:42 +0200 + +libnl (0.99+1.0.svn21-4) unstable; urgency=low + + * Do not create bogus /usr/lib/pkg-config directory. Closes: #364601 + + -- Michael Biebl Mon, 24 Apr 2006 15:40:23 +0200 + +libnl (0.99+1.0.svn21-3) unstable; urgency=low + + * Include simple-patchsys.mk in debian/rules. + * Merged debian/patches/10-amd64-linux-types.patch from Ubuntu which fixes + the FTBFS error on AMD64. Closes: #358887 + Thanks to Scott James Remnant for this patch. + + -- Michael Biebl Sat, 1 Apr 2006 04:52:13 +0200 + +libnl (0.99+1.0.svn21-2) unstable; urgency=low + + * Initial upload to unstable. + * Renamed libnl1 to libnl1-pre6 to match the currently used so-name. + Otherwise dependent packages like NM will break on upgrades of libnl. + + -- Michael Biebl Tue, 7 Mar 2006 21:22:09 +0100 + +libnl (0.99+1.0.svn21-1) experimental; urgency=low + + * Initial release. Closes: #286847 + + -- Michael Biebl Tue, 21 Feb 2006 18:36:35 +0100 --- libnl2-2.0.orig/debian/patches/0001-fix-headers.patch +++ libnl2-2.0/debian/patches/0001-fix-headers.patch @@ -0,0 +1,82 @@ +From d93a43d602c4771f1c21aaf7250906dac97ec108 Mon Sep 17 00:00:00 2001 +From: Heiko Stuebner +Date: Sun, 6 Mar 2011 15:29:34 +0100 +Subject: [PATCH] fix headers + +--- + include/Makefile.am | 14 ++++++++++++++ + include/Makefile.in | 13 +++++++++++++ + 2 files changed, 27 insertions(+), 0 deletions(-) + +diff --git a/include/Makefile.am b/include/Makefile.am +index 8815a6e..79bf090 100644 +--- a/include/Makefile.am ++++ b/include/Makefile.am +@@ -28,6 +28,10 @@ nobase_include_HEADERS = \ + netlink/netlink.h \ + netlink/object-api.h \ + netlink/object.h \ ++ netlink/route/cls/basic.h \ ++ netlink/route/cls/cgroup.h \ ++ netlink/route/cls/ematch.h \ ++ netlink/route/cls/ematch/cmp.h \ + netlink/route/cls/fw.h \ + netlink/route/cls/police.h \ + netlink/route/cls/u32.h \ +@@ -57,7 +61,17 @@ nobase_include_HEADERS = \ + netlink/route/rtnl.h \ + netlink/route/rule.h \ + netlink/route/tc.h \ ++ netlink/cli/addr.h \ ++ netlink/cli/ct.h \ ++ netlink/cli/link.h \ ++ netlink/cli/neigh.h \ ++ netlink/cli/qdisc.h \ ++ netlink/cli/route.h \ ++ netlink/cli/rule.h \ ++ netlink/cli/utils.h \ + netlink/socket.h \ + netlink/types.h \ + netlink/utils.h \ + netlink/version.h ++ ++EXTRA_DIST = linux +diff --git a/include/Makefile.in b/include/Makefile.in +index cb8efc1..dd8d018 100644 +--- a/include/Makefile.in ++++ b/include/Makefile.in +@@ -223,6 +223,10 @@ nobase_include_HEADERS = \ + netlink/netlink.h \ + netlink/object-api.h \ + netlink/object.h \ ++ netlink/route/cls/basic.h \ ++ netlink/route/cls/cgroup.h \ ++ netlink/route/cls/ematch.h \ ++ netlink/route/cls/ematch/cmp.h \ + netlink/route/cls/fw.h \ + netlink/route/cls/police.h \ + netlink/route/cls/u32.h \ +@@ -252,11 +256,20 @@ nobase_include_HEADERS = \ + netlink/route/rtnl.h \ + netlink/route/rule.h \ + netlink/route/tc.h \ ++ netlink/cli/addr.h \ ++ netlink/cli/ct.h \ ++ netlink/cli/link.h \ ++ netlink/cli/neigh.h \ ++ netlink/cli/qdisc.h \ ++ netlink/cli/route.h \ ++ netlink/cli/rule.h \ ++ netlink/cli/utils.h \ + netlink/socket.h \ + netlink/types.h \ + netlink/utils.h \ + netlink/version.h + ++EXTRA_DIST = linux + all: all-am + + .SUFFIXES: +-- +1.7.2.3 + --- libnl2-2.0.orig/debian/patches/0002-link-sub-libs.patch +++ libnl2-2.0/debian/patches/0002-link-sub-libs.patch @@ -0,0 +1,23 @@ +From 1d531582c6910387b2d1e3678bd7f80179ae6d76 Mon Sep 17 00:00:00 2001 +From: Heiko Stuebner +Date: Mon, 15 Feb 2010 20:29:17 +0100 +Subject: [PATCH] link sub-libs + +--- + libnl-2.0.pc.in | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/libnl-2.0.pc.in b/libnl-2.0.pc.in +index e44f0fb..de7954e 100644 +--- a/libnl-2.0.pc.in ++++ b/libnl-2.0.pc.in +@@ -6,5 +6,5 @@ includedir=@includedir@ + Name: libnl + Description: Convenience library for netlink sockets + Version: @PACKAGE_VERSION@ +-Libs: -L${libdir} -lnl ++Libs: -L${libdir} -lnl -lnl-route -lnl-nf -lnl-genl -lnl-cli + Cflags: -I${includedir} +-- +1.6.5 + --- libnl2-2.0.orig/debian/patches/0003-fix-compilation-with-gold.patch +++ libnl2-2.0/debian/patches/0003-fix-compilation-with-gold.patch @@ -0,0 +1,39 @@ +From 340ac02b4e5038b73f87de5dcf9ee88908611c1d Mon Sep 17 00:00:00 2001 +From: Heiko Stuebner +Date: Sun, 6 Mar 2011 15:44:37 +0100 +Subject: [PATCH] fix compilation with gold + +--- + src/Makefile.am | 2 +- + src/Makefile.in | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/Makefile.am b/src/Makefile.am +index dda32a7..f0bb9b5 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -3,7 +3,7 @@ + SUBDIRS = lib + + AM_CPPFLAGS = -Wall -I${top_srcdir}/include -I${top_builddir}/include -D_GNU_SOURCE +-AM_LDFLAGS = -L${top_builddir}/lib -L${top_builddir}/src/lib -lnl-cli ++AM_LDFLAGS = -L${top_builddir}/lib -L${top_builddir}/src/lib -lnl-cli -lnl -lnl-nf -lnl-genl -lnl-route + + noinst_PROGRAMS = \ + genl-ctrl-list \ +diff --git a/src/Makefile.in b/src/Makefile.in +index 2026b28..eb7f3db 100644 +--- a/src/Makefile.in ++++ b/src/Makefile.in +@@ -361,7 +361,7 @@ top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ + SUBDIRS = lib + AM_CPPFLAGS = -Wall -I${top_srcdir}/include -I${top_builddir}/include -D_GNU_SOURCE +-AM_LDFLAGS = -L${top_builddir}/lib -L${top_builddir}/src/lib -lnl-cli ++AM_LDFLAGS = -L${top_builddir}/lib -L${top_builddir}/src/lib -lnl-cli -lnl -lnl-nf -lnl-genl -lnl-route + genl_ctrl_list_SOURCES = genl-ctrl-list.c + genl_ctrl_list_LDADD = -lnl-genl -lnl-route + nf_ct_list_SOURCES = nf-ct-list.c +-- +1.7.2.3 +