[Glibc-bsd-commits] r5509 - in tags/freebsd-libs: . 10.1~pre1-1/debian 10.1~pre1-1/debian/patches

christoph at alioth.debian.org christoph at alioth.debian.org
Sun Aug 31 19:15:04 UTC 2014


Author: christoph
Date: 2014-08-31 19:15:04 +0000 (Sun, 31 Aug 2014)
New Revision: 5509

Added:
   tags/freebsd-libs/10.1~pre1-1/
   tags/freebsd-libs/10.1~pre1-1/debian/changelog
   tags/freebsd-libs/10.1~pre1-1/debian/control
   tags/freebsd-libs/10.1~pre1-1/debian/patches/05_libipx.diff
   tags/freebsd-libs/10.1~pre1-1/debian/patches/cdefs_macros.diff
   tags/freebsd-libs/10.1~pre1-1/debian/patches/dwarf.diff
   tags/freebsd-libs/10.1~pre1-1/debian/patches/elf.diff
   tags/freebsd-libs/10.1~pre1-1/debian/patches/kvm_size_t_kludge.diff
   tags/freebsd-libs/10.1~pre1-1/debian/patches/makefiles.diff
   tags/freebsd-libs/10.1~pre1-1/debian/patches/series
   tags/freebsd-libs/10.1~pre1-1/debian/rules
Removed:
   tags/freebsd-libs/10.1~pre1-1/debian/changelog
   tags/freebsd-libs/10.1~pre1-1/debian/control
   tags/freebsd-libs/10.1~pre1-1/debian/patches/05_libipx.diff
   tags/freebsd-libs/10.1~pre1-1/debian/patches/cdefs_macros.diff
   tags/freebsd-libs/10.1~pre1-1/debian/patches/dwarf.diff
   tags/freebsd-libs/10.1~pre1-1/debian/patches/elf.diff
   tags/freebsd-libs/10.1~pre1-1/debian/patches/kvm_size_t_kludge.diff
   tags/freebsd-libs/10.1~pre1-1/debian/patches/makefiles.diff
   tags/freebsd-libs/10.1~pre1-1/debian/patches/series
   tags/freebsd-libs/10.1~pre1-1/debian/rules
Log:
[svn-buildpackage] Tagging freebsd-libs 10.1~pre1-1

Deleted: tags/freebsd-libs/10.1~pre1-1/debian/changelog
===================================================================
--- trunk/freebsd-libs/debian/changelog	2014-08-27 21:42:18 UTC (rev 5506)
+++ tags/freebsd-libs/10.1~pre1-1/debian/changelog	2014-08-31 19:15:04 UTC (rev 5509)
@@ -1,691 +0,0 @@
-freebsd-libs (10.0-7) UNRELEASED; urgency=medium
-
-  * Add empty LIBUSB_CALL macro, to be compatible to the libusb 1.0-API
-    From upstream 10-STABLE.  Thanks, Scott Howard.  (Closes: #749157)
-
- -- Steven Chamberlain <steven at pyro.eu.org>  Sun, 13 Jul 2014 21:47:01 +0100
-
-freebsd-libs (10.0-6) unstable; urgency=medium
-
-  * Add <stdint.h> include to kvm.h to fix header buildability.
-
- -- Robert Millan <rmh at debian.org>  Thu, 22 May 2014 23:37:57 +0200
-
-freebsd-libs (10.0-5) unstable; urgency=low
-
-  * Upload to unstable.
-
- -- Robert Millan <rmh at debian.org>  Sat, 22 Mar 2014 20:39:25 +0100
-
-freebsd-libs (10.0-4) experimental; urgency=low
-
-  * libusb_handle_events_completed.diff: Cherry-pick from upstream
-    (add libusb_handle_events_completed and
-    libusb_handle_events_timeout_completed). (Closes: #738986)
-
- -- Robert Millan <rmh at debian.org>  Sat, 15 Feb 2014 15:43:59 +0100
-
-freebsd-libs (10.0-3) experimental; urgency=low
-
-  * Add missing B-D on m4.
-  * Prepare Makefile.inc to be moved into orig tarball.
-
- -- Robert Millan <rmh at debian.org>  Sat, 25 Jan 2014 23:51:42 +0100
-
-freebsd-libs (10.0-2) experimental; urgency=low
-
-  * Improve detection of FTBFS problems on foreign platforms by passing
-    __FREEBSD_GLUE_USE_EMBEDDED_HEADERS flag to freebsd-glue.
-  * Switch to bmake to follow upstream.
-  * Fix Dwarf_Off size on i386-linux-gnu.
-  * Bump freebsd-glue B-D to 0.2.18 (for PATH_MAX).
-
- -- Robert Millan <rmh at debian.org>  Fri, 24 Jan 2014 22:31:35 +0100
-
-freebsd-libs (10.0-1) experimental; urgency=low
-
-  * New upstream release.
-    - Refresh all patches.
-    - Remove missing_static_decl.diff (merged).
-    - Bump SONAME in libusb (2debian -> 3) and libkvm (0 -> 6).
-    - Update symbol list in libcam, libkvm, libusb and libutil.
-    - B-D on freebsd-mk (>= 10.0-2~) and kfreebsd-kernel-headers
-      (>= 10.0~2).
-
-  [ Robert Millan ]
-  * Fetch source code securely (https) in get-orig-source.
-  * Leave -lbsdxml untouched (latest freebsd-glue supports it).
-  * Make libipx available on all architectures.
-  * Correctly setup BSD version of MAKEFLAGS to support parallel builds.
-
- -- Robert Millan <rmh at debian.org>  Wed, 15 Jan 2014 17:40:16 +0100
-
-freebsd-libs (9.2+ds2-2) unstable; urgency=low
-
-  * Upload to unstable.
-
- -- Robert Millan <rmh at debian.org>  Sun, 01 Dec 2013 12:46:21 +0100
-
-freebsd-libs (9.2+ds2-1) experimental; urgency=low
-
-  * Add libutil.
-
- -- Robert Millan <rmh at debian.org>  Sat, 30 Nov 2013 13:10:29 +0100
-
-freebsd-libs (9.2+ds1-8) unstable; urgency=low
-
-  * Simplify 04_libkvm.diff even further.
-  * Remove gratuitous header dependencies.
-  * Remove 07_libkiconv.diff (obsolete).
-
- -- Robert Millan <rmh at debian.org>  Sat, 30 Nov 2013 13:02:31 +0100
-
-freebsd-libs (9.2+ds1-7) unstable; urgency=high
-
-  * Remove unnecessary bits from 04_libkvm.diff and 12_usb.diff.
-  * Re-add libbsd_nlist.diff. It is still required when using kvm.h in
-    an external package.  (Closes: #729536)
-
- -- Robert Millan <rmh at debian.org>  Thu, 14 Nov 2013 19:55:53 +0100
-
-freebsd-libs (9.2+ds1-6) unstable; urgency=low
-
-  * Bump freebsd-glue Build-Depends on 0.1.14.
-
- -- Robert Millan <rmh at debian.org>  Wed, 30 Oct 2013 12:34:38 +0100
-
-freebsd-libs (9.2+ds1-5) unstable; urgency=low
-
-  * Fix libelf/libdwarf buildability on GNU/Linux.
-
- -- Robert Millan <rmh at debian.org>  Mon, 28 Oct 2013 23:11:54 +0100
-
-freebsd-libs (9.2+ds1-4) unstable; urgency=low
-
-  * Exclude libelf and libdwarf from debian/rules as well...
-
- -- Robert Millan <rmh at debian.org>  Mon, 28 Oct 2013 01:43:54 +0100
-
-freebsd-libs (9.2+ds1-3) unstable; urgency=low
-
-  * Make libelf and libdwarf kfreebsd-any.
-
- -- Robert Millan <rmh at debian.org>  Sun, 27 Oct 2013 23:52:33 +0100
-
-freebsd-libs (9.2+ds1-2) unstable; urgency=low
-
-  [ Guillem Jover ]
-  * Remove myself from Uploaders.
-
-  [ Robert Millan ]
-  * Fix description for libelf packages.
-
- -- Robert Millan <rmh at debian.org>  Sun, 27 Oct 2013 22:39:49 +0100
-
-freebsd-libs (9.2+ds1-1) experimental; urgency=low
-
-  * Add libelf and libdwarf, this time changing the SONAME to avoid namespace
-    collisions.
-  * kvm_size_t_kludge.diff: Use <stddef.h> instead of unportably relying
-    on private type names.
-  * Remove libbsd_nlist.diff (obsolete).
-
- -- Robert Millan <rmh at debian.org>  Wed, 09 Oct 2013 23:21:11 +0200
-
-freebsd-libs (9.2-1) unstable; urgency=low
-
-  * New upstream release.
-    - Refresh all patches.
-    - Remove preserve_libkvm_abi.diff and no_kvm_uread_in_freebsd10.diff
-      (obsoleted by kvm_uread() re-addition in stable/9).
-    - Update symbols in libsbu6, libcam6 and libusb2debian.
-
-  [ Guillem Jover ]
-  * Create $(DESTDIR) on install-indep, otherwise dh_install with
-    --list-missing is unhappy (arguably a bug in debhelper).
-
- -- Robert Millan <rmh at debian.org>  Wed, 02 Oct 2013 23:28:58 +0200
-
-freebsd-libs (9.1+ds1-3) unstable; urgency=low
-
-  [ Petr Salinger ]
-  * extend cdefs_macros.diff in libusb.h part
-  * libusb really needs libbsd
-
-  [ Guillem Jover ]
-  * Switch to canonical Vcs URLs.
-  * Add build-indep and build-arch debian/rules targets:
-    - Rename BUILD_TARGETS to BUILD_ARCH_TARGETS.
-    - Rename build to build-arch and install to install-arch targets.
-    - Add empty build-indep target.
-    - Add build target depending on build-indep and build-arch.
-    - Split install into install-indep and install-arch targets.
-    - Switch binary-indep and binary-arch to depend on install-indep and
-      install-arch targets respectively.
-  * Now using Standards-Version 3.9.4.
-  * Add missing old symbols to libkvm0 and libsbuf6 symbols files.
-  * Add missing kvm_dpcpu_setcpu(3) man page to libkvm-dev.
-
- -- Guillem Jover <guillem at debian.org>  Thu, 25 Jul 2013 17:04:34 +0200
-
-freebsd-libs (9.1+ds1-2) unstable; urgency=low
-
-  * Bump freebsd-glue B-D (for roundup2).
-
- -- Robert Millan <rmh at debian.org>  Tue, 16 Jul 2013 15:24:27 +0200
-
-freebsd-libs (9.1+ds1-1) experimental; urgency=low
-
-  * Temporarily remove libelf and libdwarf, until namespace issues are
-    fixed.
-
- -- Robert Millan <rmh at debian.org>  Tue, 16 Jul 2013 12:17:26 +0200
-
-freebsd-libs (9.1-1) experimental; urgency=low
-
-  * New upstream release.
-    - Sync all patches.
-    - Enable __FreeBSD_version when building freebsd-libs sources.
-    - preserve_libkvm_abi.diff (and no_kvm_uread_in_freebsd10.diff):
-      Backport fix from upstream to preserve 9.0 ABI in libkvm.
-    - missing_static_decl.diff: Fix for _libdwarf_errors being exported in
-      libdwarf.
-    - Acknowledge new symbols in libusbhid4debian, libelf-freebsd-1,
-      libusb2debian and libcam6.
-
- -- Robert Millan <rmh at debian.org>  Thu, 11 Jul 2013 19:55:11 +0200
-
-freebsd-libs (9.0+ds2-1) experimental; urgency=low
-
-  * Add libelf and libdwarf.
-  * Remove debian/patches/implicit-declaration (obsoleted by
-    freebsd-glue 0.0.5).
-
- -- Robert Millan <rmh at debian.org>  Wed, 19 Jun 2013 21:49:43 +0200
-
-freebsd-libs (9.0+ds1-4) unstable; urgency=low
-
-  [ Christoph Egger ]
-  * Upload to unstable
-
-  [ Jeff Epler ]
-  * Fix 'warning: implicit declaration of function 'reallocf'
-    (and several other functions) (Closes: 685625)
-  * Make that warning an error so that it does not pass silently
-    in the future 
-
- -- Christoph Egger <christoph at debian.org>  Sat, 29 Dec 2012 15:49:19 -0800
-
-freebsd-libs (9.0+ds1-3) unstable; urgency=low
-
-  [ Robert Millan ]
-  * 04_libkvm.diff: Remove struct loadavg kludge, B-D on libc0.1-dev (>=
-    2.13-31) instead.
-  * Fix a pair of typos in debian/control.
-  * kvm_size_t_kludge.diff: Temporary kludge to define size_t (requires
-    kfreebsd-kernel-headers >= 0.81).  (Closes: #673431)
-  * Fix FTBFS with latest kfreebsd-kernel-headers.
-
-  [ Guillem Jover ]
-  * Remove Debian revisions from versions in libmemstat3, libsbuf6 and libcam6
-    symbols files.
-
- -- Robert Millan <rmh at debian.org>  Fri, 25 May 2012 18:37:58 +0200
-
-freebsd-libs (9.0+ds1-2) unstable; urgency=low
-
-  * kvm.h: Use <bsd/nlist.h> rather than <nlist.h>. (Closes: #657772)
-  * Remove redundant definitions of bsfq() and bsfl().
-  * cdefs_macros.diff: Also fix __va_list in <sys/sbuf.h>.
-
- -- Robert Millan <rmh at debian.org>  Mon, 19 Mar 2012 22:31:50 +0100
-
-freebsd-libs (9.0+ds1-1) unstable; urgency=low
-
-  [ Jérémy Bobbio ]
-  * Fix libnetgraph4 Description. (Closes: #658501)
-
-  [ Robert Millan ]
-  * libsbuf6.symbols: Remove sbuf_overflowed (it wasn't present in 9.0-1).
-  * Remove all CAM kernel headers to ensure system-wide version is used
-    instead.
-  * Require kfreebsd-kernel-headers >= 0.73 (for sys/_stdint.h).
-  * Require freebsd-buildutils >= 9.0-3. (Closes: #659913)
-
- -- Robert Millan <rmh at debian.org>  Wed, 15 Feb 2012 23:17:28 +0100
-
-freebsd-libs (9.0-1) unstable; urgency=low
-
-  * New upstream release.
-
- -- Robert Millan <rmh at debian.org>  Wed, 01 Feb 2012 21:25:30 +0100
-
-freebsd-libs (8.3~svn229725-3) unstable; urgency=low
-
-  * Remove 15_kkh_kludge.diff, depend on recent k-k-h instead.
-  * cpumask_t.diff: Workaround for removal of cpumask_t in kfreebsd-9
-    headers.
-  * cdefs_macros.diff: Replace all use of BSDish cdefs macros that
-    affect exported headers.  (Closes: #656562)
-
- -- Robert Millan <rmh at debian.org>  Sat, 21 Jan 2012 01:21:17 +0100
-
-freebsd-libs (8.3~svn229725-2) unstable; urgency=low
-
-  * Upload to unstable.
-
- -- Robert Millan <rmh at debian.org>  Sat, 14 Jan 2012 21:42:00 +0100
-
-freebsd-libs (8.3~svn229725-1) experimental; urgency=low
-
-  * New upstream snapshot.
-
- -- Robert Millan <rmh at debian.org>  Sun, 08 Jan 2012 18:42:53 +0100
-
-freebsd-libs (8.2+ds2-2) unstable; urgency=low
-
-  * Build-depend on libncurses5-dev (for libalias).
-  * Fix undefined reference to ip_next. Thanks Christoph Egger.
-    (Closes: #654581)
-
- -- Robert Millan <rmh at debian.org>  Sun, 08 Jan 2012 16:20:31 +0100
-
-freebsd-libs (8.2+ds2-1) unstable; urgency=low
-
-  * Add libalias, using patch from Christoph Egger with some adjustments.
-    (Closes: #653193)
-
- -- Robert Millan <rmh at debian.org>  Sun, 01 Jan 2012 15:37:48 +0100
-
-freebsd-libs (8.2+ds1-4) unstable; urgency=low
-
-  * Include <stdint.h> in a few more headers that use uintxx_t types.
-    (Closes: #634752)
-  * Move libsbuf.so.0 to /lib (needed by /sbin/zfs and /sbin/zpool).
-    (Closes: #637100)
-  * Move libipx.so.2 to /lib (needed by ifconfig).
-
- -- Robert Millan <rmh at debian.org>  Mon, 08 Aug 2011 14:34:50 +0000
-
-freebsd-libs (8.2+ds1-3) unstable; urgency=low
-
-  * Remove hunk to include <sys/user.h> in subr_sbuf.c, as this breaks
-    hurd-i386.
-  * Replace 14_sbuf_page_size.diff with cherry-picked
-    00_sbuf_page_size.diff from HEAD, which fixes the same problem
-    differently.
-
- -- Robert Millan <rmh at debian.org>  Sun, 03 Jul 2011 19:03:40 +0200
-
-freebsd-libs (8.2+ds1-2) unstable; urgency=low
-
-  * Replace use of __aligned() in libusb.h and libusb20_desc.h.
-    (Closes: #631544)
-  * Build-Depend on libbsd-dev everywhere, not just [kfreebsd-any]
-    (fixes FTBFS on non-kFreeBSD).
-  * 14_sbuf_page_size.diff: PAGE_SIZE is not available on all
-    platforms (fixes FTBFS on armel, ia64, powerpc, sparc).
-  * Add myself to Uploaders.
-
- -- Robert Millan <rmh at debian.org>  Sun, 26 Jun 2011 17:53:53 +0200
-
-freebsd-libs (8.2+ds1-1) unstable; urgency=low
-
-  * Bump libgeom SOVERSION from 0 to 1 and rename package libgeom0 to
-    libgeom1, due to ABI changes in ‘struct gprovider’. (Closes: #630107)
-  * Add new libjail library packages. Based on a patch by Robert Millan.
-    (Closes: #629521)
-  * Update copyright holders and years in debian/copyright.
-  * Integrate svn exports of single files into the main svn export loop.
-  * Do not build profile libraries, which we don't use anyway.
-
- -- Guillem Jover <guillem at debian.org>  Wed, 15 Jun 2011 22:48:21 +0200
-
-freebsd-libs (8.2-2) unstable; urgency=low
-
-  * Switch to use the libbsd-overlay:
-    - Bump libbsd-dev Build-Depends to (>= 0.3.0).
-    - Add pkg-config to Build-Depends.
-    - Remove some now obsolete porting code.
-  * Remove ‘XC-’ prefix from Package-Type field.
-  * Make <sys/sbuf.h> usable:
-    - Change __va_list to va_list.
-    - Include <sys/types.h> and <stdarg.h>.
-
- -- Guillem Jover <guillem at debian.org>  Wed, 08 Jun 2011 03:37:15 +0200
-
-freebsd-libs (8.2-1) unstable; urgency=low
-
-  [ Petr Salinger ]
-  * Based on FreeBSD 8.2.
-
-  [ Robert Millan ]
-  * Build libsbuf-dev on non-kFreeBSD systems.  (Closes: #602766)
-
-  [ Guillem Jover ]
-  * Now using Standards-Version 3.9.2 (no changes needed).
-  * Switch to source format “3.0 (quilt)”.
-    - Remove quilt from Build-Depends.
-    - Remove patch target in debian/rules.
-    - Remove now unneeded README.source.
-    - Refresh all patches.
-  * Add myself to Uploaders.
-  * Refactor source and tar name into SOURCE and TARNAME in debian/rules.
-  * Line-wrap CFLAGS and PMAKE variables in debian/rules.
-  * Intersperse Build-Depends description comments between the actual
-    dependencies.
-  * Set numeric user and group id to 0 for files in get-orig-source.
-  * Add symbols files for all shared libraries.
-
- -- Guillem Jover <guillem at debian.org>  Tue, 07 Jun 2011 07:43:42 +0200
-
-freebsd-libs (8.1-5) unstable; urgency=low
-
-  * libusb2: fix USB devices detection. Closes: bug#594330.
-
- -- Aurelien Jarno <aurel32 at debian.org>  Thu, 26 Aug 2010 00:29:47 +0200
-
-freebsd-libs (8.1-4) unstable; urgency=low
-
-  * Add a libsbuf0-udeb package.
-  * Add "(udeb)" to the short description of all udeb packages.
-
- -- Aurelien Jarno <aurel32 at debian.org>  Fri, 20 Aug 2010 20:01:41 +0200
-
-freebsd-libs (8.1-3) unstable; urgency=low
-
-  * Don't install libusbhid-dev link in libusb-dev.
-
- -- Aurelien Jarno <aurel32 at debian.org>  Sat, 31 Jul 2010 23:57:14 +0200
-
-freebsd-libs (8.1-2) unstable; urgency=low
-
-  [ Aurelien Jarno ]
-  * Link all libraries dynamically with each other.
-  * Don't install PIC variant of the static libraries.
-
- -- Aurelien Jarno <aurel32 at debian.org>  Fri, 30 Jul 2010 17:55:59 +0200
-
-freebsd-libs (8.1-1) unstable; urgency=low
-
-  [ Petr Salinger ]
-  * based on FreeBSD 8.1
-    drop 13_libusb-update.diff, applied upstream
-    update 09_libusbhid.diff
-
-  [ Aurelien Jarno ]
-  * Bumped Standards-Version to 3.9.1.
-  * Add a libusbhid-common package containing usb_hid_usages. Closes:
-    bug#578678.
-
- -- Aurelien Jarno <aurel32 at debian.org>  Wed, 28 Jul 2010 20:21:25 +0200
-
-freebsd-libs (8.0-5) unstable; urgency=low
-
-  [ Guillem Jover ]
-  * Use kfreebsd-any instead of explicit architecture list.
-
-  [ Aurelien Jarno ]
-  * Add libgeom0 and libipx2 udeb packages.
-
- -- Aurelien Jarno <aurel32 at debian.org>  Mon, 28 Jun 2010 23:10:06 +0200
-
-freebsd-libs (8.0-4) unstable; urgency=low
-
-  * libusb2-dev: add a libusb-1.0.so -> libusb.so symlink to make
-    configure scripts happy.
-  * Add patches/13_libusb-update.diff from upstream to update the API.
-  * Add udeb package to libusb2's shlib.
-
- -- Aurelien Jarno <aurel32 at debian.org>  Fri, 08 Jan 2010 14:17:42 +0100
-
-freebsd-libs (8.0-3) unstable; urgency=low
-
-  [ Petr Salinger ]
-  * bump build-depends on kfreebsd-kernel-headers to (>= 0.45)
-  * add libusb2 and libusb2-dev packages
-
-  [ Aurelien Jarno ]
-  * Make libusb2-dev conflict with libusb-dev.
-  * Add a libusb2-udev package.
-  * Add pkg-config files matching libusb 0.1/libusb 1.0.
-  * Add a libusb-config script matching libusb 0.1.
-  * Make libusb2-dev provides libusb-1.0-0-dev.
-
- -- Aurelien Jarno <aurel32 at debian.org>  Wed, 09 Dec 2009 02:03:24 +0100
-
-freebsd-libs (8.0-2) unstable; urgency=low
-
-  * Bump build-depends on kfreebsd-kernel-headers to (>= 0.43).
-
- -- Aurelien Jarno <aurel32 at debian.org>  Sat, 28 Nov 2009 22:42:32 +0100
-
-freebsd-libs (8.0-1) unstable; urgency=low
-
-  [ Petr Salinger ]
-  * based on FreeBSD 8.0
-  * change packages name to reflect SONAME changes:
-    - libusbhid3   -> libusbhid4
-    - libkiconv3   -> libkiconv4
-    - libdevstat6  -> libdevstat7
-  * add libmemstat3 and libmemstat-dev packages
-  * add libnetgraph4 and libnetgraph-dev packages
-
- -- Aurelien Jarno <aurel32 at debian.org>  Sat, 28 Nov 2009 10:42:15 +0100
-
-freebsd-libs (7.2-4) unstable; urgency=low
-
-  [ Aurelien Jarno ]
-  * Fix description of libgeom-dev.
-  * libkvm0: use our own copy of getbootfile().
-  * Fix dependency between lib and -dev packages.
-  * Add README.source.
-  * Bumped Standards-Version to 3.8.3.
-
-  [ Petr Salinger ]
-  * Build-depends on libc0.1-dev (>= 2.10) instead of libfreebsd-dev.
-
- -- Aurelien Jarno <aurel32 at debian.org>  Tue, 27 Oct 2009 20:44:22 +0100
-
-freebsd-libs (7.2-3) unstable; urgency=low
-
-  * Remove unnecessary linkages with libfreebsd.
-  * Bumped Standards-Version to 3.8.2 (no changes).
-
- -- Aurelien Jarno <aurel32 at debian.org>  Tue, 04 Aug 2009 08:29:46 +0200
-
-freebsd-libs (7.2-2) unstable; urgency=low
-
-  * Tighten build-depends on kfreebsd-kernel-headers.
-  * Remove n_un union workarounds.
-
- -- Aurelien Jarno <aurel32 at debian.org>  Mon, 15 Jun 2009 10:47:08 +0200
-
-freebsd-libs (7.2-1) unstable; urgency=low
-
-  [ Guillem Jover ]
-  * Use $(filter ...) instead of $(findstring ...) to extract space separated
-    options from DEB_BUILD_OPTIONS.
-  * Line wrap Build-Depends and Depends fields longer than 80 chars.
-
-  [ Petr Salinger ]
-  * based on FreeBSD 7.2
-  * add Vcs-* fields into debian/control.
-
-  [ Aurelien Jarno ]
-  * Tighten build-depends on libbsd-dev.
-  * Use SVN server instead of the deprecated CVS server in get-orig-source.
-  * Add -D'__FBSDID(string)=' to CFLAGS, drop debian/patches/00_fbsdid.diff
-
- -- Aurelien Jarno <aurel32 at debian.org>  Sat, 06 Jun 2009 22:15:03 +0200
-
-freebsd-libs (7.1-2) unstable; urgency=low
-
-  * Upload to unstable.
-  * Don't use a tar in tar build system:
-    - Remove fetch
-    - Add a get-orig-source target.
-    - Use quilt to manage patches.
-    - Remove build-depends on kfreebsd-source-7.1.
-    - Update patches accordingly.
-  * Change patch level to -p1.
-  * Fix a few bashisms in debian/rules.
-  * Fix parallel build support in debian/rules.
-  * Install more manpages.
-  * Switch to debhelper 5.
-  * Bumped Standards-Version to 3.8.1 (no changes).
-  * Update debian/copyright.
-
- -- Aurelien Jarno <aurel32 at debian.org>  Tue, 07 Apr 2009 16:59:04 +0200
-
-freebsd-libs (7.1-1) unreleased; urgency=low
-
-  [ Petr Salinger ]
-  * based on FreeBSD 7.1
-
- -- Aurelien Jarno <aurel32 at debian.org>  Mon, 05 Jan 2009 10:53:31 +0100
-
-freebsd-libs (7.0-1) unreleased; urgency=low
-
-  [ Petr Salinger ]
-  * based on FreeBSD 7.0
-  * Change packages name to reflect SONAME changes:
-    - libusbhid2   -> libusbhid3
-    - libkiconv2   -> libkiconv3
-    - libdevstat5  -> libdevstat6
-  * Make it buildable with gcc-4.2
-
-  [ Aurelien Jarno ]
-  * Don't ship useless manpages.
-  * Bumped Standards-Version to 3.8.0 (no changes).
-
- -- Aurelien Jarno <aurel32 at debian.org>  Fri, 11 Jan 2008 10:53:31 +0100
-
-freebsd-libs (6.3-1) unreleased; urgency=low
-
-  [ Petr Salinger ]
-  * based on FreeBSD 6.3
-  * new binary packages libdevstat5 and libdevstat-dev
-
-  [ Aurelien Jarno ]
-  * Bumped Standards-Version to 3.7.3 (no changes).
-  * Change ${Source-Version} into ${binary:Version}.
-  * Don't use ${shlibs:Depends} for -dev packages.
-  * Only link with needed libraries.
-
- -- Aurelien Jarno <aurel32 at debian.org>  Thu, 10 Jan 2008 18:23:48 +0100
-
-freebsd-libs (6.2-1) unreleased; urgency=low
-
-  [ Petr Salinger ]
-  * based on FreeBSD 6.2
-
- -- Aurelien Jarno <aurel32 at debian.org>  Mon, 15 Jan 2007 13:42:46 +0100
-
-freebsd-libs (6.1-2) unreleased; urgency=low
-
-  [ Petr Salinger ]
-  * revert r1694, these libraries are located in /lib/,
-    but dev symlink pointed to /usr/lib/
-    breaks many packages using libkvm-dev or libgeom-dev
-
- -- Aurelien Jarno <aurel32 at debian.org>  Tue, 28 Nov 2006 17:09:28 +0100
-
-freebsd-libs (6.1-1) unreleased; urgency=low
-
-  [ Petr Salinger ]
-  * based on FreeBSD 6.1
-
-  [ Aurelien Jarno ]
-  * Bumped Standards-Version to 3.7.2 (no changes).
-  * Change packages name to reflect SONAME changes:
-    - libusbhid1 -> libusbhid2
-    - libkiconv1 -> libkiconv2
-
- -- Aurelien Jarno <aurel32 at debian.org>  Wed, 25 Oct 2006 16:49:43 +0200
-
-freebsd-libs (5.4+1-3) UNRELEASED; urgency=low
-
-  * Add libkiconv (patch from Andraz).
-
- -- Robert Millan <rmh at aybabtu.com>  Thu,  4 May 2006 17:14:34 +0200
-
-freebsd-libs (5.4+1-2) unreleased; urgency=low
-
-  * Link libgeom with librt (to get clock_gettime).
-
- -- Robert Millan <rmh at aybabtu.com>  Wed, 19 Apr 2006 11:17:18 +0200
-
-freebsd-libs (5.4+1-1) unreleased; urgency=low
-
-  * Add libgeom.
-  * Major patch and variable cleanup/refactor to sanitise SHLIB_MAJOR and
-    SHLIBDIR overrides.
-
- -- Robert Millan <rmh at aybabtu.com>  Wed, 19 Apr 2006 10:32:23 +0200
-
-freebsd-libs (5.4-8) unreleased; urgency=low
-
-  * First build on amd64.
-  * Lots of cleanup:
-    - Remove functions that are in libfreebsd
-    - Use dynamic regexps to get rid of many patch hunks.
-    - Reenable most commented code (thanks to new functions in libfreebsd).
-
- -- Robert Millan <rmh at aybabtu.com>  Wed, 29 Mar 2006 20:38:08 +0200
-
-freebsd-libs (5.4-7) unreleased; urgency=low
-
-  * Add kfreebsd-amd64.
-  * Add missing libgdbm-dev to Build-Depends.
-  * Move shared object so /lib (unfucks freebsd-utils).
-
- -- Robert Millan <rmh at aybabtu.com>  Sat, 25 Mar 2006 21:01:49 +0100
-
-freebsd-libs (5.4-6) unreleased; urgency=low
-
-  * Added libipx.
-
- -- Aurelien Jarno <aurel32 at debian.org>  Tue, 20 Dec 2005 23:18:51 +0100
-
-freebsd-libs (5.4-5) unreleased; urgency=low
-
-  * Renamed libsrbuf to libfreebsd and added nlist.
-  * Added libkvm from old package freebsd-kvm-5.2.1. Some parts are still
-    disabled, but less than in the previous version.
-  * Ship a shared library, so that packages will benefit from improvements
-    of the library.
-
- -- Aurelien Jarno <aurel32 at debian.org>  Tue, 20 Dec 2005 20:56:06 +0100
-
-freebsd-libs (5.4-4) unreleased; urgency=low
-
-  * Bumped Standard-Versions to 3.6.2 (no changes).
-  * Improved descriptions.
-
- -- Aurelien Jarno <aurel32 at debian.org>  Tue, 20 Dec 2005 01:51:03 +0100
-
-freebsd-libs (5.4-3) unreleased; urgency=low
-
-  * libusbhid: include <bsd/bsd.h> and link with -lbsd.
-
- -- Aurelien Jarno <aurel32 at debian.org>  Sun, 18 Dec 2005 04:57:17 +0100
-
-freebsd-libs (5.4-2) unreleased; urgency=low
-
-  * Added libusbhid1 and libusbhid-dev.
-  * Updated libcam to version 5.4.
-  * Provide a copyright file.
-  * Get the necessary files directly from kfreebsd-source-5.4.
-  * Make -dev packages depends on libc0.1-dev | libc-dev.
-  * Ship some missing manpages.
-  * Build with -02.
-  * Added myself to uploaders.
-
- -- Aurelien Jarno <aurel32 at debian.org>  Sun, 18 Dec 2005 03:59:30 +0100
-
-freebsd-libs (5.4-1) unreleased; urgency=low
-
-  * Initial release.
-
- -- Robert Millan <rmh at aybabtu.com>  Fri, 12 Aug 2005 12:04:07 +0200

Copied: tags/freebsd-libs/10.1~pre1-1/debian/changelog (from rev 5508, trunk/freebsd-libs/debian/changelog)
===================================================================
--- tags/freebsd-libs/10.1~pre1-1/debian/changelog	                        (rev 0)
+++ tags/freebsd-libs/10.1~pre1-1/debian/changelog	2014-08-31 19:15:04 UTC (rev 5509)
@@ -0,0 +1,699 @@
+freebsd-libs (10.1~pre1-1) experimental; urgency=medium
+
+  * Snapshot from upstream release branch
+  * Add myself to uploaders
+
+ -- Christoph Egger <christoph at debian.org>  Sun, 31 Aug 2014 11:13:09 -0700
+
+freebsd-libs (10.0-7) unstable; urgency=medium
+
+  [ Steven Chamberlain ]
+  * Add empty LIBUSB_CALL macro, to be compatible to the libusb 1.0-API
+    From upstream 10-STABLE.  Thanks, Scott Howard.  (Closes: #749157)
+
+ -- Christoph Egger <christoph at debian.org>  Sun, 31 Aug 2014 11:11:57 -0700
+
+freebsd-libs (10.0-6) unstable; urgency=medium
+
+  * Add <stdint.h> include to kvm.h to fix header buildability.
+
+ -- Robert Millan <rmh at debian.org>  Thu, 22 May 2014 23:37:57 +0200
+
+freebsd-libs (10.0-5) unstable; urgency=low
+
+  * Upload to unstable.
+
+ -- Robert Millan <rmh at debian.org>  Sat, 22 Mar 2014 20:39:25 +0100
+
+freebsd-libs (10.0-4) experimental; urgency=low
+
+  * libusb_handle_events_completed.diff: Cherry-pick from upstream
+    (add libusb_handle_events_completed and
+    libusb_handle_events_timeout_completed). (Closes: #738986)
+
+ -- Robert Millan <rmh at debian.org>  Sat, 15 Feb 2014 15:43:59 +0100
+
+freebsd-libs (10.0-3) experimental; urgency=low
+
+  * Add missing B-D on m4.
+  * Prepare Makefile.inc to be moved into orig tarball.
+
+ -- Robert Millan <rmh at debian.org>  Sat, 25 Jan 2014 23:51:42 +0100
+
+freebsd-libs (10.0-2) experimental; urgency=low
+
+  * Improve detection of FTBFS problems on foreign platforms by passing
+    __FREEBSD_GLUE_USE_EMBEDDED_HEADERS flag to freebsd-glue.
+  * Switch to bmake to follow upstream.
+  * Fix Dwarf_Off size on i386-linux-gnu.
+  * Bump freebsd-glue B-D to 0.2.18 (for PATH_MAX).
+
+ -- Robert Millan <rmh at debian.org>  Fri, 24 Jan 2014 22:31:35 +0100
+
+freebsd-libs (10.0-1) experimental; urgency=low
+
+  * New upstream release.
+    - Refresh all patches.
+    - Remove missing_static_decl.diff (merged).
+    - Bump SONAME in libusb (2debian -> 3) and libkvm (0 -> 6).
+    - Update symbol list in libcam, libkvm, libusb and libutil.
+    - B-D on freebsd-mk (>= 10.0-2~) and kfreebsd-kernel-headers
+      (>= 10.0~2).
+
+  [ Robert Millan ]
+  * Fetch source code securely (https) in get-orig-source.
+  * Leave -lbsdxml untouched (latest freebsd-glue supports it).
+  * Make libipx available on all architectures.
+  * Correctly setup BSD version of MAKEFLAGS to support parallel builds.
+
+ -- Robert Millan <rmh at debian.org>  Wed, 15 Jan 2014 17:40:16 +0100
+
+freebsd-libs (9.2+ds2-2) unstable; urgency=low
+
+  * Upload to unstable.
+
+ -- Robert Millan <rmh at debian.org>  Sun, 01 Dec 2013 12:46:21 +0100
+
+freebsd-libs (9.2+ds2-1) experimental; urgency=low
+
+  * Add libutil.
+
+ -- Robert Millan <rmh at debian.org>  Sat, 30 Nov 2013 13:10:29 +0100
+
+freebsd-libs (9.2+ds1-8) unstable; urgency=low
+
+  * Simplify 04_libkvm.diff even further.
+  * Remove gratuitous header dependencies.
+  * Remove 07_libkiconv.diff (obsolete).
+
+ -- Robert Millan <rmh at debian.org>  Sat, 30 Nov 2013 13:02:31 +0100
+
+freebsd-libs (9.2+ds1-7) unstable; urgency=high
+
+  * Remove unnecessary bits from 04_libkvm.diff and 12_usb.diff.
+  * Re-add libbsd_nlist.diff. It is still required when using kvm.h in
+    an external package.  (Closes: #729536)
+
+ -- Robert Millan <rmh at debian.org>  Thu, 14 Nov 2013 19:55:53 +0100
+
+freebsd-libs (9.2+ds1-6) unstable; urgency=low
+
+  * Bump freebsd-glue Build-Depends on 0.1.14.
+
+ -- Robert Millan <rmh at debian.org>  Wed, 30 Oct 2013 12:34:38 +0100
+
+freebsd-libs (9.2+ds1-5) unstable; urgency=low
+
+  * Fix libelf/libdwarf buildability on GNU/Linux.
+
+ -- Robert Millan <rmh at debian.org>  Mon, 28 Oct 2013 23:11:54 +0100
+
+freebsd-libs (9.2+ds1-4) unstable; urgency=low
+
+  * Exclude libelf and libdwarf from debian/rules as well...
+
+ -- Robert Millan <rmh at debian.org>  Mon, 28 Oct 2013 01:43:54 +0100
+
+freebsd-libs (9.2+ds1-3) unstable; urgency=low
+
+  * Make libelf and libdwarf kfreebsd-any.
+
+ -- Robert Millan <rmh at debian.org>  Sun, 27 Oct 2013 23:52:33 +0100
+
+freebsd-libs (9.2+ds1-2) unstable; urgency=low
+
+  [ Guillem Jover ]
+  * Remove myself from Uploaders.
+
+  [ Robert Millan ]
+  * Fix description for libelf packages.
+
+ -- Robert Millan <rmh at debian.org>  Sun, 27 Oct 2013 22:39:49 +0100
+
+freebsd-libs (9.2+ds1-1) experimental; urgency=low
+
+  * Add libelf and libdwarf, this time changing the SONAME to avoid namespace
+    collisions.
+  * kvm_size_t_kludge.diff: Use <stddef.h> instead of unportably relying
+    on private type names.
+  * Remove libbsd_nlist.diff (obsolete).
+
+ -- Robert Millan <rmh at debian.org>  Wed, 09 Oct 2013 23:21:11 +0200
+
+freebsd-libs (9.2-1) unstable; urgency=low
+
+  * New upstream release.
+    - Refresh all patches.
+    - Remove preserve_libkvm_abi.diff and no_kvm_uread_in_freebsd10.diff
+      (obsoleted by kvm_uread() re-addition in stable/9).
+    - Update symbols in libsbu6, libcam6 and libusb2debian.
+
+  [ Guillem Jover ]
+  * Create $(DESTDIR) on install-indep, otherwise dh_install with
+    --list-missing is unhappy (arguably a bug in debhelper).
+
+ -- Robert Millan <rmh at debian.org>  Wed, 02 Oct 2013 23:28:58 +0200
+
+freebsd-libs (9.1+ds1-3) unstable; urgency=low
+
+  [ Petr Salinger ]
+  * extend cdefs_macros.diff in libusb.h part
+  * libusb really needs libbsd
+
+  [ Guillem Jover ]
+  * Switch to canonical Vcs URLs.
+  * Add build-indep and build-arch debian/rules targets:
+    - Rename BUILD_TARGETS to BUILD_ARCH_TARGETS.
+    - Rename build to build-arch and install to install-arch targets.
+    - Add empty build-indep target.
+    - Add build target depending on build-indep and build-arch.
+    - Split install into install-indep and install-arch targets.
+    - Switch binary-indep and binary-arch to depend on install-indep and
+      install-arch targets respectively.
+  * Now using Standards-Version 3.9.4.
+  * Add missing old symbols to libkvm0 and libsbuf6 symbols files.
+  * Add missing kvm_dpcpu_setcpu(3) man page to libkvm-dev.
+
+ -- Guillem Jover <guillem at debian.org>  Thu, 25 Jul 2013 17:04:34 +0200
+
+freebsd-libs (9.1+ds1-2) unstable; urgency=low
+
+  * Bump freebsd-glue B-D (for roundup2).
+
+ -- Robert Millan <rmh at debian.org>  Tue, 16 Jul 2013 15:24:27 +0200
+
+freebsd-libs (9.1+ds1-1) experimental; urgency=low
+
+  * Temporarily remove libelf and libdwarf, until namespace issues are
+    fixed.
+
+ -- Robert Millan <rmh at debian.org>  Tue, 16 Jul 2013 12:17:26 +0200
+
+freebsd-libs (9.1-1) experimental; urgency=low
+
+  * New upstream release.
+    - Sync all patches.
+    - Enable __FreeBSD_version when building freebsd-libs sources.
+    - preserve_libkvm_abi.diff (and no_kvm_uread_in_freebsd10.diff):
+      Backport fix from upstream to preserve 9.0 ABI in libkvm.
+    - missing_static_decl.diff: Fix for _libdwarf_errors being exported in
+      libdwarf.
+    - Acknowledge new symbols in libusbhid4debian, libelf-freebsd-1,
+      libusb2debian and libcam6.
+
+ -- Robert Millan <rmh at debian.org>  Thu, 11 Jul 2013 19:55:11 +0200
+
+freebsd-libs (9.0+ds2-1) experimental; urgency=low
+
+  * Add libelf and libdwarf.
+  * Remove debian/patches/implicit-declaration (obsoleted by
+    freebsd-glue 0.0.5).
+
+ -- Robert Millan <rmh at debian.org>  Wed, 19 Jun 2013 21:49:43 +0200
+
+freebsd-libs (9.0+ds1-4) unstable; urgency=low
+
+  [ Christoph Egger ]
+  * Upload to unstable
+
+  [ Jeff Epler ]
+  * Fix 'warning: implicit declaration of function 'reallocf'
+    (and several other functions) (Closes: 685625)
+  * Make that warning an error so that it does not pass silently
+    in the future 
+
+ -- Christoph Egger <christoph at debian.org>  Sat, 29 Dec 2012 15:49:19 -0800
+
+freebsd-libs (9.0+ds1-3) unstable; urgency=low
+
+  [ Robert Millan ]
+  * 04_libkvm.diff: Remove struct loadavg kludge, B-D on libc0.1-dev (>=
+    2.13-31) instead.
+  * Fix a pair of typos in debian/control.
+  * kvm_size_t_kludge.diff: Temporary kludge to define size_t (requires
+    kfreebsd-kernel-headers >= 0.81).  (Closes: #673431)
+  * Fix FTBFS with latest kfreebsd-kernel-headers.
+
+  [ Guillem Jover ]
+  * Remove Debian revisions from versions in libmemstat3, libsbuf6 and libcam6
+    symbols files.
+
+ -- Robert Millan <rmh at debian.org>  Fri, 25 May 2012 18:37:58 +0200
+
+freebsd-libs (9.0+ds1-2) unstable; urgency=low
+
+  * kvm.h: Use <bsd/nlist.h> rather than <nlist.h>. (Closes: #657772)
+  * Remove redundant definitions of bsfq() and bsfl().
+  * cdefs_macros.diff: Also fix __va_list in <sys/sbuf.h>.
+
+ -- Robert Millan <rmh at debian.org>  Mon, 19 Mar 2012 22:31:50 +0100
+
+freebsd-libs (9.0+ds1-1) unstable; urgency=low
+
+  [ Jérémy Bobbio ]
+  * Fix libnetgraph4 Description. (Closes: #658501)
+
+  [ Robert Millan ]
+  * libsbuf6.symbols: Remove sbuf_overflowed (it wasn't present in 9.0-1).
+  * Remove all CAM kernel headers to ensure system-wide version is used
+    instead.
+  * Require kfreebsd-kernel-headers >= 0.73 (for sys/_stdint.h).
+  * Require freebsd-buildutils >= 9.0-3. (Closes: #659913)
+
+ -- Robert Millan <rmh at debian.org>  Wed, 15 Feb 2012 23:17:28 +0100
+
+freebsd-libs (9.0-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Robert Millan <rmh at debian.org>  Wed, 01 Feb 2012 21:25:30 +0100
+
+freebsd-libs (8.3~svn229725-3) unstable; urgency=low
+
+  * Remove 15_kkh_kludge.diff, depend on recent k-k-h instead.
+  * cpumask_t.diff: Workaround for removal of cpumask_t in kfreebsd-9
+    headers.
+  * cdefs_macros.diff: Replace all use of BSDish cdefs macros that
+    affect exported headers.  (Closes: #656562)
+
+ -- Robert Millan <rmh at debian.org>  Sat, 21 Jan 2012 01:21:17 +0100
+
+freebsd-libs (8.3~svn229725-2) unstable; urgency=low
+
+  * Upload to unstable.
+
+ -- Robert Millan <rmh at debian.org>  Sat, 14 Jan 2012 21:42:00 +0100
+
+freebsd-libs (8.3~svn229725-1) experimental; urgency=low
+
+  * New upstream snapshot.
+
+ -- Robert Millan <rmh at debian.org>  Sun, 08 Jan 2012 18:42:53 +0100
+
+freebsd-libs (8.2+ds2-2) unstable; urgency=low
+
+  * Build-depend on libncurses5-dev (for libalias).
+  * Fix undefined reference to ip_next. Thanks Christoph Egger.
+    (Closes: #654581)
+
+ -- Robert Millan <rmh at debian.org>  Sun, 08 Jan 2012 16:20:31 +0100
+
+freebsd-libs (8.2+ds2-1) unstable; urgency=low
+
+  * Add libalias, using patch from Christoph Egger with some adjustments.
+    (Closes: #653193)
+
+ -- Robert Millan <rmh at debian.org>  Sun, 01 Jan 2012 15:37:48 +0100
+
+freebsd-libs (8.2+ds1-4) unstable; urgency=low
+
+  * Include <stdint.h> in a few more headers that use uintxx_t types.
+    (Closes: #634752)
+  * Move libsbuf.so.0 to /lib (needed by /sbin/zfs and /sbin/zpool).
+    (Closes: #637100)
+  * Move libipx.so.2 to /lib (needed by ifconfig).
+
+ -- Robert Millan <rmh at debian.org>  Mon, 08 Aug 2011 14:34:50 +0000
+
+freebsd-libs (8.2+ds1-3) unstable; urgency=low
+
+  * Remove hunk to include <sys/user.h> in subr_sbuf.c, as this breaks
+    hurd-i386.
+  * Replace 14_sbuf_page_size.diff with cherry-picked
+    00_sbuf_page_size.diff from HEAD, which fixes the same problem
+    differently.
+
+ -- Robert Millan <rmh at debian.org>  Sun, 03 Jul 2011 19:03:40 +0200
+
+freebsd-libs (8.2+ds1-2) unstable; urgency=low
+
+  * Replace use of __aligned() in libusb.h and libusb20_desc.h.
+    (Closes: #631544)
+  * Build-Depend on libbsd-dev everywhere, not just [kfreebsd-any]
+    (fixes FTBFS on non-kFreeBSD).
+  * 14_sbuf_page_size.diff: PAGE_SIZE is not available on all
+    platforms (fixes FTBFS on armel, ia64, powerpc, sparc).
+  * Add myself to Uploaders.
+
+ -- Robert Millan <rmh at debian.org>  Sun, 26 Jun 2011 17:53:53 +0200
+
+freebsd-libs (8.2+ds1-1) unstable; urgency=low
+
+  * Bump libgeom SOVERSION from 0 to 1 and rename package libgeom0 to
+    libgeom1, due to ABI changes in ‘struct gprovider’. (Closes: #630107)
+  * Add new libjail library packages. Based on a patch by Robert Millan.
+    (Closes: #629521)
+  * Update copyright holders and years in debian/copyright.
+  * Integrate svn exports of single files into the main svn export loop.
+  * Do not build profile libraries, which we don't use anyway.
+
+ -- Guillem Jover <guillem at debian.org>  Wed, 15 Jun 2011 22:48:21 +0200
+
+freebsd-libs (8.2-2) unstable; urgency=low
+
+  * Switch to use the libbsd-overlay:
+    - Bump libbsd-dev Build-Depends to (>= 0.3.0).
+    - Add pkg-config to Build-Depends.
+    - Remove some now obsolete porting code.
+  * Remove ‘XC-’ prefix from Package-Type field.
+  * Make <sys/sbuf.h> usable:
+    - Change __va_list to va_list.
+    - Include <sys/types.h> and <stdarg.h>.
+
+ -- Guillem Jover <guillem at debian.org>  Wed, 08 Jun 2011 03:37:15 +0200
+
+freebsd-libs (8.2-1) unstable; urgency=low
+
+  [ Petr Salinger ]
+  * Based on FreeBSD 8.2.
+
+  [ Robert Millan ]
+  * Build libsbuf-dev on non-kFreeBSD systems.  (Closes: #602766)
+
+  [ Guillem Jover ]
+  * Now using Standards-Version 3.9.2 (no changes needed).
+  * Switch to source format “3.0 (quilt)”.
+    - Remove quilt from Build-Depends.
+    - Remove patch target in debian/rules.
+    - Remove now unneeded README.source.
+    - Refresh all patches.
+  * Add myself to Uploaders.
+  * Refactor source and tar name into SOURCE and TARNAME in debian/rules.
+  * Line-wrap CFLAGS and PMAKE variables in debian/rules.
+  * Intersperse Build-Depends description comments between the actual
+    dependencies.
+  * Set numeric user and group id to 0 for files in get-orig-source.
+  * Add symbols files for all shared libraries.
+
+ -- Guillem Jover <guillem at debian.org>  Tue, 07 Jun 2011 07:43:42 +0200
+
+freebsd-libs (8.1-5) unstable; urgency=low
+
+  * libusb2: fix USB devices detection. Closes: bug#594330.
+
+ -- Aurelien Jarno <aurel32 at debian.org>  Thu, 26 Aug 2010 00:29:47 +0200
+
+freebsd-libs (8.1-4) unstable; urgency=low
+
+  * Add a libsbuf0-udeb package.
+  * Add "(udeb)" to the short description of all udeb packages.
+
+ -- Aurelien Jarno <aurel32 at debian.org>  Fri, 20 Aug 2010 20:01:41 +0200
+
+freebsd-libs (8.1-3) unstable; urgency=low
+
+  * Don't install libusbhid-dev link in libusb-dev.
+
+ -- Aurelien Jarno <aurel32 at debian.org>  Sat, 31 Jul 2010 23:57:14 +0200
+
+freebsd-libs (8.1-2) unstable; urgency=low
+
+  [ Aurelien Jarno ]
+  * Link all libraries dynamically with each other.
+  * Don't install PIC variant of the static libraries.
+
+ -- Aurelien Jarno <aurel32 at debian.org>  Fri, 30 Jul 2010 17:55:59 +0200
+
+freebsd-libs (8.1-1) unstable; urgency=low
+
+  [ Petr Salinger ]
+  * based on FreeBSD 8.1
+    drop 13_libusb-update.diff, applied upstream
+    update 09_libusbhid.diff
+
+  [ Aurelien Jarno ]
+  * Bumped Standards-Version to 3.9.1.
+  * Add a libusbhid-common package containing usb_hid_usages. Closes:
+    bug#578678.
+
+ -- Aurelien Jarno <aurel32 at debian.org>  Wed, 28 Jul 2010 20:21:25 +0200
+
+freebsd-libs (8.0-5) unstable; urgency=low
+
+  [ Guillem Jover ]
+  * Use kfreebsd-any instead of explicit architecture list.
+
+  [ Aurelien Jarno ]
+  * Add libgeom0 and libipx2 udeb packages.
+
+ -- Aurelien Jarno <aurel32 at debian.org>  Mon, 28 Jun 2010 23:10:06 +0200
+
+freebsd-libs (8.0-4) unstable; urgency=low
+
+  * libusb2-dev: add a libusb-1.0.so -> libusb.so symlink to make
+    configure scripts happy.
+  * Add patches/13_libusb-update.diff from upstream to update the API.
+  * Add udeb package to libusb2's shlib.
+
+ -- Aurelien Jarno <aurel32 at debian.org>  Fri, 08 Jan 2010 14:17:42 +0100
+
+freebsd-libs (8.0-3) unstable; urgency=low
+
+  [ Petr Salinger ]
+  * bump build-depends on kfreebsd-kernel-headers to (>= 0.45)
+  * add libusb2 and libusb2-dev packages
+
+  [ Aurelien Jarno ]
+  * Make libusb2-dev conflict with libusb-dev.
+  * Add a libusb2-udev package.
+  * Add pkg-config files matching libusb 0.1/libusb 1.0.
+  * Add a libusb-config script matching libusb 0.1.
+  * Make libusb2-dev provides libusb-1.0-0-dev.
+
+ -- Aurelien Jarno <aurel32 at debian.org>  Wed, 09 Dec 2009 02:03:24 +0100
+
+freebsd-libs (8.0-2) unstable; urgency=low
+
+  * Bump build-depends on kfreebsd-kernel-headers to (>= 0.43).
+
+ -- Aurelien Jarno <aurel32 at debian.org>  Sat, 28 Nov 2009 22:42:32 +0100
+
+freebsd-libs (8.0-1) unstable; urgency=low
+
+  [ Petr Salinger ]
+  * based on FreeBSD 8.0
+  * change packages name to reflect SONAME changes:
+    - libusbhid3   -> libusbhid4
+    - libkiconv3   -> libkiconv4
+    - libdevstat6  -> libdevstat7
+  * add libmemstat3 and libmemstat-dev packages
+  * add libnetgraph4 and libnetgraph-dev packages
+
+ -- Aurelien Jarno <aurel32 at debian.org>  Sat, 28 Nov 2009 10:42:15 +0100
+
+freebsd-libs (7.2-4) unstable; urgency=low
+
+  [ Aurelien Jarno ]
+  * Fix description of libgeom-dev.
+  * libkvm0: use our own copy of getbootfile().
+  * Fix dependency between lib and -dev packages.
+  * Add README.source.
+  * Bumped Standards-Version to 3.8.3.
+
+  [ Petr Salinger ]
+  * Build-depends on libc0.1-dev (>= 2.10) instead of libfreebsd-dev.
+
+ -- Aurelien Jarno <aurel32 at debian.org>  Tue, 27 Oct 2009 20:44:22 +0100
+
+freebsd-libs (7.2-3) unstable; urgency=low
+
+  * Remove unnecessary linkages with libfreebsd.
+  * Bumped Standards-Version to 3.8.2 (no changes).
+
+ -- Aurelien Jarno <aurel32 at debian.org>  Tue, 04 Aug 2009 08:29:46 +0200
+
+freebsd-libs (7.2-2) unstable; urgency=low
+
+  * Tighten build-depends on kfreebsd-kernel-headers.
+  * Remove n_un union workarounds.
+
+ -- Aurelien Jarno <aurel32 at debian.org>  Mon, 15 Jun 2009 10:47:08 +0200
+
+freebsd-libs (7.2-1) unstable; urgency=low
+
+  [ Guillem Jover ]
+  * Use $(filter ...) instead of $(findstring ...) to extract space separated
+    options from DEB_BUILD_OPTIONS.
+  * Line wrap Build-Depends and Depends fields longer than 80 chars.
+
+  [ Petr Salinger ]
+  * based on FreeBSD 7.2
+  * add Vcs-* fields into debian/control.
+
+  [ Aurelien Jarno ]
+  * Tighten build-depends on libbsd-dev.
+  * Use SVN server instead of the deprecated CVS server in get-orig-source.
+  * Add -D'__FBSDID(string)=' to CFLAGS, drop debian/patches/00_fbsdid.diff
+
+ -- Aurelien Jarno <aurel32 at debian.org>  Sat, 06 Jun 2009 22:15:03 +0200
+
+freebsd-libs (7.1-2) unstable; urgency=low
+
+  * Upload to unstable.
+  * Don't use a tar in tar build system:
+    - Remove fetch
+    - Add a get-orig-source target.
+    - Use quilt to manage patches.
+    - Remove build-depends on kfreebsd-source-7.1.
+    - Update patches accordingly.
+  * Change patch level to -p1.
+  * Fix a few bashisms in debian/rules.
+  * Fix parallel build support in debian/rules.
+  * Install more manpages.
+  * Switch to debhelper 5.
+  * Bumped Standards-Version to 3.8.1 (no changes).
+  * Update debian/copyright.
+
+ -- Aurelien Jarno <aurel32 at debian.org>  Tue, 07 Apr 2009 16:59:04 +0200
+
+freebsd-libs (7.1-1) unreleased; urgency=low
+
+  [ Petr Salinger ]
+  * based on FreeBSD 7.1
+
+ -- Aurelien Jarno <aurel32 at debian.org>  Mon, 05 Jan 2009 10:53:31 +0100
+
+freebsd-libs (7.0-1) unreleased; urgency=low
+
+  [ Petr Salinger ]
+  * based on FreeBSD 7.0
+  * Change packages name to reflect SONAME changes:
+    - libusbhid2   -> libusbhid3
+    - libkiconv2   -> libkiconv3
+    - libdevstat5  -> libdevstat6
+  * Make it buildable with gcc-4.2
+
+  [ Aurelien Jarno ]
+  * Don't ship useless manpages.
+  * Bumped Standards-Version to 3.8.0 (no changes).
+
+ -- Aurelien Jarno <aurel32 at debian.org>  Fri, 11 Jan 2008 10:53:31 +0100
+
+freebsd-libs (6.3-1) unreleased; urgency=low
+
+  [ Petr Salinger ]
+  * based on FreeBSD 6.3
+  * new binary packages libdevstat5 and libdevstat-dev
+
+  [ Aurelien Jarno ]
+  * Bumped Standards-Version to 3.7.3 (no changes).
+  * Change ${Source-Version} into ${binary:Version}.
+  * Don't use ${shlibs:Depends} for -dev packages.
+  * Only link with needed libraries.
+
+ -- Aurelien Jarno <aurel32 at debian.org>  Thu, 10 Jan 2008 18:23:48 +0100
+
+freebsd-libs (6.2-1) unreleased; urgency=low
+
+  [ Petr Salinger ]
+  * based on FreeBSD 6.2
+
+ -- Aurelien Jarno <aurel32 at debian.org>  Mon, 15 Jan 2007 13:42:46 +0100
+
+freebsd-libs (6.1-2) unreleased; urgency=low
+
+  [ Petr Salinger ]
+  * revert r1694, these libraries are located in /lib/,
+    but dev symlink pointed to /usr/lib/
+    breaks many packages using libkvm-dev or libgeom-dev
+
+ -- Aurelien Jarno <aurel32 at debian.org>  Tue, 28 Nov 2006 17:09:28 +0100
+
+freebsd-libs (6.1-1) unreleased; urgency=low
+
+  [ Petr Salinger ]
+  * based on FreeBSD 6.1
+
+  [ Aurelien Jarno ]
+  * Bumped Standards-Version to 3.7.2 (no changes).
+  * Change packages name to reflect SONAME changes:
+    - libusbhid1 -> libusbhid2
+    - libkiconv1 -> libkiconv2
+
+ -- Aurelien Jarno <aurel32 at debian.org>  Wed, 25 Oct 2006 16:49:43 +0200
+
+freebsd-libs (5.4+1-3) UNRELEASED; urgency=low
+
+  * Add libkiconv (patch from Andraz).
+
+ -- Robert Millan <rmh at aybabtu.com>  Thu,  4 May 2006 17:14:34 +0200
+
+freebsd-libs (5.4+1-2) unreleased; urgency=low
+
+  * Link libgeom with librt (to get clock_gettime).
+
+ -- Robert Millan <rmh at aybabtu.com>  Wed, 19 Apr 2006 11:17:18 +0200
+
+freebsd-libs (5.4+1-1) unreleased; urgency=low
+
+  * Add libgeom.
+  * Major patch and variable cleanup/refactor to sanitise SHLIB_MAJOR and
+    SHLIBDIR overrides.
+
+ -- Robert Millan <rmh at aybabtu.com>  Wed, 19 Apr 2006 10:32:23 +0200
+
+freebsd-libs (5.4-8) unreleased; urgency=low
+
+  * First build on amd64.
+  * Lots of cleanup:
+    - Remove functions that are in libfreebsd
+    - Use dynamic regexps to get rid of many patch hunks.
+    - Reenable most commented code (thanks to new functions in libfreebsd).
+
+ -- Robert Millan <rmh at aybabtu.com>  Wed, 29 Mar 2006 20:38:08 +0200
+
+freebsd-libs (5.4-7) unreleased; urgency=low
+
+  * Add kfreebsd-amd64.
+  * Add missing libgdbm-dev to Build-Depends.
+  * Move shared object so /lib (unfucks freebsd-utils).
+
+ -- Robert Millan <rmh at aybabtu.com>  Sat, 25 Mar 2006 21:01:49 +0100
+
+freebsd-libs (5.4-6) unreleased; urgency=low
+
+  * Added libipx.
+
+ -- Aurelien Jarno <aurel32 at debian.org>  Tue, 20 Dec 2005 23:18:51 +0100
+
+freebsd-libs (5.4-5) unreleased; urgency=low
+
+  * Renamed libsrbuf to libfreebsd and added nlist.
+  * Added libkvm from old package freebsd-kvm-5.2.1. Some parts are still
+    disabled, but less than in the previous version.
+  * Ship a shared library, so that packages will benefit from improvements
+    of the library.
+
+ -- Aurelien Jarno <aurel32 at debian.org>  Tue, 20 Dec 2005 20:56:06 +0100
+
+freebsd-libs (5.4-4) unreleased; urgency=low
+
+  * Bumped Standard-Versions to 3.6.2 (no changes).
+  * Improved descriptions.
+
+ -- Aurelien Jarno <aurel32 at debian.org>  Tue, 20 Dec 2005 01:51:03 +0100
+
+freebsd-libs (5.4-3) unreleased; urgency=low
+
+  * libusbhid: include <bsd/bsd.h> and link with -lbsd.
+
+ -- Aurelien Jarno <aurel32 at debian.org>  Sun, 18 Dec 2005 04:57:17 +0100
+
+freebsd-libs (5.4-2) unreleased; urgency=low
+
+  * Added libusbhid1 and libusbhid-dev.
+  * Updated libcam to version 5.4.
+  * Provide a copyright file.
+  * Get the necessary files directly from kfreebsd-source-5.4.
+  * Make -dev packages depends on libc0.1-dev | libc-dev.
+  * Ship some missing manpages.
+  * Build with -02.
+  * Added myself to uploaders.
+
+ -- Aurelien Jarno <aurel32 at debian.org>  Sun, 18 Dec 2005 03:59:30 +0100
+
+freebsd-libs (5.4-1) unreleased; urgency=low
+
+  * Initial release.
+
+ -- Robert Millan <rmh at aybabtu.com>  Fri, 12 Aug 2005 12:04:07 +0200

Deleted: tags/freebsd-libs/10.1~pre1-1/debian/control
===================================================================
--- trunk/freebsd-libs/debian/control	2014-08-27 21:42:18 UTC (rev 5506)
+++ tags/freebsd-libs/10.1~pre1-1/debian/control	2014-08-31 19:15:04 UTC (rev 5509)
@@ -1,331 +0,0 @@
-Source: freebsd-libs
-Section: libs
-Priority: optional
-Maintainer: GNU/kFreeBSD Maintainers <debian-bsd at lists.debian.org>
-Uploaders: Aurelien Jarno <aurel32 at debian.org>, Robert Millan <rmh at debian.org>
-Build-Depends: debhelper (>= 7), pkg-config,
- bmake (>= 20131001-4~),
- m4,
- freebsd-mk (>= 10.0-2~),
- libbsd-dev (>= 0.3.0),
- libc0.1-dev (>= 2.13-31) [kfreebsd-any],
- libgdbm-dev [kfreebsd-any],
- kfreebsd-kernel-headers (>= 10.0~2) [kfreebsd-any],
-# libexpat-dev: aka bsdxml. needed by libgeom
- libexpat-dev [kfreebsd-any],
-# libncurses5-dev: needed by libalias
- libncurses5-dev [kfreebsd-any],
- freebsd-glue (>= 0.2.18~),
-Vcs-Browser: http://anonscm.debian.org/viewvc/glibc-bsd/trunk/freebsd-libs/
-Vcs-Svn: svn://anonscm.debian.org/glibc-bsd/trunk/freebsd-libs/
-Standards-Version: 3.9.4
-
-Package: libsbuf6
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: FreeBSD string buffer library
- This library provides a way to handle string buffers. It contains
- numerous functions such as append, copy, cat, print, trim whitespace
- characters, etc.
-
-Package: libsbuf6-udeb
-Package-Type: udeb
-Section: debian-installer
-Architecture: kfreebsd-any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: FreeBSD string buffer library (udeb)
- This library provides a way to handle string buffers. It contains
- numerous functions such as append, copy, cat, print, trim whitespace
- characters, etc.
- .
- This is a minimal package for use in debian-installer.
-
-Package: libsbuf-dev
-Section: libdevel
-Architecture: any
-Depends: libsbuf6 (= ${binary:Version}), ${misc:Depends}, libc0.1-dev | libc-dev
-Replaces: kfreebsd-kernel-headers
-Description: Development files for libsbuf
- This package contains the header files and static library needed to
- compile applications that use libsbuf.
-
-Package: libdwarf-freebsd-3
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: library to consume and produce DWARF debug information (FreeBSD version)
- The libdwarf package provides a shared library which allows reading/consumer
- and writing/producer of DWARF debugging information from object files, shared
- libraries, and executables.
-
-Package: libdwarf-freebsd-dev
-Section: libdevel
-Architecture: any
-Depends: libdwarf-freebsd-3 (= ${binary:Version}), ${misc:Depends}, libc0.1-dev | libc-dev,
- libelf-freebsd-dev,
-Conflicts: libdwarf-dev
-Description: Development files for libdwarf (FreeBSD version)
- This package contains the header files and static library needed to
- compile applications that use libdwarf.
-
-Package: libelf-freebsd-1
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: library to read and write ELF files
- The libelf package provides a shared library which allows reading and
- writing ELF files on a high level.
-
-Package: libelf-freebsd-dev
-Section: libdevel
-Architecture: any
-Depends: libelf-freebsd-1 (= ${binary:Version}), ${misc:Depends}, libc0.1-dev | libc-dev
-Conflicts: libelf-dev, libelfg0-dev
-Description: Development files for libelf (FreeBSD version)
- This package contains the header files and static library needed to
- compile applications that use libelf.
-
-Package: libutil-freebsd-9
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: FreeBSD utility library
- Miscellaneous system facilities.
-
-Package: libutil-freebsd-dev
-Section: libdevel
-Architecture: any
-Depends: libutil-freebsd-9 (= ${binary:Version}), ${misc:Depends}, libc0.1-dev | libc-dev
-Replaces: freebsd-glue (>= 0.0.15~)
-Description: Development files for libutil-freebsd
- This package contains the header files and static library needed to
- compile applications that use libutil-freebsd.
-
-Package: libcam6
-Architecture: kfreebsd-any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: FreeBSD CAM (Common Access Method) library
- The CAM (Common Access Method) library provides a way for userland
- SCSI applications to construct a SCSI command.
-
-Package: libcam-dev
-Section: libdevel
-Architecture: kfreebsd-any
-Depends: libcam6 (= ${binary:Version}), ${misc:Depends}, libc0.1-dev | libc-dev,
-Description: Development files for libcam
- This package contains the header files and static library needed to
- compile applications that use libcam.
-
-Package: libgeom1
-Architecture: kfreebsd-any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: FreeBSD GEOM library
- This library provides an interface to GEOM, a modular disk I/O request
- transformation framework provided by the kernel of FreeBSD.
-
-Package: libgeom-dev
-Section: libdevel
-Architecture: kfreebsd-any
-Depends: libgeom1 (= ${binary:Version}), ${misc:Depends}, libc0.1-dev | libc-dev,
-Description: Development files for libgeom
- This package contains the header files and static library needed to
- compile applications that use libgeom.
-
-Package: libgeom1-udeb
-Package-Type: udeb
-Section: debian-installer
-Architecture: kfreebsd-any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: FreeBSD GEOM library (udeb)
- This library provides an interface to GEOM, a modular disk I/O request
- transformation framework provided by the kernel of FreeBSD.
- .
- This is a minimal package for use in debian-installer.
-
-Package: libusbhid4debian
-Architecture: kfreebsd-any
-Depends: libusbhid-common (>= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}
-Description: FreeBSD library to access USB HID devices
- USB Human Interface Devices send and receive data layed out in a device
- dependent way. The usbhid library contains routines to extract the report
- descriptor which contains the data layout information and then use this
- information.
- .
- This package contains the header files and static library.
-
-Package: libusbhid-common
-Architecture: all
-Depends: ${misc:Depends}
-Description: Common files for the USB HID devices FreeBSD library
- USB Human Interface Devices send and receive data layed out in a device
- dependent way. The usbhid library contains routines to extract the report
- descriptor which contains the data layout information and then use this
- information.
- .
- This package contains the common files which the library need.
-
-Package: libusbhid-dev
-Section: libdevel
-Architecture: kfreebsd-any
-Depends: libusbhid4debian (= ${binary:Version}), ${misc:Depends}, libc0.1-dev | libc-dev,
-Description: Development files for libusbhid
- This package contains the header files and static library needed to
- compile applications that use libusbhid.
-
-Package: libusb3
-Architecture: kfreebsd-any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: FreeBSD userspace USB programming library
- Library for programming USB applications without the knowledge
- of FreeBSD kernel internals.
-
-Package: libusb2-dev
-Section: libdevel
-Architecture: kfreebsd-any
-Depends: libusb3 (= ${binary:Version}), ${misc:Depends}, libc0.1-dev | libc-dev,
-Provides: libusb-1.0-0-dev
-Conflicts: libusb-dev
-Description: Development files for libusb2
- This package contains the header files and static library needed to
- compile applications that use libusb2.
- .
- It should be API compatible with both libusb-1.0 and libusb-0.1
- used on Linux.
-
-Package: libusb3-udeb
-Package-Type: udeb
-Section: debian-installer
-Architecture: kfreebsd-any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: Development files for libusb2 (udeb)
- Library for programming USB applications without the knowledge
- of FreeBSD kernel internals.
- .
- This is a minimal package for use in debian-installer.
-
-Package: libkvm6
-Architecture: kfreebsd-any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: FreeBSD kvm (kernel memory interface) library
- The kvm library provides a uniform interface for accessing kernel virtual
- memory images, including live systems and crash dumps.
-
-Package: libkvm-dev
-Section: libdevel
-Architecture: kfreebsd-any
-Depends: libkvm6 (= ${binary:Version}), ${misc:Depends}, libc0.1-dev | libc-dev, libbsd-dev,
- kfreebsd-kernel-headers (>= 0.81),
-Description: Development files for libkvm
- This package contains the header files and static library needed to
- compile applications that use libkvm.
-
-Package: libdevstat7
-Architecture: kfreebsd-any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: FreeBSD devstat (kernel interface) library
- The devstat library provides a uniform interface for accessing kernel devstat
- interface.
-
-Package: libdevstat-dev
-Section: libdevel
-Architecture: kfreebsd-any
-Depends: libdevstat7 (= ${binary:Version}), ${misc:Depends}, libkvm-dev, libc0.1-dev | libc-dev,
-Description: Development files for libdevstat
- This package contains the header files and static library needed to
- compile applications that use libdevstat.
-
-Package: libmemstat3
-Architecture: kfreebsd-any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: FreeBSD memstat (kernel interface) library
- The memstat library provides a uniform interface for accessing kernel memstat
- interface.
-
-Package: libmemstat-dev
-Section: libdevel
-Architecture: kfreebsd-any
-Depends: libmemstat3 (= ${binary:Version}), ${misc:Depends}, libkvm-dev, libc0.1-dev | libc-dev,
-Description: Development files for libmemstat
- This package contains the header files and static library needed to
- compile applications that use libmemstat.
-
-Package: libnetgraph4
-Architecture: kfreebsd-any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: FreeBSD netgraph (kernel interface) library
- The netgraph library provides a uniform interface for accessing kernel netgraph
- interface.
-
-Package: libnetgraph-dev
-Section: libdevel
-Architecture: kfreebsd-any
-Depends: libnetgraph4 (= ${binary:Version}), ${misc:Depends}, libc0.1-dev | libc-dev,
-Description: Development files for libnetgraph
- This package contains the header files and static library needed to
- compile applications that use libnetgraph.
-
-Package: libipx2
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: FreeBSD IPX address conversion support library
- The IPX library provides a set of routune to convert IPX addresses.
-
-Package: libipx-dev
-Section: libdevel
-Architecture: any
-Depends: libipx2 (= ${binary:Version}), ${misc:Depends}, libc0.1-dev | libc-dev
-Description: Development files for libipx
- This package contains the header files and static library needed to
- compile applications that use libipx.
-
-Package: libipx2-udeb
-Section: debian-installer
-Package-Type: udeb
-Architecture: kfreebsd-any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: FreeBSD IPX address conversion support library (udeb)
- The IPX library provides a set of routune to convert IPX addresses.
- .
- This is a minimal package for use in debian-installer.
-
-Package: libkiconv4
-Architecture: kfreebsd-any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: FreeBSD kernel side iconv library (udeb)
- The kiconv library provides multi-byte character conversion tables for kernel
- side iconv service.
-
-Package: libkiconv-dev
-Section: libdevel
-Architecture: kfreebsd-any
-Depends: libkiconv4 (= ${binary:Version}), ${misc:Depends}, libc0.1-dev | libc-dev
-Description: Development files for libkiconv
- This package contains the header files and static library needed to
- compile applications that use libkiconv.
-
-Package: libjail1
-Architecture: kfreebsd-any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: FreeBSD jail library
- The jail library provides support for FreeBSD jails.
-
-Package: libjail-dev
-Section: libdevel
-Architecture: kfreebsd-any
-Depends: libjail1 (= ${binary:Version}), ${misc:Depends}
-Description: Development files for libjail
- This package contains the header files and static library needed to
- compile applications that use libjail.
-
-Package: libalias7
-Architecture: kfreebsd-any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: FreeBSD packet aliasing library
- The libalias library is a collection of functions for aliasing and
- dealiasing of IP packets, intended for masquerading and network address
- translation (NAT).
-
-Package: libalias-dev
-Section: libdevel
-Architecture: kfreebsd-any
-Depends: libalias7 (= ${binary:Version}), ${misc:Depends}
-Description: Development files for libalias
- This package contains the header files and static library needed to
- compile applications that use libalias.

Copied: tags/freebsd-libs/10.1~pre1-1/debian/control (from rev 5508, trunk/freebsd-libs/debian/control)
===================================================================
--- tags/freebsd-libs/10.1~pre1-1/debian/control	                        (rev 0)
+++ tags/freebsd-libs/10.1~pre1-1/debian/control	2014-08-31 19:15:04 UTC (rev 5509)
@@ -0,0 +1,333 @@
+Source: freebsd-libs
+Section: libs
+Priority: optional
+Maintainer: GNU/kFreeBSD Maintainers <debian-bsd at lists.debian.org>
+Uploaders: Aurelien Jarno <aurel32 at debian.org>,
+ Robert Millan <rmh at debian.org>,
+ Christoph Egger <christoph at debian.org>
+Build-Depends: debhelper (>= 7), pkg-config,
+ bmake (>= 20131001-4~),
+ m4,
+ freebsd-mk (>= 10.0-2~),
+ libbsd-dev (>= 0.3.0),
+ libc0.1-dev (>= 2.13-31) [kfreebsd-any],
+ libgdbm-dev [kfreebsd-any],
+ kfreebsd-kernel-headers (>= 10.1~1) [kfreebsd-any],
+# libexpat-dev: aka bsdxml. needed by libgeom
+ libexpat-dev [kfreebsd-any],
+# libncurses5-dev: needed by libalias
+ libncurses5-dev [kfreebsd-any],
+ freebsd-glue (>= 0.2.18~),
+Vcs-Browser: http://anonscm.debian.org/viewvc/glibc-bsd/trunk/freebsd-libs/
+Vcs-Svn: svn://anonscm.debian.org/glibc-bsd/trunk/freebsd-libs/
+Standards-Version: 3.9.4
+
+Package: libsbuf6
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: FreeBSD string buffer library
+ This library provides a way to handle string buffers. It contains
+ numerous functions such as append, copy, cat, print, trim whitespace
+ characters, etc.
+
+Package: libsbuf6-udeb
+Package-Type: udeb
+Section: debian-installer
+Architecture: kfreebsd-any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: FreeBSD string buffer library (udeb)
+ This library provides a way to handle string buffers. It contains
+ numerous functions such as append, copy, cat, print, trim whitespace
+ characters, etc.
+ .
+ This is a minimal package for use in debian-installer.
+
+Package: libsbuf-dev
+Section: libdevel
+Architecture: any
+Depends: libsbuf6 (= ${binary:Version}), ${misc:Depends}, libc0.1-dev | libc-dev
+Replaces: kfreebsd-kernel-headers
+Description: Development files for libsbuf
+ This package contains the header files and static library needed to
+ compile applications that use libsbuf.
+
+Package: libdwarf-freebsd-3
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: library to consume and produce DWARF debug information (FreeBSD version)
+ The libdwarf package provides a shared library which allows reading/consumer
+ and writing/producer of DWARF debugging information from object files, shared
+ libraries, and executables.
+
+Package: libdwarf-freebsd-dev
+Section: libdevel
+Architecture: any
+Depends: libdwarf-freebsd-3 (= ${binary:Version}), ${misc:Depends}, libc0.1-dev | libc-dev,
+ libelf-freebsd-dev,
+Conflicts: libdwarf-dev
+Description: Development files for libdwarf (FreeBSD version)
+ This package contains the header files and static library needed to
+ compile applications that use libdwarf.
+
+Package: libelf-freebsd-1
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: library to read and write ELF files
+ The libelf package provides a shared library which allows reading and
+ writing ELF files on a high level.
+
+Package: libelf-freebsd-dev
+Section: libdevel
+Architecture: any
+Depends: libelf-freebsd-1 (= ${binary:Version}), ${misc:Depends}, libc0.1-dev | libc-dev
+Conflicts: libelf-dev, libelfg0-dev
+Description: Development files for libelf (FreeBSD version)
+ This package contains the header files and static library needed to
+ compile applications that use libelf.
+
+Package: libutil-freebsd-9
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: FreeBSD utility library
+ Miscellaneous system facilities.
+
+Package: libutil-freebsd-dev
+Section: libdevel
+Architecture: any
+Depends: libutil-freebsd-9 (= ${binary:Version}), ${misc:Depends}, libc0.1-dev | libc-dev
+Replaces: freebsd-glue (>= 0.0.15~)
+Description: Development files for libutil-freebsd
+ This package contains the header files and static library needed to
+ compile applications that use libutil-freebsd.
+
+Package: libcam6
+Architecture: kfreebsd-any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: FreeBSD CAM (Common Access Method) library
+ The CAM (Common Access Method) library provides a way for userland
+ SCSI applications to construct a SCSI command.
+
+Package: libcam-dev
+Section: libdevel
+Architecture: kfreebsd-any
+Depends: libcam6 (= ${binary:Version}), ${misc:Depends}, libc0.1-dev | libc-dev,
+Description: Development files for libcam
+ This package contains the header files and static library needed to
+ compile applications that use libcam.
+
+Package: libgeom1
+Architecture: kfreebsd-any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: FreeBSD GEOM library
+ This library provides an interface to GEOM, a modular disk I/O request
+ transformation framework provided by the kernel of FreeBSD.
+
+Package: libgeom-dev
+Section: libdevel
+Architecture: kfreebsd-any
+Depends: libgeom1 (= ${binary:Version}), ${misc:Depends}, libc0.1-dev | libc-dev,
+Description: Development files for libgeom
+ This package contains the header files and static library needed to
+ compile applications that use libgeom.
+
+Package: libgeom1-udeb
+Package-Type: udeb
+Section: debian-installer
+Architecture: kfreebsd-any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: FreeBSD GEOM library (udeb)
+ This library provides an interface to GEOM, a modular disk I/O request
+ transformation framework provided by the kernel of FreeBSD.
+ .
+ This is a minimal package for use in debian-installer.
+
+Package: libusbhid4debian
+Architecture: kfreebsd-any
+Depends: libusbhid-common (>= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}
+Description: FreeBSD library to access USB HID devices
+ USB Human Interface Devices send and receive data layed out in a device
+ dependent way. The usbhid library contains routines to extract the report
+ descriptor which contains the data layout information and then use this
+ information.
+ .
+ This package contains the header files and static library.
+
+Package: libusbhid-common
+Architecture: all
+Depends: ${misc:Depends}
+Description: Common files for the USB HID devices FreeBSD library
+ USB Human Interface Devices send and receive data layed out in a device
+ dependent way. The usbhid library contains routines to extract the report
+ descriptor which contains the data layout information and then use this
+ information.
+ .
+ This package contains the common files which the library need.
+
+Package: libusbhid-dev
+Section: libdevel
+Architecture: kfreebsd-any
+Depends: libusbhid4debian (= ${binary:Version}), ${misc:Depends}, libc0.1-dev | libc-dev,
+Description: Development files for libusbhid
+ This package contains the header files and static library needed to
+ compile applications that use libusbhid.
+
+Package: libusb3
+Architecture: kfreebsd-any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: FreeBSD userspace USB programming library
+ Library for programming USB applications without the knowledge
+ of FreeBSD kernel internals.
+
+Package: libusb2-dev
+Section: libdevel
+Architecture: kfreebsd-any
+Depends: libusb3 (= ${binary:Version}), ${misc:Depends}, libc0.1-dev | libc-dev,
+Provides: libusb-1.0-0-dev
+Conflicts: libusb-dev
+Description: Development files for libusb2
+ This package contains the header files and static library needed to
+ compile applications that use libusb2.
+ .
+ It should be API compatible with both libusb-1.0 and libusb-0.1
+ used on Linux.
+
+Package: libusb3-udeb
+Package-Type: udeb
+Section: debian-installer
+Architecture: kfreebsd-any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: Development files for libusb2 (udeb)
+ Library for programming USB applications without the knowledge
+ of FreeBSD kernel internals.
+ .
+ This is a minimal package for use in debian-installer.
+
+Package: libkvm6
+Architecture: kfreebsd-any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: FreeBSD kvm (kernel memory interface) library
+ The kvm library provides a uniform interface for accessing kernel virtual
+ memory images, including live systems and crash dumps.
+
+Package: libkvm-dev
+Section: libdevel
+Architecture: kfreebsd-any
+Depends: libkvm6 (= ${binary:Version}), ${misc:Depends}, libc0.1-dev | libc-dev, libbsd-dev,
+ kfreebsd-kernel-headers (>= 0.81),
+Description: Development files for libkvm
+ This package contains the header files and static library needed to
+ compile applications that use libkvm.
+
+Package: libdevstat7
+Architecture: kfreebsd-any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: FreeBSD devstat (kernel interface) library
+ The devstat library provides a uniform interface for accessing kernel devstat
+ interface.
+
+Package: libdevstat-dev
+Section: libdevel
+Architecture: kfreebsd-any
+Depends: libdevstat7 (= ${binary:Version}), ${misc:Depends}, libkvm-dev, libc0.1-dev | libc-dev,
+Description: Development files for libdevstat
+ This package contains the header files and static library needed to
+ compile applications that use libdevstat.
+
+Package: libmemstat3
+Architecture: kfreebsd-any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: FreeBSD memstat (kernel interface) library
+ The memstat library provides a uniform interface for accessing kernel memstat
+ interface.
+
+Package: libmemstat-dev
+Section: libdevel
+Architecture: kfreebsd-any
+Depends: libmemstat3 (= ${binary:Version}), ${misc:Depends}, libkvm-dev, libc0.1-dev | libc-dev,
+Description: Development files for libmemstat
+ This package contains the header files and static library needed to
+ compile applications that use libmemstat.
+
+Package: libnetgraph4
+Architecture: kfreebsd-any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: FreeBSD netgraph (kernel interface) library
+ The netgraph library provides a uniform interface for accessing kernel netgraph
+ interface.
+
+Package: libnetgraph-dev
+Section: libdevel
+Architecture: kfreebsd-any
+Depends: libnetgraph4 (= ${binary:Version}), ${misc:Depends}, libc0.1-dev | libc-dev,
+Description: Development files for libnetgraph
+ This package contains the header files and static library needed to
+ compile applications that use libnetgraph.
+
+Package: libipx2
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: FreeBSD IPX address conversion support library
+ The IPX library provides a set of routune to convert IPX addresses.
+
+Package: libipx-dev
+Section: libdevel
+Architecture: any
+Depends: libipx2 (= ${binary:Version}), ${misc:Depends}, libc0.1-dev | libc-dev
+Description: Development files for libipx
+ This package contains the header files and static library needed to
+ compile applications that use libipx.
+
+Package: libipx2-udeb
+Section: debian-installer
+Package-Type: udeb
+Architecture: kfreebsd-any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: FreeBSD IPX address conversion support library (udeb)
+ The IPX library provides a set of routune to convert IPX addresses.
+ .
+ This is a minimal package for use in debian-installer.
+
+Package: libkiconv4
+Architecture: kfreebsd-any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: FreeBSD kernel side iconv library (udeb)
+ The kiconv library provides multi-byte character conversion tables for kernel
+ side iconv service.
+
+Package: libkiconv-dev
+Section: libdevel
+Architecture: kfreebsd-any
+Depends: libkiconv4 (= ${binary:Version}), ${misc:Depends}, libc0.1-dev | libc-dev
+Description: Development files for libkiconv
+ This package contains the header files and static library needed to
+ compile applications that use libkiconv.
+
+Package: libjail1
+Architecture: kfreebsd-any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: FreeBSD jail library
+ The jail library provides support for FreeBSD jails.
+
+Package: libjail-dev
+Section: libdevel
+Architecture: kfreebsd-any
+Depends: libjail1 (= ${binary:Version}), ${misc:Depends}
+Description: Development files for libjail
+ This package contains the header files and static library needed to
+ compile applications that use libjail.
+
+Package: libalias7
+Architecture: kfreebsd-any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: FreeBSD packet aliasing library
+ The libalias library is a collection of functions for aliasing and
+ dealiasing of IP packets, intended for masquerading and network address
+ translation (NAT).
+
+Package: libalias-dev
+Section: libdevel
+Architecture: kfreebsd-any
+Depends: libalias7 (= ${binary:Version}), ${misc:Depends}
+Description: Development files for libalias
+ This package contains the header files and static library needed to
+ compile applications that use libalias.

Deleted: tags/freebsd-libs/10.1~pre1-1/debian/patches/05_libipx.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/05_libipx.diff	2014-08-27 21:42:18 UTC (rev 5506)
+++ tags/freebsd-libs/10.1~pre1-1/debian/patches/05_libipx.diff	2014-08-31 19:15:04 UTC (rev 5509)
@@ -1,29 +0,0 @@
---- a/lib/libipx/Makefile
-+++ b/lib/libipx/Makefile
-@@ -1,6 +1,7 @@
- # $FreeBSD$
- 
- LIB=	ipx
-+SHLIB_MAJOR=    2
- SHLIBDIR?= /lib
- SRCS=	ipx_addr.c ipx_ntoa.c
- MAN=	ipx.3
---- a/sys/netipx/ipx.h
-+++ b/sys/netipx/ipx.h
-@@ -146,6 +146,7 @@
- 	u_short		x_port;
- };
- 
-+#ifdef __FreeBSD_kernel__
- /*
-  * Socket address
-  */
-@@ -156,6 +157,8 @@
- 	char		sipx_zero[2];
- };
- #define sipx_port sipx_addr.x_port
-+#endif
-+
- 
- /*
-  * Definitions for IPX Internetwork Packet Exchange Protocol

Copied: tags/freebsd-libs/10.1~pre1-1/debian/patches/05_libipx.diff (from rev 5507, trunk/freebsd-libs/debian/patches/05_libipx.diff)
===================================================================
--- tags/freebsd-libs/10.1~pre1-1/debian/patches/05_libipx.diff	                        (rev 0)
+++ tags/freebsd-libs/10.1~pre1-1/debian/patches/05_libipx.diff	2014-08-31 19:15:04 UTC (rev 5509)
@@ -0,0 +1,33 @@
+Index: freebsd-libs/lib/libipx/Makefile
+===================================================================
+--- freebsd-libs.orig/lib/libipx/Makefile
++++ freebsd-libs/lib/libipx/Makefile
+@@ -1,6 +1,7 @@
+ # $FreeBSD: stable/10/lib/libipx/Makefile 201381 2010-01-02 09:58:07Z ed $
+ 
+ LIB=	ipx
++SHLIB_MAJOR=    2
+ SHLIBDIR?= /lib
+ SRCS=	ipx_addr.c ipx_ntoa.c
+ MAN=	ipx.3
+Index: freebsd-libs/sys/netipx/ipx.h
+===================================================================
+--- freebsd-libs.orig/sys/netipx/ipx.h
++++ freebsd-libs/sys/netipx/ipx.h
+@@ -146,6 +146,7 @@ struct ipx_addr {
+ 	u_short		x_port;
+ };
+ 
++#ifdef __FreeBSD_kernel__
+ /*
+  * Socket address
+  */
+@@ -156,6 +157,8 @@ struct sockaddr_ipx {
+ 	char		sipx_zero[2];
+ };
+ #define sipx_port sipx_addr.x_port
++#endif
++
+ 
+ /*
+  * Definitions for IPX Internetwork Packet Exchange Protocol

Deleted: tags/freebsd-libs/10.1~pre1-1/debian/patches/cdefs_macros.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/cdefs_macros.diff	2014-08-27 21:42:18 UTC (rev 5506)
+++ tags/freebsd-libs/10.1~pre1-1/debian/patches/cdefs_macros.diff	2014-08-31 19:15:04 UTC (rev 5509)
@@ -1,194 +0,0 @@
-
-With exported headers using a hacked <sys/cdefs.h> is not enough, since
-they're used by external programs.  Manual patching is required...
-
---- a/lib/libcam/camlib.h
-+++ b/lib/libcam/camlib.h
-@@ -151,12 +151,12 @@
-  * Buffer encoding/decoding routines, from the old SCSI library.
-  */
- int csio_decode(struct ccb_scsiio *csio, const char *fmt, ...)
--		__printflike(2, 3);
-+		__attribute((format(printf, (2), (3))));
- int csio_decode_visit(struct ccb_scsiio *csio, const char *fmt,
- 		      void (*arg_put)(void *, int, void *, int, char *),
- 		      void *puthook);
- int buff_decode(u_int8_t *buff, size_t len, const char *fmt, ...)
--		__printflike(3, 4);
-+		__attribute((format(printf, (3), (4))));
- int buff_decode_visit(u_int8_t *buff, size_t len, const char *fmt,
- 		      void (*arg_put)(void *, int, void *, int, char *),
- 		      void *puthook);
-@@ -169,7 +169,7 @@
- 		     int (*arg_get)(void *hook, char *field_name),
- 		     void *gethook);
- int csio_encode(struct ccb_scsiio *csio, const char *fmt, ...)
--		__printflike(2, 3);
-+		__attribute((format(printf, (2), (3))));
- int buff_encode_visit(u_int8_t *buff, size_t len, const char *fmt,
- 		      int (*arg_get)(void *hook, char *field_name),
- 		      void *gethook);
---- a/lib/libnetgraph/netgraph.h
-+++ b/lib/libnetgraph/netgraph.h
-@@ -48,9 +48,9 @@
- 
- __BEGIN_DECLS
- int	NgMkSockNode(const char *, int *, int *);
--int	NgNameNode(int, const char *, const char *, ...) __printflike(3, 4);
-+int	NgNameNode(int, const char *, const char *, ...) __attribute((format(printf, (3), (4))));
- int	NgSendMsg(int, const char *, int, int, const void *, size_t);
--int	NgSendAsciiMsg(int, const char *, const char *, ...) __printflike(3, 4);
-+int	NgSendAsciiMsg(int, const char *, const char *, ...) __attribute((format(printf, (3), (4))));
- int	NgSendReplyMsg(int, const char *,
- 		const struct ng_mesg *, const void *, size_t);
- int	NgRecvMsg(int, struct ng_mesg *, size_t, char *);
---- a/lib/libusb/libusb.h
-+++ b/lib/libusb/libusb.h
-@@ -245,7 +245,7 @@
- 	uint8_t	bSynchAddress;
- 	uint8_t *extra;
- 	int	extra_length;
--}	libusb_endpoint_descriptor __aligned(sizeof(void *));
-+}	libusb_endpoint_descriptor __attribute__((__aligned__(sizeof(void *))));
- 
- typedef struct libusb_ss_endpoint_companion_descriptor {
- 	uint8_t bLength;
-@@ -253,7 +253,7 @@
- 	uint8_t bMaxBurst;
- 	uint8_t bmAttributes;
- 	uint16_t wBytesPerInterval;
--}	libusb_ss_endpoint_companion_descriptor __aligned(sizeof(void *));
-+}	libusb_ss_endpoint_companion_descriptor __attribute__((__aligned__(sizeof(void *))));
- 
- typedef struct libusb_interface_descriptor {
- 	uint8_t	bLength;
-@@ -268,12 +268,12 @@
- 	struct libusb_endpoint_descriptor *endpoint;
- 	uint8_t *extra;
- 	int	extra_length;
--}	libusb_interface_descriptor __aligned(sizeof(void *));
-+}	libusb_interface_descriptor __attribute__((__aligned__(sizeof(void *))));
- 
- typedef struct libusb_interface {
- 	struct libusb_interface_descriptor *altsetting;
- 	int	num_altsetting;
--}	libusb_interface __aligned(sizeof(void *));
-+}	libusb_interface __attribute__((__aligned__(sizeof(void *))));
- 
- typedef struct libusb_config_descriptor {
- 	uint8_t	bLength;
-@@ -287,7 +287,7 @@
- 	struct libusb_interface *interface;
- 	uint8_t *extra;
- 	int	extra_length;
--}	libusb_config_descriptor __aligned(sizeof(void *));
-+}	libusb_config_descriptor __attribute__((__aligned__(sizeof(void *))));
- 
- typedef struct libusb_usb_2_0_device_capability_descriptor {
- 	uint8_t bLength;
-@@ -295,7 +295,7 @@
- 	uint8_t bDevCapabilityType;
- 	uint32_t bmAttributes;
- #define LIBUSB_USB_2_0_CAPABILITY_LPM_SUPPORT  (1 << 1)
--}	libusb_usb_2_0_device_capability_descriptor __aligned(sizeof(void *));
-+}	libusb_usb_2_0_device_capability_descriptor __attribute__((__aligned__(sizeof(void *))));
- 
- typedef struct libusb_ss_usb_device_capability_descriptor {
- 	uint8_t bLength;
-@@ -311,7 +311,7 @@
- 	uint8_t bFunctionalitySupport;
- 	uint8_t bU1DevExitLat;
- 	uint16_t wU2DevExitLat;
--}	libusb_ss_usb_device_capability_descriptor __aligned(sizeof(void *));
-+}	libusb_ss_usb_device_capability_descriptor __attribute__((__aligned__(sizeof(void *))));
- 
- typedef struct libusb_bos_descriptor {
- 	uint8_t bLength;
-@@ -320,7 +320,7 @@
- 	uint8_t bNumDeviceCapabilities;
- 	struct libusb_usb_2_0_device_capability_descriptor *usb_2_0_ext_cap;
- 	struct libusb_ss_usb_device_capability_descriptor *ss_usb_cap;
--}	libusb_bos_descriptor __aligned(sizeof(void *));
-+}	libusb_bos_descriptor __attribute__((__aligned__(sizeof(void *))));
- 
- typedef struct libusb_control_setup {
- 	uint8_t	bmRequestType;
-@@ -336,7 +336,7 @@
- 	uint32_t length;
- 	uint32_t actual_length;
- 	enum libusb_transfer_status status;
--}	libusb_iso_packet_descriptor __aligned(sizeof(void *));
-+}	libusb_iso_packet_descriptor __attribute__((__aligned__(sizeof(void *))));
- 
- typedef void (*libusb_transfer_cb_fn) (struct libusb_transfer *transfer);
- 
-@@ -354,7 +354,7 @@
- 	uint8_t *buffer;
- 	int	num_iso_packets;
- 	struct libusb_iso_packet_descriptor iso_packet_desc[0];
--}	libusb_transfer __aligned(sizeof(void *));
-+}	libusb_transfer __attribute__((__aligned__(sizeof(void *))));
- 
- /* Library initialisation */
- 
---- a/lib/libusb/libusb20_desc.h
-+++ b/lib/libusb/libusb20_desc.h
-@@ -102,7 +102,7 @@
- 	void   *ptr;			/* data pointer */
- 	uint16_t len;			/* defaults to zero */
- 	uint16_t type;			/* defaults to LIBUSB20_ME_IS_EMPTY */
--} __aligned(LIBUSB20_ME_STRUCT_ALIGN);
-+} __attribute__((__aligned__(LIBUSB20_ME_STRUCT_ALIGN)));
- 
- struct libusb20_me_format {
- 	const uint8_t *format;		/* always set */
-@@ -124,7 +124,7 @@
- 	   LIBUSB20_ME_IS_##un##SIGNED ,				\
- 	   (size) & 0xFF, ((size) / 0x100) & 0xFF, )		\
-   LIBUSB20_NOT(ismeta) ( u##int##bits##_t				\
--		    __aligned((bits) / 8) field a; )
-+		    __attribute__((__aligned__((bits) / 8))) field a; )
- 
- #define	LIBUSB20_ME_UINT8_T(n, field, arg, ismeta) \
-   LIBUSB20_ME_INTEGER(n, field, ismeta, UN, u, 8, , 1)
-@@ -561,7 +561,7 @@
- struct libusb20_endpoint {
- 	struct LIBUSB20_ENDPOINT_DESC_DECODED desc;
- 	struct libusb20_me_struct extra;
--} __aligned(sizeof(void *));
-+} __attribute__((__aligned__(sizeof(void *))));
- 
- struct libusb20_interface {
- 	struct LIBUSB20_INTERFACE_DESC_DECODED desc;
-@@ -570,14 +570,14 @@
- 	struct libusb20_endpoint *endpoints;
- 	uint8_t	num_altsetting;
- 	uint8_t	num_endpoints;
--} __aligned(sizeof(void *));
-+} __attribute__((__aligned__(sizeof(void *))));
- 
- struct libusb20_config {
- 	struct LIBUSB20_CONFIG_DESC_DECODED desc;
- 	struct libusb20_me_struct extra;
- 	struct libusb20_interface *interface;
- 	uint8_t	num_interface;
--} __aligned(sizeof(void *));
-+} __attribute__((__aligned__(sizeof(void *))));
- 
- uint8_t	libusb20_me_get_1(const struct libusb20_me_struct *ie, uint16_t offset);
- uint16_t libusb20_me_get_2(const struct libusb20_me_struct *ie, uint16_t offset);
---- a/sys/sys/sbuf.h
-+++ b/sys/sys/sbuf.h
-@@ -71,9 +71,9 @@
- int		 sbuf_cat(struct sbuf *, const char *);
- int		 sbuf_cpy(struct sbuf *, const char *);
- int		 sbuf_printf(struct sbuf *, const char *, ...)
--	__printflike(2, 3);
--int		 sbuf_vprintf(struct sbuf *, const char *, __va_list)
--	__printflike(2, 0);
-+	__attribute((format(printf, (2), (3))));
-+int		 sbuf_vprintf(struct sbuf *, const char *, va_list)
-+	__attribute((format(printf, (2), (0))));
- int		 sbuf_putc(struct sbuf *, int);
- void		 sbuf_set_drain(struct sbuf *, sbuf_drain_func *, void *);
- int		 sbuf_trim(struct sbuf *);

Copied: tags/freebsd-libs/10.1~pre1-1/debian/patches/cdefs_macros.diff (from rev 5507, trunk/freebsd-libs/debian/patches/cdefs_macros.diff)
===================================================================
--- tags/freebsd-libs/10.1~pre1-1/debian/patches/cdefs_macros.diff	                        (rev 0)
+++ tags/freebsd-libs/10.1~pre1-1/debian/patches/cdefs_macros.diff	2014-08-31 19:15:04 UTC (rev 5509)
@@ -0,0 +1,204 @@
+
+With exported headers using a hacked <sys/cdefs.h> is not enough, since
+they're used by external programs.  Manual patching is required...
+
+Index: freebsd-libs/lib/libcam/camlib.h
+===================================================================
+--- freebsd-libs.orig/lib/libcam/camlib.h
++++ freebsd-libs/lib/libcam/camlib.h
+@@ -151,12 +151,12 @@ int			cam_get_device(const char *path, c
+  * Buffer encoding/decoding routines, from the old SCSI library.
+  */
+ int csio_decode(struct ccb_scsiio *csio, const char *fmt, ...)
+-		__printflike(2, 3);
++		__attribute((format(printf, (2), (3))));
+ int csio_decode_visit(struct ccb_scsiio *csio, const char *fmt,
+ 		      void (*arg_put)(void *, int, void *, int, char *),
+ 		      void *puthook);
+ int buff_decode(u_int8_t *buff, size_t len, const char *fmt, ...)
+-		__printflike(3, 4);
++		__attribute((format(printf, (3), (4))));
+ int buff_decode_visit(u_int8_t *buff, size_t len, const char *fmt,
+ 		      void (*arg_put)(void *, int, void *, int, char *),
+ 		      void *puthook);
+@@ -169,7 +169,7 @@ int csio_build_visit(struct ccb_scsiio *
+ 		     int (*arg_get)(void *hook, char *field_name),
+ 		     void *gethook);
+ int csio_encode(struct ccb_scsiio *csio, const char *fmt, ...)
+-		__printflike(2, 3);
++		__attribute((format(printf, (2), (3))));
+ int buff_encode_visit(u_int8_t *buff, size_t len, const char *fmt,
+ 		      int (*arg_get)(void *hook, char *field_name),
+ 		      void *gethook);
+Index: freebsd-libs/lib/libnetgraph/netgraph.h
+===================================================================
+--- freebsd-libs.orig/lib/libnetgraph/netgraph.h
++++ freebsd-libs/lib/libnetgraph/netgraph.h
+@@ -48,9 +48,9 @@
+ 
+ __BEGIN_DECLS
+ int	NgMkSockNode(const char *, int *, int *);
+-int	NgNameNode(int, const char *, const char *, ...) __printflike(3, 4);
++int	NgNameNode(int, const char *, const char *, ...) __attribute((format(printf, (3), (4))));
+ int	NgSendMsg(int, const char *, int, int, const void *, size_t);
+-int	NgSendAsciiMsg(int, const char *, const char *, ...) __printflike(3, 4);
++int	NgSendAsciiMsg(int, const char *, const char *, ...) __attribute((format(printf, (3), (4))));
+ int	NgSendReplyMsg(int, const char *,
+ 		const struct ng_mesg *, const void *, size_t);
+ int	NgRecvMsg(int, struct ng_mesg *, size_t, char *);
+Index: freebsd-libs/lib/libusb/libusb.h
+===================================================================
+--- freebsd-libs.orig/lib/libusb/libusb.h
++++ freebsd-libs/lib/libusb/libusb.h
+@@ -268,7 +268,7 @@ typedef struct libusb_endpoint_descripto
+ 	uint8_t	bSynchAddress;
+ 	uint8_t *extra;
+ 	int	extra_length;
+-}	libusb_endpoint_descriptor __aligned(sizeof(void *));
++}	libusb_endpoint_descriptor __attribute__((__aligned__(sizeof(void *))));
+ 
+ typedef struct libusb_ss_endpoint_companion_descriptor {
+ 	uint8_t bLength;
+@@ -276,7 +276,7 @@ typedef struct libusb_ss_endpoint_compan
+ 	uint8_t bMaxBurst;
+ 	uint8_t bmAttributes;
+ 	uint16_t wBytesPerInterval;
+-}	libusb_ss_endpoint_companion_descriptor __aligned(sizeof(void *));
++}	libusb_ss_endpoint_companion_descriptor __attribute__((__aligned__(sizeof(void *))));
+ 
+ typedef struct libusb_interface_descriptor {
+ 	uint8_t	bLength;
+@@ -291,12 +291,12 @@ typedef struct libusb_interface_descript
+ 	struct libusb_endpoint_descriptor *endpoint;
+ 	uint8_t *extra;
+ 	int	extra_length;
+-}	libusb_interface_descriptor __aligned(sizeof(void *));
++}	libusb_interface_descriptor __attribute__((__aligned__(sizeof(void *))));
+ 
+ typedef struct libusb_interface {
+ 	struct libusb_interface_descriptor *altsetting;
+ 	int	num_altsetting;
+-}	libusb_interface __aligned(sizeof(void *));
++}	libusb_interface __attribute__((__aligned__(sizeof(void *))));
+ 
+ typedef struct libusb_config_descriptor {
+ 	uint8_t	bLength;
+@@ -310,7 +310,7 @@ typedef struct libusb_config_descriptor
+ 	struct libusb_interface *interface;
+ 	uint8_t *extra;
+ 	int	extra_length;
+-}	libusb_config_descriptor __aligned(sizeof(void *));
++}	libusb_config_descriptor __attribute__((__aligned__(sizeof(void *))));
+ 
+ typedef struct libusb_usb_2_0_device_capability_descriptor {
+ 	uint8_t bLength;
+@@ -318,7 +318,7 @@ typedef struct libusb_usb_2_0_device_cap
+ 	uint8_t bDevCapabilityType;
+ 	uint32_t bmAttributes;
+ #define LIBUSB_USB_2_0_CAPABILITY_LPM_SUPPORT  (1 << 1)
+-}	libusb_usb_2_0_device_capability_descriptor __aligned(sizeof(void *));
++}	libusb_usb_2_0_device_capability_descriptor __attribute__((__aligned__(sizeof(void *))));
+ 
+ typedef struct libusb_ss_usb_device_capability_descriptor {
+ 	uint8_t bLength;
+@@ -334,7 +334,7 @@ typedef struct libusb_ss_usb_device_capa
+ 	uint8_t bFunctionalitySupport;
+ 	uint8_t bU1DevExitLat;
+ 	uint16_t wU2DevExitLat;
+-}	libusb_ss_usb_device_capability_descriptor __aligned(sizeof(void *));
++}	libusb_ss_usb_device_capability_descriptor __attribute__((__aligned__(sizeof(void *))));
+ 
+ typedef struct libusb_bos_descriptor {
+ 	uint8_t bLength;
+@@ -343,7 +343,7 @@ typedef struct libusb_bos_descriptor {
+ 	uint8_t bNumDeviceCapabilities;
+ 	struct libusb_usb_2_0_device_capability_descriptor *usb_2_0_ext_cap;
+ 	struct libusb_ss_usb_device_capability_descriptor *ss_usb_cap;
+-}	libusb_bos_descriptor __aligned(sizeof(void *));
++}	libusb_bos_descriptor __attribute__((__aligned__(sizeof(void *))));
+ 
+ typedef struct libusb_control_setup {
+ 	uint8_t	bmRequestType;
+@@ -359,7 +359,7 @@ typedef struct libusb_iso_packet_descrip
+ 	uint32_t length;
+ 	uint32_t actual_length;
+ 	enum libusb_transfer_status status;
+-}	libusb_iso_packet_descriptor __aligned(sizeof(void *));
++}	libusb_iso_packet_descriptor __attribute__((__aligned__(sizeof(void *))));
+ 
+ typedef void (*libusb_transfer_cb_fn) (struct libusb_transfer *transfer);
+ 
+@@ -377,7 +377,7 @@ typedef struct libusb_transfer {
+ 	uint8_t *buffer;
+ 	int	num_iso_packets;
+ 	struct libusb_iso_packet_descriptor iso_packet_desc[0];
+-}	libusb_transfer __aligned(sizeof(void *));
++}	libusb_transfer __attribute__((__aligned__(sizeof(void *))));
+ 
+ /* Library initialisation */
+ 
+Index: freebsd-libs/lib/libusb/libusb20_desc.h
+===================================================================
+--- freebsd-libs.orig/lib/libusb/libusb20_desc.h
++++ freebsd-libs/lib/libusb/libusb20_desc.h
+@@ -102,7 +102,7 @@ struct libusb20_me_struct {
+ 	void   *ptr;			/* data pointer */
+ 	uint16_t len;			/* defaults to zero */
+ 	uint16_t type;			/* defaults to LIBUSB20_ME_IS_EMPTY */
+-} __aligned(LIBUSB20_ME_STRUCT_ALIGN);
++} __attribute__((__aligned__(LIBUSB20_ME_STRUCT_ALIGN)));
+ 
+ struct libusb20_me_format {
+ 	const uint8_t *format;		/* always set */
+@@ -124,7 +124,7 @@ struct libusb20_me_format {
+ 	   LIBUSB20_ME_IS_##un##SIGNED ,				\
+ 	   (size) & 0xFF, ((size) / 0x100) & 0xFF, )		\
+   LIBUSB20_NOT(ismeta) ( u##int##bits##_t				\
+-		    __aligned((bits) / 8) field a; )
++		    __attribute__((__aligned__((bits) / 8))) field a; )
+ 
+ #define	LIBUSB20_ME_UINT8_T(n, field, arg, ismeta) \
+   LIBUSB20_ME_INTEGER(n, field, ismeta, UN, u, 8, , 1)
+@@ -561,7 +561,7 @@ enum libusb20_iso_usage_type {
+ struct libusb20_endpoint {
+ 	struct LIBUSB20_ENDPOINT_DESC_DECODED desc;
+ 	struct libusb20_me_struct extra;
+-} __aligned(sizeof(void *));
++} __attribute__((__aligned__(sizeof(void *))));
+ 
+ struct libusb20_interface {
+ 	struct LIBUSB20_INTERFACE_DESC_DECODED desc;
+@@ -570,14 +570,14 @@ struct libusb20_interface {
+ 	struct libusb20_endpoint *endpoints;
+ 	uint8_t	num_altsetting;
+ 	uint8_t	num_endpoints;
+-} __aligned(sizeof(void *));
++} __attribute__((__aligned__(sizeof(void *))));
+ 
+ struct libusb20_config {
+ 	struct LIBUSB20_CONFIG_DESC_DECODED desc;
+ 	struct libusb20_me_struct extra;
+ 	struct libusb20_interface *interface;
+ 	uint8_t	num_interface;
+-} __aligned(sizeof(void *));
++} __attribute__((__aligned__(sizeof(void *))));
+ 
+ uint8_t	libusb20_me_get_1(const struct libusb20_me_struct *ie, uint16_t offset);
+ uint16_t libusb20_me_get_2(const struct libusb20_me_struct *ie, uint16_t offset);
+Index: freebsd-libs/sys/sys/sbuf.h
+===================================================================
+--- freebsd-libs.orig/sys/sys/sbuf.h
++++ freebsd-libs/sys/sys/sbuf.h
+@@ -71,9 +71,9 @@ int		 sbuf_bcpy(struct sbuf *, const voi
+ int		 sbuf_cat(struct sbuf *, const char *);
+ int		 sbuf_cpy(struct sbuf *, const char *);
+ int		 sbuf_printf(struct sbuf *, const char *, ...)
+-	__printflike(2, 3);
+-int		 sbuf_vprintf(struct sbuf *, const char *, __va_list)
+-	__printflike(2, 0);
++	__attribute((format(printf, (2), (3))));
++int		 sbuf_vprintf(struct sbuf *, const char *, va_list)
++	__attribute((format(printf, (2), (0))));
+ int		 sbuf_putc(struct sbuf *, int);
+ void		 sbuf_set_drain(struct sbuf *, sbuf_drain_func *, void *);
+ int		 sbuf_trim(struct sbuf *);

Deleted: tags/freebsd-libs/10.1~pre1-1/debian/patches/dwarf.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/dwarf.diff	2014-08-27 21:42:18 UTC (rev 5506)
+++ tags/freebsd-libs/10.1~pre1-1/debian/patches/dwarf.diff	2014-08-31 19:15:04 UTC (rev 5509)
@@ -1,20 +0,0 @@
---- a/lib/libdwarf/Makefile
-+++ b/lib/libdwarf/Makefile
-@@ -1,6 +1,6 @@
- # $FreeBSD$
- 
--LIB=	dwarf
-+LIB=	dwarf-freebsd
- 
- SRCS=	\
- 	dwarf_abbrev.c		\
-@@ -20,7 +20,8 @@
- 
- INCS=	dwarf.h libdwarf.h
- 
--CFLAGS+=	-I${.CURDIR}
-+LDADD+=		-L../libelf -lelf-freebsd
-+CFLAGS+=	-I${.CURDIR} -I../libelf
- 
- SHLIB_MAJOR=	3
- 

Copied: tags/freebsd-libs/10.1~pre1-1/debian/patches/dwarf.diff (from rev 5507, trunk/freebsd-libs/debian/patches/dwarf.diff)
===================================================================
--- tags/freebsd-libs/10.1~pre1-1/debian/patches/dwarf.diff	                        (rev 0)
+++ tags/freebsd-libs/10.1~pre1-1/debian/patches/dwarf.diff	2014-08-31 19:15:04 UTC (rev 5509)
@@ -0,0 +1,22 @@
+Index: freebsd-libs/lib/libdwarf/Makefile
+===================================================================
+--- freebsd-libs.orig/lib/libdwarf/Makefile
++++ freebsd-libs/lib/libdwarf/Makefile
+@@ -1,6 +1,6 @@
+ # $FreeBSD: stable/10/lib/libdwarf/Makefile 225227 2011-08-28 09:26:48Z kib $
+ 
+-LIB=	dwarf
++LIB=	dwarf-freebsd
+ 
+ SRCS=	\
+ 	dwarf_abbrev.c		\
+@@ -20,7 +20,8 @@ SRCS=	\
+ 
+ INCS=	dwarf.h libdwarf.h
+ 
+-CFLAGS+=	-I${.CURDIR}
++LDADD+=		-L../libelf -lelf-freebsd
++CFLAGS+=	-I${.CURDIR} -I../libelf
+ 
+ SHLIB_MAJOR=	3
+ 

Deleted: tags/freebsd-libs/10.1~pre1-1/debian/patches/elf.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/elf.diff	2014-08-27 21:42:18 UTC (rev 5506)
+++ tags/freebsd-libs/10.1~pre1-1/debian/patches/elf.diff	2014-08-31 19:15:04 UTC (rev 5509)
@@ -1,19 +0,0 @@
---- a/lib/libelf/Makefile
-+++ b/lib/libelf/Makefile
-@@ -1,6 +1,6 @@
- # $FreeBSD$
- 
--LIB=	elf
-+LIB=	elf-freebsd
- 
- SRCS=	elf_begin.c						\
- 	elf_cntl.c						\
-@@ -171,6 +171,8 @@
- libelf_fsize.c:		elf_types.m4 libelf_fsize.m4
- libelf_msize.c:		elf_types.m4 libelf_msize.m4
- 
-+LDADD+=	-lbsd
-+
- .include <bsd.lib.mk>
- 
- # Keep the .SUFFIXES line after the include of bsd.lib.mk

Copied: tags/freebsd-libs/10.1~pre1-1/debian/patches/elf.diff (from rev 5507, trunk/freebsd-libs/debian/patches/elf.diff)
===================================================================
--- tags/freebsd-libs/10.1~pre1-1/debian/patches/elf.diff	                        (rev 0)
+++ tags/freebsd-libs/10.1~pre1-1/debian/patches/elf.diff	2014-08-31 19:15:04 UTC (rev 5509)
@@ -0,0 +1,21 @@
+Index: freebsd-libs/lib/libelf/Makefile
+===================================================================
+--- freebsd-libs.orig/lib/libelf/Makefile
++++ freebsd-libs/lib/libelf/Makefile
+@@ -1,6 +1,6 @@
+ # $FreeBSD: stable/10/lib/libelf/Makefile 238741 2012-07-24 16:03:28Z ache $
+ 
+-LIB=	elf
++LIB=	elf-freebsd
+ 
+ SRCS=	elf_begin.c						\
+ 	elf_cntl.c						\
+@@ -171,6 +171,8 @@ libelf_convert.c:	elf_types.m4 libelf_co
+ libelf_fsize.c:		elf_types.m4 libelf_fsize.m4
+ libelf_msize.c:		elf_types.m4 libelf_msize.m4
+ 
++LDADD+=	-lbsd
++
+ .include <bsd.lib.mk>
+ 
+ # Keep the .SUFFIXES line after the include of bsd.lib.mk

Deleted: tags/freebsd-libs/10.1~pre1-1/debian/patches/kvm_size_t_kludge.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/kvm_size_t_kludge.diff	2014-08-27 21:42:18 UTC (rev 5506)
+++ tags/freebsd-libs/10.1~pre1-1/debian/patches/kvm_size_t_kludge.diff	2014-08-31 19:15:04 UTC (rev 5509)
@@ -1,12 +0,0 @@
---- a/lib/libkvm/kvm.h
-+++ b/lib/libkvm/kvm.h
-@@ -42,7 +42,8 @@
- #define	VRS_KEY		"VERSION"
- 
- #ifndef _SIZE_T_DECLARED
--typedef	__size_t	size_t;
-+#define __need_size_t
-+#include <stddef.h>
- #define	_SIZE_T_DECLARED
- #endif
- 

Copied: tags/freebsd-libs/10.1~pre1-1/debian/patches/kvm_size_t_kludge.diff (from rev 5507, trunk/freebsd-libs/debian/patches/kvm_size_t_kludge.diff)
===================================================================
--- tags/freebsd-libs/10.1~pre1-1/debian/patches/kvm_size_t_kludge.diff	                        (rev 0)
+++ tags/freebsd-libs/10.1~pre1-1/debian/patches/kvm_size_t_kludge.diff	2014-08-31 19:15:04 UTC (rev 5509)
@@ -0,0 +1,14 @@
+Index: freebsd-libs/lib/libkvm/kvm.h
+===================================================================
+--- freebsd-libs.orig/lib/libkvm/kvm.h
++++ freebsd-libs/lib/libkvm/kvm.h
+@@ -43,7 +43,8 @@
+ #define	VRS_KEY		"VERSION"
+ 
+ #ifndef _SIZE_T_DECLARED
+-typedef	__size_t	size_t;
++#define __need_size_t
++#include <stddef.h>
+ #define	_SIZE_T_DECLARED
+ #endif
+ 

Deleted: tags/freebsd-libs/10.1~pre1-1/debian/patches/makefiles.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/makefiles.diff	2014-08-27 21:42:18 UTC (rev 5506)
+++ tags/freebsd-libs/10.1~pre1-1/debian/patches/makefiles.diff	2014-08-31 19:15:04 UTC (rev 5509)
@@ -1,98 +0,0 @@
-Index: freebsd-libs/lib/libgeom/Makefile
-===================================================================
---- freebsd-libs.orig/lib/libgeom/Makefile
-+++ freebsd-libs/lib/libgeom/Makefile
-@@ -1,6 +1,7 @@
- # $FreeBSD$
- 
- LIB=	geom
-+SHLIB_MAJOR= 1
- SHLIBDIR?= /lib
- SRCS+=	geom_getxml.c
- SRCS+=	geom_stats.c
-@@ -16,6 +17,8 @@ WARNS?=	3
- DPADD=	${LIBBSDXML} ${LIBSBUF}
- LDADD=	-lbsdxml -lsbuf
- 
-+LDADD+=	-L../libsbuf/ -lrt -lbsd
-+
- MAN=	libgeom.3
- 
- MLINKS+= \
-Index: freebsd-libs/lib/libutil/Makefile
-===================================================================
---- freebsd-libs.orig/lib/libutil/Makefile
-+++ freebsd-libs/lib/libutil/Makefile
-@@ -5,15 +5,11 @@ SHLIBDIR?= /lib
- 
- .include <bsd.own.mk>
- 
--LIB=	util
-+LIB=	util-freebsd
- SHLIB_MAJOR= 9
- 
- SRCS=	_secure_path.c auth.c expand_number.c flopen.c fparseln.c gr_util.c \
--	hexdump.c humanize_number.c kinfo_getfile.c kinfo_getfile.c \
--	kinfo_getallproc.c kinfo_getproc.c kinfo_getvmmap.c kld.c \
--	login_auth.c login_cap.c \
--	login_class.c login_crypt.c login_ok.c login_times.c login_tty.c \
--	pidfile.c property.c pty.c pw_util.c quotafile.c realhostname.c \
-+	hexdump.c humanize_number.c \
- 	stub.c trimdomain.c uucplock.c
- INCS=	libutil.h login_cap.h
- 
-@@ -25,6 +21,14 @@ CFLAGS+= -DINET6
- 
- CFLAGS+= -I${.CURDIR} -I${.CURDIR}/../libc/gen/
- 
-+OS!=	dpkg-architecture -qDEB_HOST_GNU_SYSTEM
-+.if ${OS} == "kfreebsd-gnu"
-+SRCS+=	login_cap.c login_class.c \
-+	pidfile.c
-+.endif
-+
-+LDADD= -lbsd -lfreebsd-glue
-+
- MAN+=	expand_number.3 flopen.3 fparseln.3 hexdump.3 \
- 	humanize_number.3 kinfo_getallproc.3 kinfo_getfile.3 \
- 	kinfo_getproc.3 kinfo_getvmmap.3 kld.3 login_auth.3 login_cap.3 \
-Index: freebsd-libs/lib/libkvm/Makefile
-===================================================================
---- freebsd-libs.orig/lib/libkvm/Makefile
-+++ freebsd-libs/lib/libkvm/Makefile
-@@ -5,6 +5,7 @@ LIB=	kvm
- SHLIBDIR?= /lib
- SHLIB_MAJOR=	6
- CFLAGS+=-DLIBC_SCCS -I${.CURDIR}
-+LDADD= -lbsd -lfreebsd-glue
- 
- .if exists(${.CURDIR}/kvm_${MACHINE_ARCH}.c)
- KVM_ARCH=${MACHINE_ARCH}
-Index: freebsd-libs/lib/libipx/Makefile
-===================================================================
---- freebsd-libs.orig/lib/libipx/Makefile
-+++ freebsd-libs/lib/libipx/Makefile
-@@ -7,6 +7,10 @@ SRCS=	ipx_addr.c ipx_ntoa.c
- MAN=	ipx.3
- MLINKS+=ipx.3 ipx_addr.3 ipx.3 ipx_ntoa.3
- 
-+# for <netipx/ipx.h>
-+CFLAGS+=	-I../../sys
-+INCS+=		../../sys/netipx/ipx.h
-+
- WARNS?=	2
- 
- .include <bsd.lib.mk>
-Index: freebsd-libs/lib/libelf/Makefile
-===================================================================
---- freebsd-libs.orig/lib/libelf/Makefile
-+++ freebsd-libs/lib/libelf/Makefile
-@@ -61,7 +61,7 @@ INCS=	libelf.h gelf.h
- # problems when a header file in sys depends on a file in another
- # part of the tree, e.g. a machine dependent header.
- #
--SRCS+=	sys/elf32.h sys/elf64.h sys/elf_common.h
-+#SRCS+=	sys/elf32.h sys/elf64.h sys/elf_common.h
- 
- GENSRCS=	libelf_fsize.c libelf_msize.c libelf_convert.c
- CLEANFILES=	${GENSRCS}

Copied: tags/freebsd-libs/10.1~pre1-1/debian/patches/makefiles.diff (from rev 5507, trunk/freebsd-libs/debian/patches/makefiles.diff)
===================================================================
--- tags/freebsd-libs/10.1~pre1-1/debian/patches/makefiles.diff	                        (rev 0)
+++ tags/freebsd-libs/10.1~pre1-1/debian/patches/makefiles.diff	2014-08-31 19:15:04 UTC (rev 5509)
@@ -0,0 +1,98 @@
+Index: freebsd-libs/lib/libgeom/Makefile
+===================================================================
+--- freebsd-libs.orig/lib/libgeom/Makefile
++++ freebsd-libs/lib/libgeom/Makefile
+@@ -1,6 +1,7 @@
+ # $FreeBSD: stable/10/lib/libgeom/Makefile 192376 2009-05-19 12:10:48Z trasz $
+ 
+ LIB=	geom
++SHLIB_MAJOR= 1
+ SHLIBDIR?= /lib
+ SRCS+=	geom_getxml.c
+ SRCS+=	geom_stats.c
+@@ -16,6 +17,8 @@ WARNS?=	3
+ DPADD=	${LIBBSDXML} ${LIBSBUF}
+ LDADD=	-lbsdxml -lsbuf
+ 
++LDADD+=	-L../libsbuf/ -lrt -lbsd
++
+ MAN=	libgeom.3
+ 
+ MLINKS+= \
+Index: freebsd-libs/lib/libutil/Makefile
+===================================================================
+--- freebsd-libs.orig/lib/libutil/Makefile
++++ freebsd-libs/lib/libutil/Makefile
+@@ -5,15 +5,11 @@ SHLIBDIR?= /lib
+ 
+ .include <bsd.own.mk>
+ 
+-LIB=	util
++LIB=	util-freebsd
+ SHLIB_MAJOR= 9
+ 
+ SRCS=	_secure_path.c auth.c expand_number.c flopen.c fparseln.c gr_util.c \
+-	hexdump.c humanize_number.c kinfo_getfile.c kinfo_getfile.c \
+-	kinfo_getallproc.c kinfo_getproc.c kinfo_getvmmap.c kld.c \
+-	login_auth.c login_cap.c \
+-	login_class.c login_crypt.c login_ok.c login_times.c login_tty.c \
+-	pidfile.c property.c pty.c pw_util.c quotafile.c realhostname.c \
++	hexdump.c humanize_number.c \
+ 	stub.c trimdomain.c uucplock.c
+ INCS=	libutil.h login_cap.h
+ 
+@@ -25,6 +21,14 @@ CFLAGS+= -DINET6
+ 
+ CFLAGS+= -I${.CURDIR} -I${.CURDIR}/../libc/gen/
+ 
++OS!=	dpkg-architecture -qDEB_HOST_GNU_SYSTEM
++.if ${OS} == "kfreebsd-gnu"
++SRCS+=	login_cap.c login_class.c \
++	pidfile.c
++.endif
++
++LDADD= -lbsd -lfreebsd-glue
++
+ MAN+=	expand_number.3 flopen.3 fparseln.3 hexdump.3 \
+ 	humanize_number.3 kinfo_getallproc.3 kinfo_getfile.3 \
+ 	kinfo_getproc.3 kinfo_getvmmap.3 kld.3 login_auth.3 login_cap.3 \
+Index: freebsd-libs/lib/libkvm/Makefile
+===================================================================
+--- freebsd-libs.orig/lib/libkvm/Makefile
++++ freebsd-libs/lib/libkvm/Makefile
+@@ -5,6 +5,7 @@ LIB=	kvm
+ SHLIBDIR?= /lib
+ SHLIB_MAJOR=	6
+ CFLAGS+=-DLIBC_SCCS -I${.CURDIR}
++LDADD= -lbsd -lfreebsd-glue
+ 
+ .if exists(${.CURDIR}/kvm_${MACHINE_ARCH}.c)
+ KVM_ARCH=${MACHINE_ARCH}
+Index: freebsd-libs/lib/libipx/Makefile
+===================================================================
+--- freebsd-libs.orig/lib/libipx/Makefile
++++ freebsd-libs/lib/libipx/Makefile
+@@ -7,6 +7,10 @@ SRCS=	ipx_addr.c ipx_ntoa.c
+ MAN=	ipx.3
+ MLINKS+=ipx.3 ipx_addr.3 ipx.3 ipx_ntoa.3
+ 
++# for <netipx/ipx.h>
++CFLAGS+=	-I../../sys
++INCS+=		../../sys/netipx/ipx.h
++
+ WARNS?=	2
+ 
+ .include <bsd.lib.mk>
+Index: freebsd-libs/lib/libelf/Makefile
+===================================================================
+--- freebsd-libs.orig/lib/libelf/Makefile
++++ freebsd-libs/lib/libelf/Makefile
+@@ -61,7 +61,7 @@ INCS=	libelf.h gelf.h
+ # problems when a header file in sys depends on a file in another
+ # part of the tree, e.g. a machine dependent header.
+ #
+-SRCS+=	sys/elf32.h sys/elf64.h sys/elf_common.h
++#SRCS+=	sys/elf32.h sys/elf64.h sys/elf_common.h
+ 
+ GENSRCS=	libelf_fsize.c libelf_msize.c libelf_convert.c
+ CLEANFILES=	${GENSRCS}

Deleted: tags/freebsd-libs/10.1~pre1-1/debian/patches/series
===================================================================
--- trunk/freebsd-libs/debian/patches/series	2014-08-27 21:42:18 UTC (rev 5506)
+++ tags/freebsd-libs/10.1~pre1-1/debian/patches/series	2014-08-31 19:15:04 UTC (rev 5509)
@@ -1,33 +0,0 @@
-# Patches from (or merged in) upstream
-svn_HEAD_Makefile.inc.diff
-libusb_handle_events_completed.diff
-empty_libusb_call_macro.diff
-
-# Patches that are in good shape for merging upstream
-
-# Other patches that might or might not be mergeable
-cdefs_macros.diff
-02_libcam.diff
-03_libsbuf.diff
-04_libkvm.diff
-05_libipx.diff
-08_libdevstat.diff
-09_libusbhid.diff
-10_memstat.diff
-11_netgraph.diff
-12_usb.diff
-13_jail.diff
-14_alias.diff
-sysconf_cpuset_size.diff
-libusb_backward.diff
-kvm_size_t_kludge.diff
-dwarf.diff
-elf.diff
-
-# Patches that are likely to be Debian-specific
-libusb_pthread_condattr_setclock.diff
-libbsd_nlist.diff
-assume_default_login_class.diff
-rlimit.diff
-libdwarf_off64_t.diff
-makefiles.diff

Copied: tags/freebsd-libs/10.1~pre1-1/debian/patches/series (from rev 5507, trunk/freebsd-libs/debian/patches/series)
===================================================================
--- tags/freebsd-libs/10.1~pre1-1/debian/patches/series	                        (rev 0)
+++ tags/freebsd-libs/10.1~pre1-1/debian/patches/series	2014-08-31 19:15:04 UTC (rev 5509)
@@ -0,0 +1,30 @@
+# Patches from (or merged in) upstream
+
+# Patches that are in good shape for merging upstream
+
+# Other patches that might or might not be mergeable
+cdefs_macros.diff
+02_libcam.diff
+03_libsbuf.diff
+04_libkvm.diff
+05_libipx.diff
+08_libdevstat.diff
+09_libusbhid.diff
+10_memstat.diff
+11_netgraph.diff
+12_usb.diff
+13_jail.diff
+14_alias.diff
+sysconf_cpuset_size.diff
+libusb_backward.diff
+kvm_size_t_kludge.diff
+dwarf.diff
+elf.diff
+
+# Patches that are likely to be Debian-specific
+libusb_pthread_condattr_setclock.diff
+libbsd_nlist.diff
+assume_default_login_class.diff
+rlimit.diff
+libdwarf_off64_t.diff
+makefiles.diff

Deleted: tags/freebsd-libs/10.1~pre1-1/debian/rules
===================================================================
--- trunk/freebsd-libs/debian/rules	2014-08-27 21:42:18 UTC (rev 5506)
+++ tags/freebsd-libs/10.1~pre1-1/debian/rules	2014-08-31 19:15:04 UTC (rev 5509)
@@ -1,315 +0,0 @@
-#!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-
-SHELL = bash
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-# This has to be exported to make some magic below work.
-export DH_OPTIONS
-
-full_version	:= $(shell dpkg-parsechangelog | grep ^Version: | sed -e 's/^.*: //g')
-tar_version	:= $(shell echo $(full_version) | sed -e 's/-.*//g')
-svn_revision	:= $(shell echo $(full_version) | sed -e 's/.*~svn\([0-9]*\)-[0-9]*/\1/g' -e 's/^$(full_version)$$/HEAD/g')
-version		:= $(shell echo $(full_version) | sed -e 's/[~+-].*//g')
-major		:= $(shell echo $(version) | sed -e 's/\..*//g')
-revision	:= $(shell echo $(full_version) | sed -e 's/^[^+-]*//g')
-
-CFLAGS = -Wall -g -pipe -fPIC -I. -I$(CURDIR)/sys -D_GNU_SOURCE \
-	-D__FreeBSD_version=__FreeBSD_kernel_version \
-	 -I/usr/include/freebsd \
-	 -Werror=implicit-function-declaration
-
-ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2
-endif
-
-ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
-	NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
-
-	# Do not mess with MAKEFLAGS until we transfer control to BSD make (see below)
-	BSD_MAKEFLAGS += -j$(NUMJOBS)
-endif
-
-SOURCE = freebsd-libs
-SVN		:= https://svn0.us-west.freebsd.org/base/release/$(version).0
-#SVN		:= https://svn0.us-west.freebsd.org/base/releng/$(version)
-#SVN		:= https://svn0.us-west.freebsd.org/base/stable/$(major)
-#SVN		:= https://svn0.us-west.freebsd.org/base/head
-ORIGDIR = $(SOURCE)-$(tar_version)
-TARNAME = $(SOURCE)_$(tar_version).orig.tar.gz
-
-PATH := /usr/lib/freebsd:$(PATH)
-DESTDIR = $(CURDIR)/debian/tmp
-CFLAGS += -I$(CURDIR)/debian/local/include
-PMAKE_COMMON = \
-	MAKEFLAGS=$(BSD_MAKEFLAGS) \
-	NO_WERROR=1 NOGCCERROR=1 \
-        NOSHARED=NO NO_SHARED=NO NO_PROFILE=1 DESTDIR=$(DESTDIR) \
-	SHLIB_MAJOR=0 \
-	bmake \
-	$(NULL)
-PMAKE = \
-	CFLAGS="$(CFLAGS)" \
-	$(PMAKE_COMMON)
-PMAKE_FOREIGN = \
-	CFLAGS="$(CFLAGS) -D__FREEBSD_GLUE_USE_EMBEDDED_HEADERS" \
-	$(PMAKE_COMMON)
-
-kernel = $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
-
-get-orig-source:
-	rm -rf $(ORIGDIR)
-	mkdir -p $(ORIGDIR)/share/misc
-	mkdir -p $(ORIGDIR)/sys/kern
-	mkdir -p $(ORIGDIR)/sys/sys \
-		$(ORIGDIR)/sys/netipx
-	for i in lib/libcam lib/libdevstat lib/libgeom lib/libipx \
-		lib/libelf \
-		lib/libdwarf \
-	         lib/libkiconv lib/libnetgraph lib/libjail \
-	         lib/libkvm lib/libmemstat lib/libsbuf lib/libusb \
-	         lib/libusbhid sys/cam \
-		lib/libutil \
-		lib/libalias sys/netinet/libalias sys/modules/libalias \
-		lib/Makefile.inc \
-	         sys/kern/subr_sbuf.c \
-	         sys/sys/sbuf.h \
-		sys/netipx/ipx.h \
-	         share/misc/usb_hid_usages ; do \
-	    svn export -r $(svn_revision) $(SVN)/$$i $(ORIGDIR)/$$i ; \
-	done
-	# Remove unused files with non GPL compatible license (eg BSD 4 clauses)
-	rm -f $(ORIGDIR)/sys/cam/scsi/scsi_ch.*
-	rm -f $(ORIGDIR)/lib/libkvm/kvm_ia64.c
-	rm -f $(ORIGDIR)/lib/libkvm/kvm_powerpc.c
-
-	# Remove all CAM kernel headers to ensure system-wide version is used instead
-	find $(ORIGDIR)/sys/cam -name \*.h | xargs rm -f
-
-	tar --numeric-owner --owner 0 --group 0 -czf ../$(TARNAME) $(ORIGDIR)
-	rm -rf $(ORIGDIR)
-
-BUILD_ARCH_TARGETS = \
-	build-sbuf \
-	build-dwarf \
-	build-elf \
-	build-util \
-	build-ipx \
-	$(NULL)
-
-ifeq ($(kernel), kfreebsd)
-BUILD_ARCH_TARGETS += \
-	build-cam \
-	build-geom \
-	build-kiconv \
-	build-kvm \
-	build-usbhid \
-	build-usb \
-	build-devstat \
-	build-memstat \
-	build-netgraph \
-	build-jail \
-	build-alias
-endif
-
-build: build-indep build-arch
-build-indep:
-build-arch: $(BUILD_ARCH_TARGETS)
-
-build-cam: build-cam-stamp
-build-cam-stamp: build-sbuf
-	$(PMAKE) -C $(CURDIR)/lib/libcam SHLIBDIR=./
-	touch $@
-
-build-geom: build-geom-stamp
-build-geom-stamp: build-sbuf
-	$(PMAKE) -C $(CURDIR)/lib/libgeom SHLIBDIR=./
-	touch $@
-
-build-netgraph: build-netgraph-stamp
-build-netgraph-stamp:
-	$(PMAKE) -C $(CURDIR)/lib/libnetgraph SHLIBDIR=./
-	touch $@
-
-build-ipx: build-ipx-stamp
-build-ipx-stamp:
-	$(PMAKE) -C $(CURDIR)/lib/libipx SHLIBDIR=./
-	touch $@
-
-build-kiconv: build-kiconv-stamp
-build-kiconv-stamp:
-	$(PMAKE) -C $(CURDIR)/lib/libkiconv SHLIBDIR=./
-	touch $@
-
-build-kvm: build-kvm-stamp
-build-kvm-stamp:
-	$(PMAKE) -C $(CURDIR)/lib/libkvm SHLIBDIR=./
-	touch $@
-
-build-devstat: build-devstat-stamp
-build-devstat-stamp: build-kvm
-	$(PMAKE) -C $(CURDIR)/lib/libdevstat SHLIBDIR=./
-	touch $@
-
-build-elf: build-elf-stamp
-build-elf-stamp:
-	$(PMAKE_FOREIGN) -C $(CURDIR)/lib/libelf SHLIBDIR=./
-	touch $@
-
-build-dwarf: build-dwarf-stamp
-build-dwarf-stamp: build-elf
-	$(PMAKE_FOREIGN) -C $(CURDIR)/lib/libdwarf SHLIBDIR=./
-	touch $@
-
-build-memstat: build-memstat-stamp
-build-memstat-stamp: build-kvm
-	$(PMAKE) -C $(CURDIR)/lib/libmemstat SHLIBDIR=./
-	touch $@
-
-build-sbuf: build-sbuf-stamp
-build-sbuf-stamp:
-	$(PMAKE_FOREIGN) -C $(CURDIR)/lib/libsbuf SHLIBDIR=./
-	touch $@
-
-build-usbhid: build-usbhid-stamp
-build-usbhid-stamp:
-	$(PMAKE) -C $(CURDIR)/lib/libusbhid SHLIBDIR=./
-	touch $@
-
-build-usb: build-usb-stamp
-build-usb-stamp:
-	$(PMAKE) -C $(CURDIR)/lib/libusb SHLIBDIR=./
-	touch $@
-
-build-util: build-util-stamp
-build-util-stamp:
-	$(PMAKE) -C $(CURDIR)/lib/libutil SHLIBDIR=./
-	touch $@
-
-build-jail: build-jail-stamp
-build-jail-stamp:
-	$(PMAKE) -C $(CURDIR)/lib/libjail SHLIBDIR=./
-	touch $@
-
-build-alias: build-alias-stamp
-build-alias-stamp:
-	$(PMAKE) -C $(CURDIR)/lib/libalias SHLIBDIR=./
-	touch $@
-
-clean:
-	dh_testdir
-	dh_testroot
-	$(PMAKE) -C $(CURDIR)/lib/libsbuf clean
-	$(PMAKE) -C $(CURDIR)/lib/libdwarf clean
-	$(PMAKE) -C $(CURDIR)/lib/libelf clean
-	$(PMAKE) -C $(CURDIR)/lib/libutil clean
-ifeq ($(kernel), kfreebsd)
-	$(PMAKE) -C $(CURDIR)/lib/libcam clean
-	$(PMAKE) -C $(CURDIR)/lib/libnetgraph clean
-	$(PMAKE) -C $(CURDIR)/lib/libdevstat clean
-	$(PMAKE) -C $(CURDIR)/lib/libmemstat clean
-	$(PMAKE) -C $(CURDIR)/lib/libgeom clean
-	$(PMAKE) -C $(CURDIR)/lib/libipx clean
-	$(PMAKE) -C $(CURDIR)/lib/libkiconv clean
-	$(PMAKE) -C $(CURDIR)/lib/libkvm clean
-	$(PMAKE) -C $(CURDIR)/lib/libusbhid clean
-	$(PMAKE) -C $(CURDIR)/lib/libusb clean
-	$(PMAKE) -C $(CURDIR)/lib/libjail clean
-	$(PMAKE) -C $(CURDIR)/lib/libalias clean
-endif
-	rm -f *stamp
-	dh_clean
-
-install-indep: build-indep
-	dh_testdir
-	dh_testroot
-	dh_prep -i
-	dh_installdirs -i
-
-	mkdir -p $(DESTDIR)
-	dh_install -i --list-missing
-
-install-arch: build-arch
-	dh_testdir
-	dh_testroot
-	dh_prep -a
-	dh_installdirs -a
-
-	mkdir -p $(DESTDIR)/lib $(DESTDIR)/usr/lib $(DESTDIR)/usr/include $(DESTDIR)/usr/share/man/man3
-	$(PMAKE) -C $(CURDIR)/lib/libsbuf install SHLIBDIR=/lib
-	$(PMAKE) -C $(CURDIR)/lib/libdwarf install SHLIBDIR=/usr/lib
-	$(PMAKE) -C $(CURDIR)/lib/libelf install SHLIBDIR=/usr/lib
-	$(PMAKE) -C $(CURDIR)/lib/libutil install SHLIBDIR=/lib
-	$(PMAKE) -C $(CURDIR)/lib/libipx install SHLIBDIR=/lib
-ifeq ($(kernel), kfreebsd)
-	$(PMAKE) -C $(CURDIR)/lib/libcam install SHLIBDIR=/usr/lib
-	$(PMAKE) -C $(CURDIR)/lib/libgeom install SHLIBDIR=/lib
-	$(PMAKE) -C $(CURDIR)/lib/libkiconv install SHLIBDIR=/usr/lib
-	$(PMAKE) -C $(CURDIR)/lib/libkvm install SHLIBDIR=/lib
-	$(PMAKE) -C $(CURDIR)/lib/libdevstat install SHLIBDIR=/usr/lib
-	$(PMAKE) -C $(CURDIR)/lib/libmemstat install SHLIBDIR=/usr/lib
-	$(PMAKE) -C $(CURDIR)/lib/libnetgraph install SHLIBDIR=/usr/lib
-	$(PMAKE) -C $(CURDIR)/lib/libusbhid install SHLIBDIR=/usr/lib
-	$(PMAKE) -C $(CURDIR)/lib/libusb install SHLIBDIR=/lib
-	$(PMAKE) -C $(CURDIR)/lib/libjail install SHLIBDIR=/lib
-	$(PMAKE) -C $(CURDIR)/lib/libalias install SHLIBDIR=/usr/lib
-
-	mkdir -p $(CURDIR)/debian/tmp/usr/lib/pkgconfig
-	install -m644 debian/libusb*.pc $(CURDIR)/debian/tmp/usr/lib/pkgconfig
-	mkdir -p $(CURDIR)/debian/tmp/usr/bin
-	install -m755 debian/libusb-config $(CURDIR)/debian/tmp/usr/bin
-endif
-
-	dh_install -a --list-missing
-
-# Build architecture-independent files here.
-binary-indep: install-indep
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs -i
-	dh_installdocs -i
-	dh_link -i
-	dh_compress -i
-	dh_fixperms -i
-	dh_installdeb -i
-	dh_gencontrol -i
-	dh_md5sums -i
-	dh_builddeb -i
-
-# Build architecture-dependent files here.
-binary-arch: install-arch
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs -a
-	dh_installdocs -a
-#	dh_installexamples
-#	dh_installinit
-#	dh_installcron
-#	dh_installinfo
-#	dh_installman
-	dh_link -a
-	dh_strip -a
-	dh_compress -a
-	dh_fixperms -a
-#	dh_perl
-#	dh_python
-	dh_makeshlibs -a
-ifeq ($(kernel), kfreebsd)
-	dh_makeshlibs -plibgeom1 --add-udeb=libgeom1-udeb
-	dh_makeshlibs -plibipx2 --add-udeb=libipx2-udeb
-	dh_makeshlibs -plibsbuf6 --add-udeb=libsbuf6-udeb
-	dh_makeshlibs -plibusb3 --add-udeb=libusb3-udeb
-endif
-	dh_installdeb -a
-	dh_shlibdeps -a
-	dh_gencontrol -a
-	dh_md5sums -a
-	dh_builddeb -a
-
-binary: binary-arch binary-indep
-.PHONY: build clean binary-indep binary-arch binary install configure

Copied: tags/freebsd-libs/10.1~pre1-1/debian/rules (from rev 5507, trunk/freebsd-libs/debian/rules)
===================================================================
--- tags/freebsd-libs/10.1~pre1-1/debian/rules	                        (rev 0)
+++ tags/freebsd-libs/10.1~pre1-1/debian/rules	2014-08-31 19:15:04 UTC (rev 5509)
@@ -0,0 +1,315 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+# Sample debian/rules that uses debhelper.
+
+SHELL = bash
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+# This has to be exported to make some magic below work.
+export DH_OPTIONS
+
+full_version	:= $(shell dpkg-parsechangelog | grep ^Version: | sed -e 's/^.*: //g')
+tar_version	:= $(shell echo $(full_version) | sed -e 's/-.*//g')
+svn_revision	:= $(shell echo $(full_version) | sed -e 's/.*~svn\([0-9]*\)-[0-9]*/\1/g' -e 's/^$(full_version)$$/HEAD/g')
+version		:= $(shell echo $(full_version) | sed -e 's/[~+-].*//g')
+major		:= $(shell echo $(version) | sed -e 's/\..*//g')
+revision	:= $(shell echo $(full_version) | sed -e 's/^[^+-]*//g')
+
+CFLAGS = -Wall -g -pipe -fPIC -I. -I$(CURDIR)/sys -D_GNU_SOURCE \
+	-D__FreeBSD_version=__FreeBSD_kernel_version \
+	 -I/usr/include/freebsd \
+	 -Werror=implicit-function-declaration
+
+ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
+	CFLAGS += -O0
+else
+	CFLAGS += -O2
+endif
+
+ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+	NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+
+	# Do not mess with MAKEFLAGS until we transfer control to BSD make (see below)
+	BSD_MAKEFLAGS += -j$(NUMJOBS)
+endif
+
+SOURCE = freebsd-libs
+#SVN		:= https://svn0.us-west.freebsd.org/base/release/$(version).0
+#SVN		:= https://svn0.us-west.freebsd.org/base/releng/$(version)
+SVN		:= https://svn0.us-west.freebsd.org/base/stable/$(major)
+#SVN		:= https://svn0.us-west.freebsd.org/base/head
+ORIGDIR = $(SOURCE)-$(tar_version)
+TARNAME = $(SOURCE)_$(tar_version).orig.tar.gz
+
+PATH := /usr/lib/freebsd:$(PATH)
+DESTDIR = $(CURDIR)/debian/tmp
+CFLAGS += -I$(CURDIR)/debian/local/include
+PMAKE_COMMON = \
+	MAKEFLAGS=$(BSD_MAKEFLAGS) \
+	NO_WERROR=1 NOGCCERROR=1 \
+        NOSHARED=NO NO_SHARED=NO NO_PROFILE=1 DESTDIR=$(DESTDIR) \
+	SHLIB_MAJOR=0 MK_TESTS=yes\
+	bmake \
+	$(NULL)
+PMAKE = \
+	CFLAGS="$(CFLAGS)" \
+	$(PMAKE_COMMON)
+PMAKE_FOREIGN = \
+	CFLAGS="$(CFLAGS) -D__FREEBSD_GLUE_USE_EMBEDDED_HEADERS" \
+	$(PMAKE_COMMON)
+
+kernel = $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
+
+get-orig-source:
+	rm -rf $(ORIGDIR)
+	mkdir -p $(ORIGDIR)/share/misc
+	mkdir -p $(ORIGDIR)/sys/kern
+	mkdir -p $(ORIGDIR)/sys/sys \
+		$(ORIGDIR)/sys/netipx
+	for i in lib/libcam lib/libdevstat lib/libgeom lib/libipx \
+		lib/libelf \
+		lib/libdwarf \
+	         lib/libkiconv lib/libnetgraph lib/libjail \
+	         lib/libkvm lib/libmemstat lib/libsbuf lib/libusb \
+	         lib/libusbhid sys/cam \
+		lib/libutil \
+		lib/libalias sys/netinet/libalias sys/modules/libalias \
+		lib/Makefile.inc \
+	         sys/kern/subr_sbuf.c \
+	         sys/sys/sbuf.h \
+		sys/netipx/ipx.h \
+	         share/misc/usb_hid_usages ; do \
+	    svn export -r $(svn_revision) $(SVN)/$$i $(ORIGDIR)/$$i ; \
+	done
+	# Remove unused files with non GPL compatible license (eg BSD 4 clauses)
+	rm -f $(ORIGDIR)/sys/cam/scsi/scsi_ch.*
+	rm -f $(ORIGDIR)/lib/libkvm/kvm_ia64.c
+	rm -f $(ORIGDIR)/lib/libkvm/kvm_powerpc.c
+
+	# Remove all CAM kernel headers to ensure system-wide version is used instead
+	find $(ORIGDIR)/sys/cam -name \*.h | xargs rm -f
+
+	tar --numeric-owner --owner 0 --group 0 -czf ../$(TARNAME) $(ORIGDIR)
+	rm -rf $(ORIGDIR)
+
+BUILD_ARCH_TARGETS = \
+	build-sbuf \
+	build-dwarf \
+	build-elf \
+	build-util \
+	build-ipx \
+	$(NULL)
+
+ifeq ($(kernel), kfreebsd)
+BUILD_ARCH_TARGETS += \
+	build-cam \
+	build-geom \
+	build-kiconv \
+	build-kvm \
+	build-usbhid \
+	build-usb \
+	build-devstat \
+	build-memstat \
+	build-netgraph \
+	build-jail \
+	build-alias
+endif
+
+build: build-indep build-arch
+build-indep:
+build-arch: $(BUILD_ARCH_TARGETS)
+
+build-cam: build-cam-stamp
+build-cam-stamp: build-sbuf
+	$(PMAKE) -C $(CURDIR)/lib/libcam SHLIBDIR=./
+	touch $@
+
+build-geom: build-geom-stamp
+build-geom-stamp: build-sbuf
+	$(PMAKE) -C $(CURDIR)/lib/libgeom SHLIBDIR=./
+	touch $@
+
+build-netgraph: build-netgraph-stamp
+build-netgraph-stamp:
+	$(PMAKE) -C $(CURDIR)/lib/libnetgraph SHLIBDIR=./
+	touch $@
+
+build-ipx: build-ipx-stamp
+build-ipx-stamp:
+	$(PMAKE) -C $(CURDIR)/lib/libipx SHLIBDIR=./
+	touch $@
+
+build-kiconv: build-kiconv-stamp
+build-kiconv-stamp:
+	$(PMAKE) -C $(CURDIR)/lib/libkiconv SHLIBDIR=./
+	touch $@
+
+build-kvm: build-kvm-stamp
+build-kvm-stamp:
+	$(PMAKE) -C $(CURDIR)/lib/libkvm SHLIBDIR=./
+	touch $@
+
+build-devstat: build-devstat-stamp
+build-devstat-stamp: build-kvm
+	$(PMAKE) -C $(CURDIR)/lib/libdevstat SHLIBDIR=./
+	touch $@
+
+build-elf: build-elf-stamp
+build-elf-stamp:
+	$(PMAKE_FOREIGN) -C $(CURDIR)/lib/libelf SHLIBDIR=./
+	touch $@
+
+build-dwarf: build-dwarf-stamp
+build-dwarf-stamp: build-elf
+	$(PMAKE_FOREIGN) -C $(CURDIR)/lib/libdwarf SHLIBDIR=./
+	touch $@
+
+build-memstat: build-memstat-stamp
+build-memstat-stamp: build-kvm
+	$(PMAKE) -C $(CURDIR)/lib/libmemstat SHLIBDIR=./
+	touch $@
+
+build-sbuf: build-sbuf-stamp
+build-sbuf-stamp:
+	$(PMAKE_FOREIGN) -C $(CURDIR)/lib/libsbuf SHLIBDIR=./
+	touch $@
+
+build-usbhid: build-usbhid-stamp
+build-usbhid-stamp:
+	$(PMAKE) -C $(CURDIR)/lib/libusbhid SHLIBDIR=./
+	touch $@
+
+build-usb: build-usb-stamp
+build-usb-stamp:
+	$(PMAKE) -C $(CURDIR)/lib/libusb SHLIBDIR=./
+	touch $@
+
+build-util: build-util-stamp
+build-util-stamp:
+	$(PMAKE) -C $(CURDIR)/lib/libutil SHLIBDIR=./
+	touch $@
+
+build-jail: build-jail-stamp
+build-jail-stamp:
+	$(PMAKE) -C $(CURDIR)/lib/libjail SHLIBDIR=./
+	touch $@
+
+build-alias: build-alias-stamp
+build-alias-stamp:
+	$(PMAKE) -C $(CURDIR)/lib/libalias SHLIBDIR=./
+	touch $@
+
+clean:
+	dh_testdir
+	dh_testroot
+	$(PMAKE) -C $(CURDIR)/lib/libsbuf clean
+	$(PMAKE) -C $(CURDIR)/lib/libdwarf clean
+	$(PMAKE) -C $(CURDIR)/lib/libelf clean
+	$(PMAKE) -C $(CURDIR)/lib/libutil clean
+ifeq ($(kernel), kfreebsd)
+	$(PMAKE) -C $(CURDIR)/lib/libcam clean
+	$(PMAKE) -C $(CURDIR)/lib/libnetgraph clean
+	$(PMAKE) -C $(CURDIR)/lib/libdevstat clean
+	$(PMAKE) -C $(CURDIR)/lib/libmemstat clean
+	$(PMAKE) -C $(CURDIR)/lib/libgeom clean
+	$(PMAKE) -C $(CURDIR)/lib/libipx clean
+	$(PMAKE) -C $(CURDIR)/lib/libkiconv clean
+	$(PMAKE) -C $(CURDIR)/lib/libkvm clean
+	$(PMAKE) -C $(CURDIR)/lib/libusbhid clean
+	$(PMAKE) -C $(CURDIR)/lib/libusb clean
+	$(PMAKE) -C $(CURDIR)/lib/libjail clean
+	$(PMAKE) -C $(CURDIR)/lib/libalias clean
+endif
+	rm -f *stamp
+	dh_clean
+
+install-indep: build-indep
+	dh_testdir
+	dh_testroot
+	dh_prep -i
+	dh_installdirs -i
+
+	mkdir -p $(DESTDIR)
+	dh_install -i --list-missing
+
+install-arch: build-arch
+	dh_testdir
+	dh_testroot
+	dh_prep -a
+	dh_installdirs -a
+
+	mkdir -p $(DESTDIR)/lib $(DESTDIR)/usr/lib $(DESTDIR)/usr/include $(DESTDIR)/usr/share/man/man3
+	$(PMAKE) -C $(CURDIR)/lib/libsbuf install SHLIBDIR=/lib
+	$(PMAKE) -C $(CURDIR)/lib/libdwarf install SHLIBDIR=/usr/lib
+	$(PMAKE) -C $(CURDIR)/lib/libelf install SHLIBDIR=/usr/lib
+	$(PMAKE) -C $(CURDIR)/lib/libutil install SHLIBDIR=/lib
+	$(PMAKE) -C $(CURDIR)/lib/libipx install SHLIBDIR=/lib
+ifeq ($(kernel), kfreebsd)
+	$(PMAKE) -C $(CURDIR)/lib/libcam install SHLIBDIR=/usr/lib
+	$(PMAKE) -C $(CURDIR)/lib/libgeom install SHLIBDIR=/lib
+	$(PMAKE) -C $(CURDIR)/lib/libkiconv install SHLIBDIR=/usr/lib
+	$(PMAKE) -C $(CURDIR)/lib/libkvm install SHLIBDIR=/lib
+	$(PMAKE) -C $(CURDIR)/lib/libdevstat install SHLIBDIR=/usr/lib
+	$(PMAKE) -C $(CURDIR)/lib/libmemstat install SHLIBDIR=/usr/lib
+	$(PMAKE) -C $(CURDIR)/lib/libnetgraph install SHLIBDIR=/usr/lib
+	$(PMAKE) -C $(CURDIR)/lib/libusbhid install SHLIBDIR=/usr/lib
+	$(PMAKE) -C $(CURDIR)/lib/libusb install SHLIBDIR=/lib
+	$(PMAKE) -C $(CURDIR)/lib/libjail install SHLIBDIR=/lib
+	$(PMAKE) -C $(CURDIR)/lib/libalias install SHLIBDIR=/usr/lib
+
+	mkdir -p $(CURDIR)/debian/tmp/usr/lib/pkgconfig
+	install -m644 debian/libusb*.pc $(CURDIR)/debian/tmp/usr/lib/pkgconfig
+	mkdir -p $(CURDIR)/debian/tmp/usr/bin
+	install -m755 debian/libusb-config $(CURDIR)/debian/tmp/usr/bin
+endif
+
+	dh_install -a --list-missing
+
+# Build architecture-independent files here.
+binary-indep: install-indep
+	dh_testdir
+	dh_testroot
+	dh_installchangelogs -i
+	dh_installdocs -i
+	dh_link -i
+	dh_compress -i
+	dh_fixperms -i
+	dh_installdeb -i
+	dh_gencontrol -i
+	dh_md5sums -i
+	dh_builddeb -i
+
+# Build architecture-dependent files here.
+binary-arch: install-arch
+	dh_testdir
+	dh_testroot
+	dh_installchangelogs -a
+	dh_installdocs -a
+#	dh_installexamples
+#	dh_installinit
+#	dh_installcron
+#	dh_installinfo
+#	dh_installman
+	dh_link -a
+	dh_strip -a
+	dh_compress -a
+	dh_fixperms -a
+#	dh_perl
+#	dh_python
+	dh_makeshlibs -a
+ifeq ($(kernel), kfreebsd)
+	dh_makeshlibs -plibgeom1 --add-udeb=libgeom1-udeb
+	dh_makeshlibs -plibipx2 --add-udeb=libipx2-udeb
+	dh_makeshlibs -plibsbuf6 --add-udeb=libsbuf6-udeb
+	dh_makeshlibs -plibusb3 --add-udeb=libusb3-udeb
+endif
+	dh_installdeb -a
+	dh_shlibdeps -a
+	dh_gencontrol -a
+	dh_md5sums -a
+	dh_builddeb -a
+
+binary: binary-arch binary-indep
+.PHONY: build clean binary-indep binary-arch binary install configure




More information about the Glibc-bsd-commits mailing list