[Glibc-bsd-commits] r4046 - in trunk/freebsd-libs/debian: . patches

Robert Millan rmh at alioth.debian.org
Tue Jan 31 18:55:25 UTC 2012


Author: rmh
Date: 2012-01-31 18:55:25 +0000 (Tue, 31 Jan 2012)
New Revision: 4046

Added:
   trunk/freebsd-libs/debian/libcam6.install
   trunk/freebsd-libs/debian/libcam6.symbols
   trunk/freebsd-libs/debian/libsbuf6-udeb.install
   trunk/freebsd-libs/debian/libsbuf6.install
   trunk/freebsd-libs/debian/libsbuf6.symbols
   trunk/freebsd-libs/debian/libusb2-dev.install
   trunk/freebsd-libs/debian/libusb2debian-udeb.install
   trunk/freebsd-libs/debian/libusb2debian.install
   trunk/freebsd-libs/debian/libusb2debian.symbols
   trunk/freebsd-libs/debian/libusbhid4debian.install
   trunk/freebsd-libs/debian/libusbhid4debian.symbols
   trunk/freebsd-libs/debian/patches/libusb_backward.diff
   trunk/freebsd-libs/debian/patches/makefile_inc.diff
   trunk/freebsd-libs/debian/patches/sysconf_cpuset_size.diff
Removed:
   trunk/freebsd-libs/debian/libcam0.install
   trunk/freebsd-libs/debian/libcam0.symbols
   trunk/freebsd-libs/debian/libsbuf0-udeb.install
   trunk/freebsd-libs/debian/libsbuf0.install
   trunk/freebsd-libs/debian/libsbuf0.symbols
   trunk/freebsd-libs/debian/libusb2-dev.install
   trunk/freebsd-libs/debian/libusb2-udeb.install
   trunk/freebsd-libs/debian/libusb2.install
   trunk/freebsd-libs/debian/libusb2.symbols
   trunk/freebsd-libs/debian/libusbhid4.install
   trunk/freebsd-libs/debian/libusbhid4.symbols
   trunk/freebsd-libs/debian/patches/00_sbuf_page_size.diff
   trunk/freebsd-libs/debian/patches/cpumask_t.diff
Modified:
   trunk/freebsd-libs/debian/changelog
   trunk/freebsd-libs/debian/control
   trunk/freebsd-libs/debian/libmemstat3.symbols
   trunk/freebsd-libs/debian/patches/01_sys_cam.diff
   trunk/freebsd-libs/debian/patches/02_libcam.diff
   trunk/freebsd-libs/debian/patches/03_libsbuf.diff
   trunk/freebsd-libs/debian/patches/04_libkvm.diff
   trunk/freebsd-libs/debian/patches/06_libgeom.diff
   trunk/freebsd-libs/debian/patches/07_libkiconv.diff
   trunk/freebsd-libs/debian/patches/08_libdevstat.diff
   trunk/freebsd-libs/debian/patches/09_libusbhid.diff
   trunk/freebsd-libs/debian/patches/10_memstat.diff
   trunk/freebsd-libs/debian/patches/12_usb.diff
   trunk/freebsd-libs/debian/patches/13_jail.diff
   trunk/freebsd-libs/debian/patches/14_alias.diff
   trunk/freebsd-libs/debian/patches/cdefs_macros.diff
   trunk/freebsd-libs/debian/patches/series
   trunk/freebsd-libs/debian/rules
Log:
New upstream release.

Modified: trunk/freebsd-libs/debian/changelog
===================================================================
--- trunk/freebsd-libs/debian/changelog	2012-01-31 18:54:58 UTC (rev 4045)
+++ trunk/freebsd-libs/debian/changelog	2012-01-31 18:55:25 UTC (rev 4046)
@@ -1,3 +1,9 @@
+freebsd-libs (9.0-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+
+ -- Robert Millan <rmh at debian.org>  Sun, 29 Jan 2012 13:19:31 +0100
+
 freebsd-libs (8.3~svn229725-3) unstable; urgency=low
 
   * Remove 15_kkh_kludge.diff, depend on recent k-k-h instead.

Modified: trunk/freebsd-libs/debian/control
===================================================================
--- trunk/freebsd-libs/debian/control	2012-01-31 18:54:58 UTC (rev 4045)
+++ trunk/freebsd-libs/debian/control	2012-01-31 18:55:25 UTC (rev 4046)
@@ -16,7 +16,7 @@
 Vcs-Svn: svn://svn.debian.org/glibc-bsd/trunk/freebsd-libs/
 Standards-Version: 3.9.2
 
-Package: libsbuf0
+Package: libsbuf6
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: FreeBSD string buffer library
@@ -24,7 +24,7 @@
  numerous functions such as append, copy, cat, print, trim whitespace
  characters, etc.
 
-Package: libsbuf0-udeb
+Package: libsbuf6-udeb
 Package-Type: udeb
 Section: debian-installer
 Architecture: kfreebsd-any
@@ -39,13 +39,13 @@
 Package: libsbuf-dev
 Section: libdevel
 Architecture: any
-Depends: libsbuf0 (= ${binary:Version}), ${misc:Depends}, libc0.1-dev | libc-dev
+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: libcam0
+Package: libcam6
 Architecture: kfreebsd-any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: FreeBSD CAM (Common Access Method) library
@@ -55,7 +55,7 @@
 Package: libcam-dev
 Section: libdevel
 Architecture: kfreebsd-any
-Depends: libcam0 (= ${binary:Version}), ${misc:Depends}, libc0.1-dev | libc-dev, libbsd-dev
+Depends: libcam6 (= ${binary:Version}), ${misc:Depends}, libc0.1-dev | libc-dev, libbsd-dev
 Description: Development files for libcam
  This package contains the header files and static library needed to
  compile applications that use libcam.
@@ -86,7 +86,7 @@
  .
  This is a minimal package for use in debian-installer.
 
-Package: libusbhid4
+Package: libusbhid4debian
 Architecture: kfreebsd-any
 Depends: libusbhid-common (>= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}
 Description: FreeBSD library to access USB HID devices
@@ -111,12 +111,12 @@
 Package: libusbhid-dev
 Section: libdevel
 Architecture: kfreebsd-any
-Depends: libusbhid4 (= ${binary:Version}), ${misc:Depends}, libc0.1-dev | libc-dev, libbsd-dev
+Depends: libusbhid4debian (= ${binary:Version}), ${misc:Depends}, libc0.1-dev | libc-dev, libbsd-dev
 Description: Development files for libusbhid
  This package contains the header files and static library needed to
  compile applications that use libusbhid.
 
-Package: libusb2
+Package: libusb2debian
 Architecture: kfreebsd-any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: FreeBSD userspace USB programming library
@@ -126,7 +126,7 @@
 Package: libusb2-dev
 Section: libdevel
 Architecture: kfreebsd-any
-Depends: libusb2 (= ${binary:Version}), ${misc:Depends}, libc0.1-dev | libc-dev, libbsd-dev
+Depends: libusb2debian (= ${binary:Version}), ${misc:Depends}, libc0.1-dev | libc-dev, libbsd-dev
 Provides: libusb-1.0-0-dev
 Conflicts: libusb-dev
 Description: Development files for libusb2
@@ -136,7 +136,7 @@
  It should be API compatible with both libusb-1.0 and libusb-0.1
  used on Linux.
 
-Package: libusb2-udeb
+Package: libusb2debian-udeb
 Package-Type: udeb
 Section: debian-installer
 Architecture: kfreebsd-any

Deleted: trunk/freebsd-libs/debian/libcam0.install
===================================================================
--- trunk/freebsd-libs/debian/libcam0.install	2012-01-31 18:54:58 UTC (rev 4045)
+++ trunk/freebsd-libs/debian/libcam0.install	2012-01-31 18:55:25 UTC (rev 4046)
@@ -1 +0,0 @@
-usr/lib/libcam*.so.*

Deleted: trunk/freebsd-libs/debian/libcam0.symbols
===================================================================
--- trunk/freebsd-libs/debian/libcam0.symbols	2012-01-31 18:54:58 UTC (rev 4045)
+++ trunk/freebsd-libs/debian/libcam0.symbols	2012-01-31 18:55:25 UTC (rev 4046)
@@ -1,113 +0,0 @@
-libcam.so.0 libcam0 #MINVER#
- ata_28bit_cmd at Base 8.2
- ata_48bit_cmd at Base 8.2
- ata_bpack at Base 8.2
- ata_bswap at Base 8.2
- ata_btrim at Base 8.2
- ata_cmd_string at Base 8.2
- ata_command_sbuf at Base 8.2
- ata_identify_match at Base 8.2
- ata_logical_sector_offset at Base 8.2
- ata_logical_sector_size at Base 8.2
- ata_max_mode at Base 8.2
- ata_max_pmode at Base 8.2
- ata_max_umode at Base 8.2
- ata_max_wmode at Base 8.2
- ata_mode2speed at Base 8.2
- ata_mode2string at Base 8.2
- ata_ncq_cmd at Base 8.2
- ata_op_string at Base 8.2
- ata_physical_sector_size at Base 8.2
- ata_pm_read_cmd at Base 8.2
- ata_pm_write_cmd at Base 8.2
- ata_print_ident at Base 8.2
- ata_res_sbuf at Base 8.2
- ata_res_string at Base 8.2
- ata_reset_cmd at Base 8.2
- ata_revision2speed at Base 8.2
- ata_speed2revision at Base 8.2
- ata_static_identify_match at Base 8.2
- ata_status_sbuf at Base 8.2
- ata_string2mode at Base 8.2
- ata_version at Base 8.2
- buff_decode at Base 7.0
- buff_decode_visit at Base 7.0
- buff_encode_visit at Base 7.0
- cam_calc_geometry at Base 7.0
- cam_close_device at Base 7.0
- cam_close_spec_device at Base 7.0
- cam_device_copy at Base 7.0
- cam_device_dup at Base 7.0
- cam_errbuf at Base 7.0
- cam_error_print at Base 7.0
- cam_error_string at Base 7.0
- cam_fetch_status_entry at Base 7.0
- cam_freeccb at Base 7.0
- cam_get_device at Base 7.0
- cam_getccb at Base 7.0
- cam_open_btl at Base 7.0
- cam_open_device at Base 7.0
- cam_open_pass at Base 7.0
- cam_open_spec_device at Base 7.0
- cam_path_string at Base 7.0
- cam_quirkmatch at Base 7.0
- cam_send_ccb at Base 7.0
- cam_status_table at Base 7.0
- cam_strmatch at Base 7.0
- cam_strvis at Base 7.0
- csio_build at Base 7.0
- csio_build_visit at Base 7.0
- csio_decode at Base 7.0
- csio_decode_visit at Base 7.0
- csio_encode at Base 7.0
- csio_encode_visit at Base 7.0
- num_cam_status_entries at Base 7.0
- scsi_calc_syncparam at Base 7.0
- scsi_calc_syncsrate at Base 7.0
- scsi_cdb_string at Base 7.0
- scsi_command_string at Base 7.0
- scsi_delay at Base 7.0
- scsi_erase at Base 7.0
- scsi_error_action at Base 7.0
- scsi_format_unit at Base 7.0
- scsi_inquiry at Base 7.0
- scsi_inquiry_match at Base 7.0
- scsi_load_unload at Base 7.0
- scsi_log_select at Base 7.0
- scsi_log_sense at Base 7.0
- scsi_mode_select at Base 7.0
- scsi_mode_select_len at Base 7.0
- scsi_mode_sense at Base 7.0
- scsi_mode_sense_len at Base 7.0
- scsi_op_desc at Base 7.0
- scsi_prevent at Base 7.0
- scsi_print_inquiry at Base 7.0
- scsi_read_block_limits at Base 7.0
- scsi_read_capacity at Base 7.0
- scsi_read_capacity_16 at Base 7.0
- scsi_read_position at Base 7.0
- scsi_read_write at Base 7.0
- scsi_report_luns at Base 7.0
- scsi_report_target_group at Base 8.2
- scsi_request_sense at Base 7.0
- scsi_reserve_release_unit at Base 7.0
- scsi_rewind at Base 7.0
- scsi_sa_read_write at Base 7.0
- scsi_sense_desc at Base 7.0
- scsi_sense_print at Base 7.0
- scsi_sense_sbuf at Base 7.0
- scsi_sense_string at Base 7.0
- scsi_set_position at Base 7.0
- scsi_set_target_group at Base 8.2
- scsi_space at Base 7.0
- scsi_start_stop at Base 7.0
- scsi_static_inquiry_match at Base 7.0
- scsi_status_string at Base 7.0
- scsi_synchronize_cache at Base 7.0
- scsi_test_unit_ready at Base 7.0
- scsi_write_filemarks at Base 7.0
- (optional)asc_table_size at Base 7.0
- (optional)devmatchtable at Base 7.0
- (optional)sense_key_table at Base 7.0
- (optional)sense_key_table_size at Base 7.0
- (optional)sense_quirk_table_size at Base 7.0

Copied: trunk/freebsd-libs/debian/libcam6.install (from rev 3972, trunk/freebsd-libs/debian/libcam0.install)
===================================================================
--- trunk/freebsd-libs/debian/libcam6.install	                        (rev 0)
+++ trunk/freebsd-libs/debian/libcam6.install	2012-01-31 18:55:25 UTC (rev 4046)
@@ -0,0 +1 @@
+usr/lib/libcam*.so.*

Copied: trunk/freebsd-libs/debian/libcam6.symbols (from rev 3972, trunk/freebsd-libs/debian/libcam0.symbols)
===================================================================
--- trunk/freebsd-libs/debian/libcam6.symbols	                        (rev 0)
+++ trunk/freebsd-libs/debian/libcam6.symbols	2012-01-31 18:55:25 UTC (rev 4046)
@@ -0,0 +1,162 @@
+libcam.so.6 libcam6 #MINVER#
+ ata_28bit_cmd at Base 8.2
+ ata_48bit_cmd at Base 8.2
+ ata_bpack at Base 8.2
+ ata_bswap at Base 8.2
+ ata_btrim at Base 8.2
+ ata_cmd_string at Base 8.2
+ ata_command_sbuf at Base 8.2
+ ata_identify_match at Base 8.2
+ ata_logical_sector_offset at Base 8.2
+ ata_logical_sector_size at Base 8.2
+ ata_max_mode at Base 8.2
+ ata_max_pmode at Base 8.2
+ ata_max_umode at Base 8.2
+ ata_max_wmode at Base 8.2
+ ata_mode2speed at Base 8.2
+ ata_mode2string at Base 8.2
+ ata_ncq_cmd at Base 8.2
+ ata_op_string at Base 8.2
+ ata_physical_sector_size at Base 8.2
+ ata_pm_read_cmd at Base 8.2
+ ata_pm_write_cmd at Base 8.2
+ ata_print_ident at Base 8.2
+ ata_res_sbuf at Base 8.2
+ ata_res_string at Base 8.2
+ ata_reset_cmd at Base 8.2
+ ata_revision2speed at Base 8.2
+ ata_speed2revision at Base 8.2
+ ata_static_identify_match at Base 8.2
+ ata_status_sbuf at Base 8.2
+ ata_string2mode at Base 8.2
+ ata_version at Base 8.2
+ buff_decode at Base 7.0
+ buff_decode_visit at Base 7.0
+ buff_encode_visit at Base 7.0
+ cam_calc_geometry at Base 7.0
+ cam_close_device at Base 7.0
+ cam_close_spec_device at Base 7.0
+ cam_device_copy at Base 7.0
+ cam_device_dup at Base 7.0
+ cam_errbuf at Base 7.0
+ cam_error_print at Base 7.0
+ cam_error_string at Base 7.0
+ cam_fetch_status_entry at Base 7.0
+ cam_freeccb at Base 7.0
+ cam_get_device at Base 7.0
+ cam_getccb at Base 7.0
+ cam_open_btl at Base 7.0
+ cam_open_device at Base 7.0
+ cam_open_pass at Base 7.0
+ cam_open_spec_device at Base 7.0
+ cam_path_string at Base 7.0
+ cam_quirkmatch at Base 7.0
+ cam_send_ccb at Base 7.0
+ cam_status_table at Base 7.0
+ cam_strmatch at Base 7.0
+ cam_strvis at Base 7.0
+ csio_build at Base 7.0
+ csio_build_visit at Base 7.0
+ csio_decode at Base 7.0
+ csio_decode_visit at Base 7.0
+ csio_encode at Base 7.0
+ csio_encode_visit at Base 7.0
+ num_cam_status_entries at Base 7.0
+ scsi_block_sbuf at Base 9.0-1
+ scsi_calc_syncparam at Base 7.0
+ scsi_calc_syncsrate at Base 7.0
+ scsi_cdb_string at Base 7.0
+ scsi_command_sbuf at Base 9.0-1
+ scsi_command_string at Base 7.0
+ scsi_delay at Base 7.0
+ scsi_desc_iterate at Base 9.0-1
+ scsi_devid_is_naa_ieee_reg at Base 9.0-1
+ scsi_devid_is_sas_target at Base 9.0-1
+ scsi_devid_match at Base 9.0-1
+ scsi_erase at Base 7.0
+ scsi_error_action at Base 7.0
+ scsi_extract_sense at Base 9.0-1
+ scsi_extract_sense_len at Base 9.0-1
+ scsi_find_desc at Base 9.0-1
+ scsi_format_unit at Base 7.0
+ scsi_fru_sbuf at Base 9.0-1
+ scsi_get_asc at Base 9.0-1
+ scsi_get_ascq at Base 9.0-1
+ scsi_get_block_info at Base 9.0-1
+ scsi_get_devid at Base 9.0-1
+ scsi_get_sense_info at Base 9.0-1
+ scsi_get_sense_key at Base 9.0-1
+ scsi_get_sks at Base 9.0-1
+ scsi_get_stream_info at Base 9.0-1
+ scsi_info_sbuf at Base 9.0-1
+ scsi_inquiry at Base 7.0
+ scsi_inquiry_match at Base 7.0
+ scsi_load_unload at Base 7.0
+ scsi_log_select at Base 7.0
+ scsi_log_sense at Base 7.0
+ scsi_mode_select at Base 7.0
+ scsi_mode_select_len at Base 7.0
+ scsi_mode_sense at Base 7.0
+ scsi_mode_sense_len at Base 7.0
+ scsi_op_desc at Base 7.0
+ scsi_prevent at Base 7.0
+ scsi_progress_sbuf at Base 9.0-1
+ scsi_print_inquiry at Base 7.0
+ scsi_read_block_limits at Base 7.0
+ scsi_read_capacity at Base 7.0
+ scsi_read_capacity_16 at Base 7.0
+ scsi_read_position at Base 7.0
+ scsi_read_write at Base 7.0
+ scsi_receive_diagnostic_results at Base 9.0-1
+ scsi_report_luns at Base 7.0
+ scsi_report_target_group at Base 8.2
+ scsi_request_sense at Base 7.0
+ scsi_reserve_release_unit at Base 7.0
+ scsi_rewind at Base 7.0
+ scsi_sa_read_write at Base 7.0
+ scsi_send_diagnostic at Base 9.0-1
+ scsi_sense_block_sbuf at Base 9.0-1
+ scsi_sense_command_sbuf at Base 9.0-1
+ scsi_sense_desc at Base 7.0
+ scsi_sense_desc_sbuf at Base 9.0-1
+ scsi_sense_fru_sbuf at Base 9.0-1
+ scsi_sense_generic_sbuf at Base 9.0-1
+ scsi_sense_info_sbuf at Base 9.0-1
+ scsi_sense_only_sbuf at Base 9.0-1
+ scsi_sense_print at Base 7.0
+ scsi_sense_printers at Base 9.0-1
+ scsi_sense_progress_sbuf at Base 9.0-1
+ scsi_sense_sbuf at Base 7.0
+ scsi_sense_sks_sbuf at Base 9.0-1
+ scsi_sense_stream_sbuf at Base 9.0-1
+ scsi_sense_string at Base 7.0
+ scsi_sense_type at Base 9.0-1
+ scsi_set_position at Base 7.0
+ scsi_set_sense_data at Base 9.0-1
+ scsi_set_sense_data_va at Base 9.0-1
+ scsi_set_target_group at Base 8.2
+ scsi_sks_sbuf at Base 9.0-1
+ scsi_space at Base 7.0
+ scsi_start_stop at Base 7.0
+ scsi_static_inquiry_match at Base 7.0
+ scsi_status_string at Base 7.0
+ scsi_stream_sbuf at Base 9.0-1
+ scsi_synchronize_cache at Base 7.0
+ scsi_test_unit_ready at Base 7.0
+ scsi_write_filemarks at Base 7.0
+ (optional)asc_table_size at Base 7.0
+ (optional)sense_key_table at Base 7.0
+ (optional)sense_key_table_size at Base 7.0
+ (optional)sense_quirk_table_size at Base 7.0
+ smp_cmd_table at Base 9.0-1
+ smp_command_decode at Base 9.0-1
+ smp_command_desc at Base 9.0-1
+ smp_command_sbuf at Base 9.0-1
+ smp_discover at Base 9.0-1
+ smp_error_desc at Base 9.0-1
+ smp_error_sbuf at Base 9.0-1
+ smp_phy_control at Base 9.0-1
+ smp_report_general at Base 9.0-1
+ smp_report_general_sbuf at Base 9.0-1
+ smp_report_manuf_info at Base 9.0-1
+ smp_report_manuf_info_sbuf at Base 9.0-1

Modified: trunk/freebsd-libs/debian/libmemstat3.symbols
===================================================================
--- trunk/freebsd-libs/debian/libmemstat3.symbols	2012-01-31 18:54:58 UTC (rev 4045)
+++ trunk/freebsd-libs/debian/libmemstat3.symbols	2012-01-31 18:55:25 UTC (rev 4046)
@@ -24,6 +24,7 @@
  memstat_get_percpu_sizemask at Base 7.1
  memstat_get_size at Base 7.1
  memstat_get_sizemask at Base 7.1
+ memstat_get_sleeps at Base 9.0-1
  memstat_get_zonefree at Base 7.1
  memstat_kvm_all at Base 7.1
  memstat_kvm_malloc at Base 7.1

Deleted: trunk/freebsd-libs/debian/libsbuf0-udeb.install
===================================================================
--- trunk/freebsd-libs/debian/libsbuf0-udeb.install	2012-01-31 18:54:58 UTC (rev 4045)
+++ trunk/freebsd-libs/debian/libsbuf0-udeb.install	2012-01-31 18:55:25 UTC (rev 4046)
@@ -1 +0,0 @@
-lib/libsbuf*.so.*

Deleted: trunk/freebsd-libs/debian/libsbuf0.install
===================================================================
--- trunk/freebsd-libs/debian/libsbuf0.install	2012-01-31 18:54:58 UTC (rev 4045)
+++ trunk/freebsd-libs/debian/libsbuf0.install	2012-01-31 18:55:25 UTC (rev 4046)
@@ -1 +0,0 @@
-lib/libsbuf*.so.*

Deleted: trunk/freebsd-libs/debian/libsbuf0.symbols
===================================================================
--- trunk/freebsd-libs/debian/libsbuf0.symbols	2012-01-31 18:54:58 UTC (rev 4045)
+++ trunk/freebsd-libs/debian/libsbuf0.symbols	2012-01-31 18:55:25 UTC (rev 4046)
@@ -1,19 +0,0 @@
-libsbuf.so.0 libsbuf0 #MINVER#
- sbuf_bcat at Base 7.0
- sbuf_bcpy at Base 7.0
- sbuf_cat at Base 7.0
- sbuf_clear at Base 7.0
- sbuf_cpy at Base 7.0
- sbuf_data at Base 7.0
- sbuf_delete at Base 7.0
- sbuf_done at Base 7.0
- sbuf_finish at Base 7.0
- sbuf_len at Base 7.0
- sbuf_new at Base 7.0
- sbuf_overflowed at Base 7.0
- sbuf_printf at Base 7.0
- sbuf_putc at Base 7.0
- sbuf_set_drain at Base 8.3~
- sbuf_setpos at Base 7.0
- sbuf_trim at Base 7.0
- sbuf_vprintf at Base 7.0

Copied: trunk/freebsd-libs/debian/libsbuf6-udeb.install (from rev 3972, trunk/freebsd-libs/debian/libsbuf0-udeb.install)
===================================================================
--- trunk/freebsd-libs/debian/libsbuf6-udeb.install	                        (rev 0)
+++ trunk/freebsd-libs/debian/libsbuf6-udeb.install	2012-01-31 18:55:25 UTC (rev 4046)
@@ -0,0 +1 @@
+lib/libsbuf*.so.*

Copied: trunk/freebsd-libs/debian/libsbuf6.install (from rev 3972, trunk/freebsd-libs/debian/libsbuf0.install)
===================================================================
--- trunk/freebsd-libs/debian/libsbuf6.install	                        (rev 0)
+++ trunk/freebsd-libs/debian/libsbuf6.install	2012-01-31 18:55:25 UTC (rev 4046)
@@ -0,0 +1 @@
+lib/libsbuf*.so.*

Copied: trunk/freebsd-libs/debian/libsbuf6.symbols (from rev 3972, trunk/freebsd-libs/debian/libsbuf0.symbols)
===================================================================
--- trunk/freebsd-libs/debian/libsbuf6.symbols	                        (rev 0)
+++ trunk/freebsd-libs/debian/libsbuf6.symbols	2012-01-31 18:55:25 UTC (rev 4046)
@@ -0,0 +1,20 @@
+libsbuf.so.6 libsbuf6 #MINVER#
+ sbuf_bcat at FBSD_1.2 9.0-1
+ sbuf_bcpy at FBSD_1.2 9.0-1
+ sbuf_cat at FBSD_1.2 9.0-1
+ sbuf_clear at FBSD_1.2 9.0-1
+ sbuf_cpy at FBSD_1.2 9.0-1
+ sbuf_data at FBSD_1.2 9.0-1
+ sbuf_delete at FBSD_1.2 9.0-1
+ sbuf_done at FBSD_1.2 9.0-1
+ sbuf_error at FBSD_1.2 9.0-1
+ sbuf_finish at FBSD_1.2 9.0-1
+ sbuf_len at FBSD_1.2 9.0-1
+ sbuf_new at FBSD_1.2 9.0-1
+ sbuf_overflowed at FBSD_1.2 9.0-1
+ sbuf_printf at FBSD_1.2 9.0-1
+ sbuf_putc at FBSD_1.2 9.0-1
+ sbuf_set_drain at FBSD_1.2 9.0-1
+ sbuf_setpos at FBSD_1.2 9.0-1
+ sbuf_trim at FBSD_1.2 9.0-1
+ sbuf_vprintf at FBSD_1.2 9.0-1

Deleted: trunk/freebsd-libs/debian/libusb2-dev.install
===================================================================
--- trunk/freebsd-libs/debian/libusb2-dev.install	2012-01-31 18:54:58 UTC (rev 4045)
+++ trunk/freebsd-libs/debian/libusb2-dev.install	2012-01-31 18:55:25 UTC (rev 4046)
@@ -1,9 +0,0 @@
-usr/bin/libusb-config
-usr/lib/libusb.a
-usr/lib/libusb.so
-usr/lib/pkgconfig/libusb*.pc
-usr/include/usb.h
-usr/include/libusb*.h
-usr/share/man/man3/usb.3.gz
-usr/share/man/man3/libusb.3.gz
-usr/share/man/man3/libusb20.3.gz

Added: trunk/freebsd-libs/debian/libusb2-dev.install
===================================================================
--- trunk/freebsd-libs/debian/libusb2-dev.install	                        (rev 0)
+++ trunk/freebsd-libs/debian/libusb2-dev.install	2012-01-31 18:55:25 UTC (rev 4046)
@@ -0,0 +1,9 @@
+usr/bin/libusb-config
+usr/lib/libusb.a
+usr/lib/libusb.so
+usr/lib/pkgconfig/libusb*.pc
+usr/include/usb.h
+usr/include/libusb*.h
+usr/share/man/man3/usb.3.gz
+usr/share/man/man3/libusb.3.gz
+usr/share/man/man3/libusb20.3.gz

Deleted: trunk/freebsd-libs/debian/libusb2-udeb.install
===================================================================
--- trunk/freebsd-libs/debian/libusb2-udeb.install	2012-01-31 18:54:58 UTC (rev 4045)
+++ trunk/freebsd-libs/debian/libusb2-udeb.install	2012-01-31 18:55:25 UTC (rev 4046)
@@ -1 +0,0 @@
-lib/libusb.so.*

Deleted: trunk/freebsd-libs/debian/libusb2.install
===================================================================
--- trunk/freebsd-libs/debian/libusb2.install	2012-01-31 18:54:58 UTC (rev 4045)
+++ trunk/freebsd-libs/debian/libusb2.install	2012-01-31 18:55:25 UTC (rev 4046)
@@ -1 +0,0 @@
-lib/libusb.so.*

Deleted: trunk/freebsd-libs/debian/libusb2.symbols
===================================================================
--- trunk/freebsd-libs/debian/libusb2.symbols	2012-01-31 18:54:58 UTC (rev 4045)
+++ trunk/freebsd-libs/debian/libusb2.symbols	2012-01-31 18:55:25 UTC (rev 4046)
@@ -1,208 +0,0 @@
-libusb.so.2 libusb2 #MINVER#
- LIBUSB20_BOS_DESCRIPTOR_FORMAT at Base 8.3~
- LIBUSB20_CONFIG_DESC_FORMAT at Base 7.1
- LIBUSB20_CONTROL_SETUP_FORMAT at Base 7.1
- LIBUSB20_DEVICE_DESC_FORMAT at Base 7.1
- LIBUSB20_ENDPOINT_DESC_FORMAT at Base 7.1
- LIBUSB20_INTERFACE_DESC_FORMAT at Base 7.1
- LIBUSB20_SS_ENDPT_COMP_DESC_FORMAT at Base 8.3~
- LIBUSB20_SS_USB_DEVCAP_DESC_FORMAT at Base 8.3~
- LIBUSB20_USB_20_DEVCAP_DESC_FORMAT at Base 8.3~
- libusb20_be_add_dev_quirk at Base 7.1
- libusb20_be_alloc at Base 7.1
- libusb20_be_alloc_default at Base 7.1
- libusb20_be_alloc_linux at Base 7.1
- libusb20_be_alloc_ugen20 at Base 7.1
- libusb20_be_dequeue_device at Base 7.1
- libusb20_be_device_foreach at Base 7.1
- libusb20_be_enqueue_device at Base 7.1
- libusb20_be_free at Base 7.1
- libusb20_be_get_dev_quirk at Base 7.1
- libusb20_be_get_quirk_name at Base 7.1
- libusb20_be_get_template at Base 7.1
- libusb20_be_remove_dev_quirk at Base 7.1
- libusb20_be_set_template at Base 7.1
- libusb20_desc_foreach at Base 7.1
- libusb20_dev_alloc at Base 7.1
- libusb20_dev_alloc_config at Base 7.1
- libusb20_dev_check_connected at Base 7.1
- libusb20_dev_close at Base 7.1
- libusb20_dev_detach_kernel_driver at Base 7.1
- libusb20_dev_free at Base 7.1
- libusb20_dev_get_address at Base 7.1
- libusb20_dev_get_backend_name at Base 7.1
- libusb20_dev_get_bus_number at Base 7.1
- libusb20_dev_get_config_index at Base 7.1
- libusb20_dev_get_debug at Base 7.1
- libusb20_dev_get_desc at Base 7.1
- libusb20_dev_get_device_desc at Base 7.1
- libusb20_dev_get_fd at Base 7.1
- libusb20_dev_get_iface_desc at Base 7.1
- libusb20_dev_get_info at Base 7.1
- libusb20_dev_get_mode at Base 7.1
- libusb20_dev_get_parent_address at Base 8.3~
- libusb20_dev_get_parent_port at Base 8.3~
- libusb20_dev_get_power_mode at Base 7.1
- libusb20_dev_get_speed at Base 7.1
- libusb20_dev_kernel_driver_active at Base 7.1
- libusb20_dev_open at Base 7.1
- libusb20_dev_process at Base 7.1
- libusb20_dev_req_string_simple_sync at Base 7.1
- libusb20_dev_req_string_sync at Base 7.1
- libusb20_dev_request_sync at Base 7.1
- libusb20_dev_reset at Base 7.1
- libusb20_dev_set_alt_index at Base 7.1
- libusb20_dev_set_config_index at Base 7.1
- libusb20_dev_set_debug at Base 7.1
- libusb20_dev_set_power_mode at Base 7.1
- libusb20_dev_wait_process at Base 7.1
- libusb20_error_name at Base 8.3~
- libusb20_me_decode at Base 7.1
- libusb20_me_encode at Base 7.1
- libusb20_me_get_1 at Base 7.1
- libusb20_me_get_2 at Base 7.1
- libusb20_parse_config_desc at Base 7.1
- libusb20_strerror at Base 8.3~
- libusb20_tr_bulk_intr_sync at Base 7.1
- libusb20_tr_callback_wrapper at Base 7.1
- libusb20_tr_clear_stall_sync at Base 7.1
- libusb20_tr_close at Base 7.1
- libusb20_tr_drain at Base 7.1
- libusb20_tr_get_actual_frames at Base 7.1
- libusb20_tr_get_actual_length at Base 7.1
- libusb20_tr_get_length at Base 7.1
- libusb20_tr_get_max_frames at Base 7.1
- libusb20_tr_get_max_packet_length at Base 7.1
- libusb20_tr_get_max_total_length at Base 7.1
- libusb20_tr_get_pointer at Base 7.1
- libusb20_tr_get_priv_sc0 at Base 7.1
- libusb20_tr_get_priv_sc1 at Base 7.1
- libusb20_tr_get_status at Base 7.1
- libusb20_tr_get_time_complete at Base 7.1
- libusb20_tr_open at Base 7.1
- libusb20_tr_pending at Base 7.1
- libusb20_tr_set_buffer at Base 7.1
- libusb20_tr_set_callback at Base 7.1
- libusb20_tr_set_flags at Base 7.1
- libusb20_tr_set_length at Base 7.1
- libusb20_tr_set_priv_sc0 at Base 7.1
- libusb20_tr_set_priv_sc1 at Base 7.1
- libusb20_tr_set_timeout at Base 7.1
- libusb20_tr_set_total_frames at Base 7.1
- libusb20_tr_setup_bulk at Base 7.1
- libusb20_tr_setup_control at Base 7.1
- libusb20_tr_setup_intr at Base 7.1
- libusb20_tr_setup_isoc at Base 7.1
- libusb20_tr_start at Base 7.1
- libusb20_tr_stop at Base 7.1
- libusb20_tr_submit at Base 7.1
- libusb20_ugen20_backend at Base 7.1
- libusb_alloc_transfer at Base 7.1
- libusb_attach_kernel_driver at Base 7.1
- libusb_bulk_transfer at Base 7.1
- libusb_cancel_transfer at Base 7.1
- libusb_check_connected at Base 8.2
- libusb_claim_interface at Base 7.1
- libusb_clear_halt at Base 7.1
- libusb_close at Base 7.1
- libusb_control_transfer at Base 7.1
- libusb_control_transfer_get_data at Base 7.1
- libusb_control_transfer_get_setup at Base 7.1
- libusb_cpu_to_le16 at Base 7.1
- libusb_detach_kernel_driver at Base 7.1
- libusb_detach_kernel_driver_np at Base 8.2
- libusb_error_name at Base 8.3~
- libusb_event_handler_active at Base 7.1
- libusb_event_handling_ok at Base 7.1
- libusb_exit at Base 7.1
- libusb_fill_bulk_transfer at Base 7.1
- libusb_fill_control_setup at Base 7.1
- libusb_fill_control_transfer at Base 7.1
- libusb_fill_interrupt_transfer at Base 7.1
- libusb_fill_iso_transfer at Base 7.1
- libusb_free_bos_descriptor at Base 8.3~
- libusb_free_config_descriptor at Base 7.1
- libusb_free_device_list at Base 7.1
- libusb_free_ss_endpoint_comp at Base 8.3~
- libusb_free_transfer at Base 7.1
- libusb_get_active_config_descriptor at Base 7.1
- libusb_get_bus_number at Base 7.1
- libusb_get_config_descriptor at Base 7.1
- libusb_get_config_descriptor_by_value at Base 7.1
- libusb_get_configuration at Base 7.1
- libusb_get_descriptor at Base 7.1
- libusb_get_device at Base 7.1
- libusb_get_device_address at Base 7.1
- libusb_get_device_descriptor at Base 7.1
- libusb_get_device_list at Base 7.1
- libusb_get_device_speed at Base 8.3~
- libusb_get_driver at Base 8.2
- libusb_get_driver_np at Base 8.2
- libusb_get_iso_packet_buffer at Base 7.1
- libusb_get_iso_packet_buffer_simple at Base 7.1
- libusb_get_max_packet_size at Base 7.1
- libusb_get_next_timeout at Base 7.1
- libusb_get_pollfds at Base 7.1
- libusb_get_string_descriptor_ascii at Base 7.1
- libusb_handle_events at Base 7.1
- libusb_handle_events_locked at Base 7.1
- libusb_handle_events_timeout at Base 7.1
- libusb_init at Base 7.1
- libusb_interrupt_transfer at Base 7.1
- libusb_kernel_driver_active at Base 7.1
- libusb_le16_to_cpu at Base 7.1
- libusb_lock_events at Base 7.1
- libusb_lock_event_waiters at Base 7.1
- libusb_open at Base 7.1
- libusb_open_device_with_vid_pid at Base 7.1
- libusb_parse_bos_descriptor at Base 8.3~
- libusb_parse_ss_endpoint_comp at Base 8.3~
- libusb_ref_device at Base 7.1
- libusb_release_interface at Base 7.1
- libusb_reset_device at Base 7.1
- libusb_set_configuration at Base 7.1
- libusb_set_debug at Base 7.1
- libusb_set_interface_alt_setting at Base 7.1
- libusb_set_iso_packet_lengths at Base 7.1
- libusb_set_pollfd_notifiers at Base 7.1
- libusb_submit_transfer at Base 7.1
- libusb_strerror at Base 8.2
- libusb_try_lock_events at Base 7.1
- libusb_unlock_events at Base 7.1
- libusb_unlock_event_waiters at Base 7.1
- libusb_unref_device at Base 7.1
- libusb_wait_for_event at Base 7.1
- usbi_default_context at Base 7.1
- usb_bulk_read at Base 7.1
- usb_bulk_write at Base 7.1
- usb_busses at Base 7.1
- usb_check_connected at Base 8.2
- usb_claim_interface at Base 7.1
- usb_clear_halt at Base 7.1
- usb_close at Base 7.1
- usb_control_msg at Base 7.1
- usb_destroy_configuration at Base 7.1
- usb_detach_kernel_driver_np at Base 8.3~
- usb_device at Base 7.1
- usb_fetch_and_parse_descriptors at Base 7.1
- usb_find_busses at Base 7.1
- usb_find_devices at Base 7.1
- usb_get_busses at Base 7.1
- usb_get_descriptor at Base 7.1
- usb_get_descriptor_by_endpoint at Base 7.1
- usb_get_driver_np at Base 8.3~
- usb_get_string at Base 7.1
- usb_get_string_simple at Base 7.1
- usb_init at Base 7.1
- usb_interrupt_read at Base 7.1
- usb_interrupt_write at Base 7.1
- usb_open at Base 7.1
- usb_parse_configuration at Base 7.1
- usb_parse_descriptor at Base 7.1
- usb_release_interface at Base 7.1
- usb_reset at Base 7.1
- usb_resetep at Base 7.1
- usb_set_altinterface at Base 7.1
- usb_set_configuration at Base 7.1
- usb_set_debug at Base 7.1
- usb_strerror at Base 7.1

Copied: trunk/freebsd-libs/debian/libusb2debian-udeb.install (from rev 3972, trunk/freebsd-libs/debian/libusb2-udeb.install)
===================================================================
--- trunk/freebsd-libs/debian/libusb2debian-udeb.install	                        (rev 0)
+++ trunk/freebsd-libs/debian/libusb2debian-udeb.install	2012-01-31 18:55:25 UTC (rev 4046)
@@ -0,0 +1 @@
+lib/libusb.so.*

Copied: trunk/freebsd-libs/debian/libusb2debian.install (from rev 3972, trunk/freebsd-libs/debian/libusb2.install)
===================================================================
--- trunk/freebsd-libs/debian/libusb2debian.install	                        (rev 0)
+++ trunk/freebsd-libs/debian/libusb2debian.install	2012-01-31 18:55:25 UTC (rev 4046)
@@ -0,0 +1 @@
+lib/libusb.so.*

Copied: trunk/freebsd-libs/debian/libusb2debian.symbols (from rev 3972, trunk/freebsd-libs/debian/libusb2.symbols)
===================================================================
--- trunk/freebsd-libs/debian/libusb2debian.symbols	                        (rev 0)
+++ trunk/freebsd-libs/debian/libusb2debian.symbols	2012-01-31 18:55:25 UTC (rev 4046)
@@ -0,0 +1,200 @@
+libusb.so.2debian libusb2debian #MINVER#
+ LIBUSB20_CONFIG_DESC_FORMAT at Base 7.1
+ LIBUSB20_CONTROL_SETUP_FORMAT at Base 7.1
+ LIBUSB20_DEVICE_DESC_FORMAT at Base 7.1
+ LIBUSB20_ENDPOINT_DESC_FORMAT at Base 7.1
+ LIBUSB20_INTERFACE_DESC_FORMAT at Base 7.1
+ libusb20_be_add_dev_quirk at Base 7.1
+ libusb20_be_alloc at Base 7.1
+ libusb20_be_alloc_default at Base 7.1
+ libusb20_be_alloc_linux at Base 7.1
+ libusb20_be_alloc_ugen20 at Base 7.1
+ libusb20_be_dequeue_device at Base 7.1
+ libusb20_be_device_foreach at Base 7.1
+ libusb20_be_enqueue_device at Base 7.1
+ libusb20_be_free at Base 7.1
+ libusb20_be_get_dev_quirk at Base 7.1
+ libusb20_be_get_quirk_name at Base 7.1
+ libusb20_be_get_template at Base 7.1
+ libusb20_be_remove_dev_quirk at Base 7.1
+ libusb20_be_set_template at Base 7.1
+ libusb20_desc_foreach at Base 7.1
+ libusb20_dev_alloc at Base 7.1
+ libusb20_dev_alloc_config at Base 7.1
+ libusb20_dev_check_connected at Base 7.1
+ libusb20_dev_close at Base 7.1
+ libusb20_dev_detach_kernel_driver at Base 7.1
+ libusb20_dev_free at Base 7.1
+ libusb20_dev_get_address at Base 7.1
+ libusb20_dev_get_backend_name at Base 7.1
+ libusb20_dev_get_bus_number at Base 7.1
+ libusb20_dev_get_config_index at Base 7.1
+ libusb20_dev_get_debug at Base 7.1
+ libusb20_dev_get_desc at Base 7.1
+ libusb20_dev_get_device_desc at Base 7.1
+ libusb20_dev_get_fd at Base 7.1
+ libusb20_dev_get_iface_desc at Base 7.1
+ libusb20_dev_get_info at Base 7.1
+ libusb20_dev_get_mode at Base 7.1
+ libusb20_dev_get_parent_address at Base 8.3~
+ libusb20_dev_get_parent_port at Base 8.3~
+ libusb20_dev_get_power_mode at Base 7.1
+ libusb20_dev_get_speed at Base 7.1
+ libusb20_dev_kernel_driver_active at Base 7.1
+ libusb20_dev_open at Base 7.1
+ libusb20_dev_process at Base 7.1
+ libusb20_dev_req_string_simple_sync at Base 7.1
+ libusb20_dev_req_string_sync at Base 7.1
+ libusb20_dev_request_sync at Base 7.1
+ libusb20_dev_reset at Base 7.1
+ libusb20_dev_set_alt_index at Base 7.1
+ libusb20_dev_set_config_index at Base 7.1
+ libusb20_dev_set_debug at Base 7.1
+ libusb20_dev_set_power_mode at Base 7.1
+ libusb20_dev_wait_process at Base 7.1
+ libusb20_error_name at Base 8.3~
+ libusb20_me_decode at Base 7.1
+ libusb20_me_encode at Base 7.1
+ libusb20_me_get_1 at Base 7.1
+ libusb20_me_get_2 at Base 7.1
+ libusb20_parse_config_desc at Base 7.1
+ libusb20_strerror at Base 8.3~
+ libusb20_tr_bulk_intr_sync at Base 7.1
+ libusb20_tr_callback_wrapper at Base 7.1
+ libusb20_tr_clear_stall_sync at Base 7.1
+ libusb20_tr_close at Base 7.1
+ libusb20_tr_drain at Base 7.1
+ libusb20_tr_get_actual_frames at Base 7.1
+ libusb20_tr_get_actual_length at Base 7.1
+ libusb20_tr_get_length at Base 7.1
+ libusb20_tr_get_max_frames at Base 7.1
+ libusb20_tr_get_max_packet_length at Base 7.1
+ libusb20_tr_get_max_total_length at Base 7.1
+ libusb20_tr_get_pointer at Base 7.1
+ libusb20_tr_get_priv_sc0 at Base 7.1
+ libusb20_tr_get_priv_sc1 at Base 7.1
+ libusb20_tr_get_status at Base 7.1
+ libusb20_tr_get_time_complete at Base 7.1
+ libusb20_tr_open at Base 7.1
+ libusb20_tr_pending at Base 7.1
+ libusb20_tr_set_buffer at Base 7.1
+ libusb20_tr_set_callback at Base 7.1
+ libusb20_tr_set_flags at Base 7.1
+ libusb20_tr_set_length at Base 7.1
+ libusb20_tr_set_priv_sc0 at Base 7.1
+ libusb20_tr_set_priv_sc1 at Base 7.1
+ libusb20_tr_set_timeout at Base 7.1
+ libusb20_tr_set_total_frames at Base 7.1
+ libusb20_tr_setup_bulk at Base 7.1
+ libusb20_tr_setup_control at Base 7.1
+ libusb20_tr_setup_intr at Base 7.1
+ libusb20_tr_setup_isoc at Base 7.1
+ libusb20_tr_start at Base 7.1
+ libusb20_tr_stop at Base 7.1
+ libusb20_tr_submit at Base 7.1
+ libusb20_ugen20_backend at Base 7.1
+ libusb_alloc_transfer at Base 7.1
+ libusb_attach_kernel_driver at Base 7.1
+ libusb_bulk_transfer at Base 7.1
+ libusb_cancel_transfer at Base 7.1
+ libusb_check_connected at Base 8.2
+ libusb_claim_interface at Base 7.1
+ libusb_clear_halt at Base 7.1
+ libusb_close at Base 7.1
+ libusb_control_transfer at Base 7.1
+ libusb_control_transfer_get_data at Base 7.1
+ libusb_control_transfer_get_setup at Base 7.1
+ libusb_cpu_to_le16 at Base 7.1
+ libusb_detach_kernel_driver at Base 7.1
+ libusb_detach_kernel_driver_np at Base 8.2
+ libusb_error_name at Base 8.3~
+ libusb_event_handler_active at Base 7.1
+ libusb_event_handling_ok at Base 7.1
+ libusb_exit at Base 7.1
+ libusb_fill_bulk_transfer at Base 7.1
+ libusb_fill_control_setup at Base 7.1
+ libusb_fill_control_transfer at Base 7.1
+ libusb_fill_interrupt_transfer at Base 7.1
+ libusb_fill_iso_transfer at Base 7.1
+ libusb_free_config_descriptor at Base 7.1
+ libusb_free_device_list at Base 7.1
+ libusb_free_transfer at Base 7.1
+ libusb_get_active_config_descriptor at Base 7.1
+ libusb_get_bus_number at Base 7.1
+ libusb_get_config_descriptor at Base 7.1
+ libusb_get_config_descriptor_by_value at Base 7.1
+ libusb_get_configuration at Base 7.1
+ libusb_get_descriptor at Base 7.1
+ libusb_get_device at Base 7.1
+ libusb_get_device_address at Base 7.1
+ libusb_get_device_descriptor at Base 7.1
+ libusb_get_device_list at Base 7.1
+ libusb_get_device_speed at Base 8.3~
+ libusb_get_driver at Base 8.2
+ libusb_get_driver_np at Base 8.2
+ libusb_get_iso_packet_buffer at Base 7.1
+ libusb_get_iso_packet_buffer_simple at Base 7.1
+ libusb_get_max_packet_size at Base 7.1
+ libusb_get_next_timeout at Base 7.1
+ libusb_get_pollfds at Base 7.1
+ libusb_get_string_descriptor_ascii at Base 7.1
+ libusb_handle_events at Base 7.1
+ libusb_handle_events_locked at Base 7.1
+ libusb_handle_events_timeout at Base 7.1
+ libusb_init at Base 7.1
+ libusb_interrupt_transfer at Base 7.1
+ libusb_kernel_driver_active at Base 7.1
+ libusb_le16_to_cpu at Base 7.1
+ libusb_lock_events at Base 7.1
+ libusb_lock_event_waiters at Base 7.1
+ libusb_open at Base 7.1
+ libusb_open_device_with_vid_pid at Base 7.1
+ libusb_ref_device at Base 7.1
+ libusb_release_interface at Base 7.1
+ libusb_reset_device at Base 7.1
+ libusb_set_configuration at Base 7.1
+ libusb_set_debug at Base 7.1
+ libusb_set_interface_alt_setting at Base 7.1
+ libusb_set_iso_packet_lengths at Base 7.1
+ libusb_set_pollfd_notifiers at Base 7.1
+ libusb_submit_transfer at Base 7.1
+ libusb_strerror at Base 8.2
+ libusb_try_lock_events at Base 7.1
+ libusb_unlock_events at Base 7.1
+ libusb_unlock_event_waiters at Base 7.1
+ libusb_unref_device at Base 7.1
+ libusb_wait_for_event at Base 7.1
+ usbi_default_context at Base 7.1
+ usb_bulk_read at Base 7.1
+ usb_bulk_write at Base 7.1
+ usb_busses at Base 7.1
+ usb_check_connected at Base 8.2
+ usb_claim_interface at Base 7.1
+ usb_clear_halt at Base 7.1
+ usb_close at Base 7.1
+ usb_control_msg at Base 7.1
+ usb_destroy_configuration at Base 7.1
+ usb_detach_kernel_driver_np at Base 8.3~
+ usb_device at Base 7.1
+ usb_fetch_and_parse_descriptors at Base 7.1
+ usb_find_busses at Base 7.1
+ usb_find_devices at Base 7.1
+ usb_get_busses at Base 7.1
+ usb_get_descriptor at Base 7.1
+ usb_get_descriptor_by_endpoint at Base 7.1
+ usb_get_driver_np at Base 8.3~
+ usb_get_string at Base 7.1
+ usb_get_string_simple at Base 7.1
+ usb_init at Base 7.1
+ usb_interrupt_read at Base 7.1
+ usb_interrupt_write at Base 7.1
+ usb_open at Base 7.1
+ usb_parse_configuration at Base 7.1
+ usb_parse_descriptor at Base 7.1
+ usb_release_interface at Base 7.1
+ usb_reset at Base 7.1
+ usb_resetep at Base 7.1
+ usb_set_altinterface at Base 7.1
+ usb_set_configuration at Base 7.1
+ usb_set_debug at Base 7.1
+ usb_strerror at Base 7.1

Deleted: trunk/freebsd-libs/debian/libusbhid4.install
===================================================================
--- trunk/freebsd-libs/debian/libusbhid4.install	2012-01-31 18:54:58 UTC (rev 4045)
+++ trunk/freebsd-libs/debian/libusbhid4.install	2012-01-31 18:55:25 UTC (rev 4046)
@@ -1 +0,0 @@
-usr/lib/libusbhid*.so.*

Deleted: trunk/freebsd-libs/debian/libusbhid4.symbols
===================================================================
--- trunk/freebsd-libs/debian/libusbhid4.symbols	2012-01-31 18:54:58 UTC (rev 4045)
+++ trunk/freebsd-libs/debian/libusbhid4.symbols	2012-01-31 18:55:25 UTC (rev 4046)
@@ -1,20 +0,0 @@
-libusbhid.so.4 libusbhid4 #MINVER#
- hid_dispose_report_desc at Base 7.0
- hid_end_parse at Base 7.0
- hid_get_data at Base 7.0
- hid_get_item at Base 7.0
- hid_get_report at Base 8.3~
- hid_get_report_desc at Base 7.0
- hid_get_report_id at Base 7.1
- hid_init at Base 7.0
- hid_locate at Base 7.0
- hid_parse_usage_in_page at Base 7.0
- hid_parse_usage_page at Base 7.0
- hid_report_size at Base 7.0
- hid_set_data at Base 7.0
- hid_set_immed at Base 7.1
- hid_set_report at Base 8.3~
- hid_start_parse at Base 7.0
- hid_usage_in_page at Base 7.0
- hid_usage_page at Base 7.0
- hid_use_report_desc at Base 7.0

Copied: trunk/freebsd-libs/debian/libusbhid4debian.install (from rev 3972, trunk/freebsd-libs/debian/libusbhid4.install)
===================================================================
--- trunk/freebsd-libs/debian/libusbhid4debian.install	                        (rev 0)
+++ trunk/freebsd-libs/debian/libusbhid4debian.install	2012-01-31 18:55:25 UTC (rev 4046)
@@ -0,0 +1 @@
+usr/lib/libusbhid*.so.*

Copied: trunk/freebsd-libs/debian/libusbhid4debian.symbols (from rev 3972, trunk/freebsd-libs/debian/libusbhid4.symbols)
===================================================================
--- trunk/freebsd-libs/debian/libusbhid4debian.symbols	                        (rev 0)
+++ trunk/freebsd-libs/debian/libusbhid4debian.symbols	2012-01-31 18:55:25 UTC (rev 4046)
@@ -0,0 +1,18 @@
+libusbhid.so.4debian libusbhid4debian #MINVER#
+ hid_dispose_report_desc at Base 7.0
+ hid_end_parse at Base 7.0
+ hid_get_data at Base 7.0
+ hid_get_item at Base 7.0
+ hid_get_report_desc at Base 7.0
+ hid_get_report_id at Base 7.1
+ hid_init at Base 7.0
+ hid_locate at Base 7.0
+ hid_parse_usage_in_page at Base 7.0
+ hid_parse_usage_page at Base 7.0
+ hid_report_size at Base 7.0
+ hid_set_data at Base 7.0
+ hid_set_immed at Base 7.1
+ hid_start_parse at Base 7.0
+ hid_usage_in_page at Base 7.0
+ hid_usage_page at Base 7.0
+ hid_use_report_desc at Base 7.0

Deleted: trunk/freebsd-libs/debian/patches/00_sbuf_page_size.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/00_sbuf_page_size.diff	2012-01-31 18:54:58 UTC (rev 4045)
+++ trunk/freebsd-libs/debian/patches/00_sbuf_page_size.diff	2012-01-31 18:55:25 UTC (rev 4046)
@@ -1,17 +0,0 @@
---- a/sys/kern/subr_sbuf.c
-+++ b/sys/kern/subr_sbuf.c
-@@ -84,8 +84,14 @@
- #define	SBUF_CLEARFLAG(s, f)	do { (s)->s_flags &= ~(f); } while (0)
- 
- #define	SBUF_MINEXTENDSIZE	16		/* Should be power of 2. */
-+
-+#ifdef PAGE_SIZE
- #define	SBUF_MAXEXTENDSIZE	PAGE_SIZE
- #define	SBUF_MAXEXTENDINCR	PAGE_SIZE
-+#else
-+#define	SBUF_MAXEXTENDSIZE	4096
-+#define	SBUF_MAXEXTENDINCR	4096
-+#endif
- 
- /*
-  * Debugging support

Modified: trunk/freebsd-libs/debian/patches/01_sys_cam.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/01_sys_cam.diff	2012-01-31 18:54:58 UTC (rev 4045)
+++ trunk/freebsd-libs/debian/patches/01_sys_cam.diff	2012-01-31 18:55:25 UTC (rev 4046)
@@ -14,11 +14,11 @@
  #include <stdlib.h>
 +#include <stdint.h>
  #include <stdio.h>
+ #include <string.h>
  #include <camlib.h>
- #endif /* _KERNEL */
 --- a/sys/cam/cam_xpt.c
 +++ b/sys/cam/cam_xpt.c
-@@ -221,7 +221,7 @@
+@@ -230,7 +230,7 @@
  static void	 xpt_run_dev_allocq(struct cam_eb *bus);
  static void	 xpt_run_dev_sendq(struct cam_eb *bus);
  static timeout_t xpt_release_devq_timeout;
@@ -29,7 +29,7 @@
  		    u_int count, int run_queue);
 --- a/sys/cam/scsi/scsi_all.c
 +++ b/sys/cam/scsi/scsi_all.c
-@@ -41,6 +41,7 @@
+@@ -43,6 +43,7 @@
  #include <sys/sysctl.h>
  #else
  #include <errno.h>
@@ -39,7 +39,7 @@
  #include <string.h>
 --- a/sys/cam/scsi/scsi_all.h
 +++ b/sys/cam/scsi/scsi_all.h
-@@ -32,6 +32,8 @@
+@@ -33,6 +33,8 @@
   * bus reset.
   */
  extern int scsi_delay;

Modified: trunk/freebsd-libs/debian/patches/02_libcam.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/02_libcam.diff	2012-01-31 18:54:58 UTC (rev 4045)
+++ trunk/freebsd-libs/debian/patches/02_libcam.diff	2012-01-31 18:55:25 UTC (rev 4046)
@@ -1,7 +1,7 @@
 --- a/lib/libcam/Makefile
 +++ b/lib/libcam/Makefile
 @@ -6,8 +6,7 @@
- 		ata_all.c
+ 		ata_all.c smp_all.c
  INCS=		camlib.h
  
 -DPADD=		${LIBSBUF}

Modified: trunk/freebsd-libs/debian/patches/03_libsbuf.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/03_libsbuf.diff	2012-01-31 18:54:58 UTC (rev 4045)
+++ trunk/freebsd-libs/debian/patches/03_libsbuf.diff	2012-01-31 18:55:25 UTC (rev 4046)
@@ -1,12 +1,12 @@
 --- a/lib/libsbuf/Makefile
 +++ b/lib/libsbuf/Makefile
-@@ -4,6 +4,7 @@
- SHLIBDIR?= /lib
- SRCS=	subr_sbuf.c 
- WARNS?= 2
-+CFLAGS+= -I${.CURDIR}/../../sys
+@@ -3,6 +3,7 @@
+ LIB=		sbuf
+ SHLIBDIR?= 	/lib
+ SRCS=		subr_sbuf.c 
++CFLAGS+=	-I${.CURDIR}/../../sys
  
- .PATH:	${.CURDIR}/../../sys/kern
+ SHLIB_MAJOR	= 6
  
 --- a/sys/sys/sbuf.h
 +++ b/sys/sys/sbuf.h
@@ -19,4 +19,4 @@
 +#include <stdarg.h>
  
  struct sbuf;
- struct sbuf_drain_data;
+ typedef int (sbuf_drain_func)(void *, const char *, int);

Modified: trunk/freebsd-libs/debian/patches/04_libkvm.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/04_libkvm.diff	2012-01-31 18:54:58 UTC (rev 4045)
+++ trunk/freebsd-libs/debian/patches/04_libkvm.diff	2012-01-31 18:55:25 UTC (rev 4046)
@@ -23,11 +23,11 @@
  SHLIBDIR?= /lib
 -CFLAGS+=-DLIBC_SCCS -I${.CURDIR}
  
- .if ${MACHINE} == "sun4v"
- CFLAGS+=-DSUN4V
+ .if exists(${.CURDIR}/kvm_${MACHINE_ARCH}.c)
+ KVM_ARCH=${MACHINE_ARCH}
 --- a/lib/libkvm/kvm.c
 +++ b/lib/libkvm/kvm.c
-@@ -70,6 +70,10 @@
+@@ -71,6 +71,10 @@
  #include <strings.h>
  #include <unistd.h>
  
@@ -38,15 +38,15 @@
  #include "kvm_private.h"
  
  /* from src/lib/libc/gen/nlist.c */
-@@ -151,6 +155,7 @@
- 	char *errout;
+@@ -144,6 +148,7 @@
+ _kvm_open(kvm_t *kd, const char *uf, const char *mf, int flag, char *errout)
  {
  	struct stat st;
 +	static char name[MAXPATHLEN];
  
  	kd->vmfd = -1;
  	kd->pmfd = -1;
-@@ -160,8 +165,17 @@
+@@ -153,8 +158,17 @@
  	kd->argspc = 0;
  	kd->argv = 0;
  
@@ -66,24 +66,6 @@
  	else if (strlen(uf) >= MAXPATHLEN) {
  		_kvm_err(kd, kd->program, "exec file name too long");
  		goto failed;
-@@ -244,7 +258,7 @@
- kvm_openfiles(uf, mf, sf, flag, errout)
- 	const char *uf;
- 	const char *mf;
--	const char *sf __unused;
-+	const char *sf;
- 	int flag;
- 	char *errout;
- {
-@@ -262,7 +276,7 @@
- kvm_open(uf, mf, sf, flag, errstr)
- 	const char *uf;
- 	const char *mf;
--	const char *sf __unused;
-+	const char *sf;
- 	int flag;
- 	const char *errstr;
- {
 --- a/lib/libkvm/kvm_file.c
 +++ b/lib/libkvm/kvm_file.c
 @@ -59,7 +59,7 @@
@@ -95,15 +77,15 @@
  #include <paths.h>
  #include <stdlib.h>
  
-@@ -80,6 +80,7 @@
- 	int op, arg, nprocs;
- 	long allproc_o;
+@@ -78,6 +78,7 @@
+ kvm_deadfiles(kvm_t *kd, int op __unused, int arg __unused, long allproc_o,
+     int nprocs __unused)
  {
 +#if 0
  	struct proc proc;
  	struct filedesc filed;
  	int buflen = kd->arglen, ocnt = 0, n = 0, once = 0, i;
-@@ -151,6 +152,7 @@
+@@ -149,6 +150,7 @@
  	return (n);
  fail:
  	free(ofiles);
@@ -111,7 +93,7 @@
  	return (0);
  	
  }
-@@ -166,6 +168,7 @@
+@@ -161,6 +163,7 @@
  
  	_kvm_syserr(kd, kd->program, "kvm_getfiles has been broken for years");
  	return (0);
@@ -119,7 +101,7 @@
  	if (ISALIVE(kd)) {
  		size = 0;
  		mib[0] = CTL_KERN;
-@@ -228,4 +231,6 @@
+@@ -223,4 +226,6 @@
  	}
  	*cnt = nfiles;
  	return (kd->argspc);
@@ -128,47 +110,22 @@
  }
 --- a/lib/libkvm/kvm_getloadavg.c
 +++ b/lib/libkvm/kvm_getloadavg.c
-@@ -44,15 +44,21 @@
- #include <limits.h>
- #include <nlist.h>
- #include <kvm.h>
-+#include <sys/_types.h>
+@@ -55,6 +55,12 @@
+ 	{ .n_name = "" },
+ };
  
- #include "kvm_private.h"
- 
- static struct nlist nl[] = {
--	{ "_averunnable" },
-+	{ { "_averunnable" } },
- #define	X_AVERUNNABLE	0
--	{ "_fscale" },
-+	{ { "_fscale" } },
- #define	X_FSCALE	1
--	{ "" },
-+	{ { "" } },
-+};
-+
++#include <sys/_types.h>
 +struct loadavg {
 +	__fixpt_t       ldavg[3];
 +	long            fscale;
- };
- 
++};
++
  /*
+  * kvm_getloadavg() -- Get system load averages, from live or dead kernels.
+  *
 --- a/lib/libkvm/kvm_getswapinfo.c
 +++ b/lib/libkvm/kvm_getswapinfo.c
-@@ -51,9 +51,9 @@
- #include "kvm_private.h"
- 
- static struct nlist kvm_swap_nl[] = {
--	{ "_swtailq" },		/* list of swap devices and sizes */
--	{ "_dmmax" },		/* maximum size of a swap block */
--	{ NULL }
-+	{ { "_swtailq" } },		/* list of swap devices and sizes */
-+	{ { "_dmmax" } },		/* maximum size of a swap block */
-+	{ { NULL } }
- };
- 
- #define NL_SWTAILQ	0
-@@ -210,8 +210,10 @@
+@@ -200,8 +200,10 @@
  			swap_ary[unswdev].ksw_total = ttl;
  			swap_ary[unswdev].ksw_used = xsd.xsw_used;
  			swap_ary[unswdev].ksw_flags = xsd.xsw_flags;
@@ -238,15 +195,15 @@
  #include <sys/user.h>
  #include <sys/proc.h>
  #define	_WANT_PRISON	/* make jail.h give us 'struct prison' */
-@@ -101,6 +101,7 @@
- 	struct kinfo_proc *bp;
- 	int maxcnt;
+@@ -116,6 +116,7 @@
+ kvm_proclist(kvm_t *kd, int what, int arg, struct proc *p,
+     struct kinfo_proc *bp, int maxcnt)
  {
 +#if 0
  	int cnt = 0;
  	struct kinfo_proc kinfo_proc, *kp;
  	struct pgrp pgrp;
-@@ -427,6 +428,8 @@
+@@ -440,6 +441,8 @@
  		++cnt;
  	}
  	return (cnt);
@@ -255,37 +212,9 @@
  }
  
  /*
---- a/lib/libkvm/kvm_cptime.c
-+++ b/lib/libkvm/kvm_cptime.c
-@@ -44,8 +44,8 @@
- #include "kvm_private.h"
- 
- static struct nlist kvm_cp_time_nl[] = {
--	{ "_cp_time" },			/* (deprecated) */
--	{ NULL },
-+	{ { "_cp_time" } },			/* (deprecated) */
-+	{ { NULL } },
- };
- 
- #define	NL_CP_TIME		0
---- a/lib/libkvm/kvm_pcpu.c
-+++ b/lib/libkvm/kvm_pcpu.c
-@@ -48,9 +48,9 @@
- #include "kvm_private.h"
- 
- static struct nlist kvm_pcpu_nl[] = {
--	{ "_cpuid_to_pcpu" },
--	{ "_mp_maxcpus" },
--	{ NULL },
-+	{ { "_cpuid_to_pcpu" } },
-+	{ { "_mp_maxcpus" } },
-+	{ { NULL } },
- };
- 
- /*
 --- a/lib/libkvm/kvm_vnet.c
 +++ b/lib/libkvm/kvm_vnet.c
-@@ -69,18 +69,18 @@
+@@ -68,18 +68,18 @@
  		 * here to __{start,stop}_set_vnet.
  		 */
  #define	NLIST_START_VNET	0
@@ -309,5 +238,5 @@
 +		{ "proc0" },
 +		{ NULL },
  	};
- 	uintptr_t procp, tdp, credp;
- 	lwpid_t dumptid;
+ 	uintptr_t procp, credp;
+ #define	VMCORE_VNET_OF_PROC0

Modified: trunk/freebsd-libs/debian/patches/06_libgeom.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/06_libgeom.diff	2012-01-31 18:54:58 UTC (rev 4045)
+++ trunk/freebsd-libs/debian/patches/06_libgeom.diff	2012-01-31 18:55:25 UTC (rev 4046)
@@ -1,10 +1,3 @@
----
- lib/libgeom/Makefile        |    3 ++-
- lib/libgeom/geom_ctl.c      |    3 +++
- lib/libgeom/geom_stats.c    |    2 +-
- lib/libgeom/geom_xml2tree.c |    2 +-
- 4 files changed, 7 insertions(+), 3 deletions(-)
-
 --- a/lib/libgeom/Makefile
 +++ b/lib/libgeom/Makefile
 @@ -1,6 +1,7 @@
@@ -24,18 +17,6 @@
  
  MAN=	libgeom.3
  
---- a/lib/libgeom/geom_ctl.c
-+++ b/lib/libgeom/geom_ctl.c
-@@ -167,6 +167,9 @@
- 	if (ap->name == NULL)
- 		return;
- 	ap->nlen = strlen(ap->name) + 1;
-+#ifndef __DECONST
-+#define __DECONST(type, var)	((type)(uintptr_t)(const void *)(var))
-+#endif
- 	ap->value = __DECONST(void *, value);
- 	ap->flag = GCTL_PARAM_RD;
- 	if (len >= 0)
 --- a/lib/libgeom/geom_stats.c
 +++ b/lib/libgeom/geom_stats.c
 @@ -34,11 +34,11 @@

Modified: trunk/freebsd-libs/debian/patches/07_libkiconv.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/07_libkiconv.diff	2012-01-31 18:54:58 UTC (rev 4045)
+++ trunk/freebsd-libs/debian/patches/07_libkiconv.diff	2012-01-31 18:55:25 UTC (rev 4046)
@@ -5,13 +5,14 @@
 
 --- a/lib/libkiconv/Makefile
 +++ b/lib/libkiconv/Makefile
-@@ -14,5 +14,6 @@
+@@ -14,6 +14,7 @@
  		kiconv.3 kiconv_add_xlat16_table.3
  
  CFLAGS+=	-I${.CURDIR}/../../sys
 +LDADD=	-ldl
  
- .include <bsd.lib.mk>
+ WARNS?=		1
+ 
 --- a/lib/libkiconv/quirks.h
 +++ b/lib/libkiconv/quirks.h
 @@ -25,6 +25,7 @@

Modified: trunk/freebsd-libs/debian/patches/08_libdevstat.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/08_libdevstat.diff	2012-01-31 18:54:58 UTC (rev 4045)
+++ trunk/freebsd-libs/debian/patches/08_libdevstat.diff	2012-01-31 18:55:25 UTC (rev 4046)
@@ -21,7 +21,7 @@
 -CFLAGS+=-I${.CURDIR}
 +CFLAGS+=-I${.CURDIR} -I../libkvm
  
- WARNS?=	2
+ WARNS?=	3
  
 --- a/lib/libdevstat/devstat.c
 +++ b/lib/libdevstat/devstat.c

Modified: trunk/freebsd-libs/debian/patches/09_libusbhid.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/09_libusbhid.diff	2012-01-31 18:54:58 UTC (rev 4045)
+++ trunk/freebsd-libs/debian/patches/09_libusbhid.diff	2012-01-31 18:55:25 UTC (rev 4046)
@@ -14,7 +14,7 @@
  MLINKS=	usbhid.3 libusbhid.3 usbhid.3 hid_get_report_desc.3 \
 --- a/lib/libusbhid/parse.c
 +++ b/lib/libusbhid/parse.c
-@@ -149,7 +149,7 @@
+@@ -143,7 +143,7 @@
   *	hid_start_parse
   *------------------------------------------------------------------------*/
  hid_data_t

Modified: trunk/freebsd-libs/debian/patches/10_memstat.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/10_memstat.diff	2012-01-31 18:54:58 UTC (rev 4045)
+++ trunk/freebsd-libs/debian/patches/10_memstat.diff	2012-01-31 18:55:25 UTC (rev 4046)
@@ -18,8 +18,8 @@
 +#include <stdint.h>
 +
  /*
-  * Number of CPU slots in library-internal data structures.  This should be
-  * at least the value of MAXCPU from param.h.
+  * Amount of caller data to maintain for each caller data slot.  Applications
+  * must not request more than this number of caller save data, or risk
 --- a/lib/libmemstat/memstat_malloc.c
 +++ b/lib/libmemstat/memstat_malloc.c
 @@ -44,10 +44,10 @@
@@ -36,7 +36,7 @@
  };
  
  /*
-@@ -253,6 +253,10 @@
+@@ -242,6 +242,10 @@
  	return (0);
  }
  
@@ -49,7 +49,7 @@
  {
 --- a/lib/libmemstat/memstat_uma.c
 +++ b/lib/libmemstat/memstat_uma.c
-@@ -49,12 +49,12 @@
+@@ -51,12 +51,12 @@
  
  static struct nlist namelist[] = {
  #define	X_UMA_KEGS	0

Modified: trunk/freebsd-libs/debian/patches/12_usb.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/12_usb.diff	2012-01-31 18:54:58 UTC (rev 4045)
+++ trunk/freebsd-libs/debian/patches/12_usb.diff	2012-01-31 18:55:25 UTC (rev 4046)
@@ -17,7 +17,7 @@
  NOGCCERROR=
 +LDADD+=		-lpthread -lrt -lbsd
  
- MLINKS+=	libusb.3 usb.3
+ WARNS?=		2
  
 --- a/lib/libusb/libusb.h
 +++ b/lib/libusb/libusb.h

Modified: trunk/freebsd-libs/debian/patches/13_jail.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/13_jail.diff	2012-01-31 18:54:58 UTC (rev 4045)
+++ trunk/freebsd-libs/debian/patches/13_jail.diff	2012-01-31 18:55:25 UTC (rev 4046)
@@ -1,11 +1,10 @@
 --- a/lib/libjail/Makefile
 +++ b/lib/libjail/Makefile
-@@ -24,6 +24,8 @@
+@@ -5,6 +5,7 @@
+ SHLIB_MAJOR= 1
+ SRCS=	jail.c jail_getid.c
+ INCS=	jail.h
++LDADD+=	-lbsd
  
- CFLAGS+=-I${.CURDIR}
+ MAN=	jail.3
  
-+LDADD += -lbsd
-+
- WARNS?=	6
- 
- .include <bsd.lib.mk>

Modified: trunk/freebsd-libs/debian/patches/14_alias.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/14_alias.diff	2012-01-31 18:54:58 UTC (rev 4045)
+++ trunk/freebsd-libs/debian/patches/14_alias.diff	2012-01-31 18:55:25 UTC (rev 4046)
@@ -1,8 +1,8 @@
 --- a/lib/libalias/libalias/Makefile
 +++ b/lib/libalias/libalias/Makefile
-@@ -10,5 +10,6 @@
+@@ -9,5 +9,6 @@
+ SRCS=	alias.c alias_db.c alias_proxy.c alias_util.c alias_mod.c
  INCS=	alias.h
- WARNS?=	6
  NO_WERROR=
 +LDADD= -ldl -lbsd
  

Modified: trunk/freebsd-libs/debian/patches/cdefs_macros.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/cdefs_macros.diff	2012-01-31 18:54:58 UTC (rev 4045)
+++ trunk/freebsd-libs/debian/patches/cdefs_macros.diff	2012-01-31 18:55:25 UTC (rev 4046)
@@ -44,25 +44,16 @@
  int	NgRecvMsg(int, struct ng_mesg *, size_t, char *);
 --- a/lib/libusb/libusb.h
 +++ b/lib/libusb/libusb.h
-@@ -242,7 +242,7 @@
+@@ -228,7 +228,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;
-@@ -250,7 +250,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;
-@@ -265,12 +265,12 @@
+@@ -243,12 +243,12 @@
  	struct libusb_endpoint_descriptor *endpoint;
  	uint8_t *extra;
  	int	extra_length;
@@ -77,43 +68,16 @@
  
  typedef struct libusb_config_descriptor {
  	uint8_t	bLength;
-@@ -284,7 +284,7 @@
+@@ -262,7 +262,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;
-@@ -292,7 +292,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;
-@@ -308,7 +308,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;
-@@ -317,7 +317,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;
-@@ -333,7 +333,7 @@
+@@ -278,7 +278,7 @@
  	uint32_t length;
  	uint32_t actual_length;
  	enum libusb_transfer_status status;
@@ -122,7 +86,7 @@
  
  typedef void (*libusb_transfer_cb_fn) (struct libusb_transfer *transfer);
  
-@@ -352,7 +352,7 @@
+@@ -297,7 +297,7 @@
  	void *os_priv;
  	int	num_iso_packets;
  	struct libusb_iso_packet_descriptor iso_packet_desc[0];
@@ -151,7 +115,7 @@
  
  #define	LIBUSB20_ME_UINT8_T(n, field, arg, ismeta) \
    LIBUSB20_ME_INTEGER(n, field, ismeta, UN, u, 8, , 1)
-@@ -557,7 +557,7 @@
+@@ -498,7 +498,7 @@
  struct libusb20_endpoint {
  	struct LIBUSB20_ENDPOINT_DESC_DECODED desc;
  	struct libusb20_me_struct extra;
@@ -160,7 +124,7 @@
  
  struct libusb20_interface {
  	struct LIBUSB20_INTERFACE_DESC_DECODED desc;
-@@ -566,14 +566,14 @@
+@@ -507,14 +507,14 @@
  	struct libusb20_endpoint *endpoints;
  	uint8_t	num_altsetting;
  	uint8_t	num_endpoints;

Deleted: trunk/freebsd-libs/debian/patches/cpumask_t.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/cpumask_t.diff	2012-01-31 18:54:58 UTC (rev 4045)
+++ trunk/freebsd-libs/debian/patches/cpumask_t.diff	2012-01-31 18:55:25 UTC (rev 4046)
@@ -1,15 +0,0 @@
-
-Workaround removal of cpumask_t in recent kfreebsd headers.  Keep
-using the old interface for backward compatibility with kfreebsd 8.x.
-
---- a/lib/libmemstat/memstat_uma.c
-+++ b/lib/libmemstat/memstat_uma.c
-@@ -311,7 +311,7 @@
- 	struct uma_keg *kzp, kz;
- 	int hint_dontsearch, i, mp_maxid, ret;
- 	char name[MEMTYPE_MAXNAME];
--	__cpumask_t all_cpus;
-+	unsigned int all_cpus;
- 	kvm_t *kvm;
- 
- 	kvm = (kvm_t *)kvm_handle;

Added: trunk/freebsd-libs/debian/patches/libusb_backward.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/libusb_backward.diff	                        (rev 0)
+++ trunk/freebsd-libs/debian/patches/libusb_backward.diff	2012-01-31 18:55:25 UTC (rev 4046)
@@ -0,0 +1,26 @@
+
+This happened because of "downgrading" 8.3-STABLE to 9.0-RELEASE,
+some commits which hadn't made it to 9.0-RELEASE were MFC'ed to
+8.3-STABLE, adding new symbols. Upgrading to 9.0 removed them.
+
+--- a/lib/libusb/Makefile
++++ b/lib/libusb/Makefile
+@@ -6,7 +6,7 @@
+ 
+ LIB=		usb
+ SHLIB_MAJOR=	2
+-SHLIB_MINOR=	0
++SHLIB_MINOR=	1
+ SRCS=		libusb20.c
+ SRCS+=		libusb20_desc.c
+ SRCS+=		libusb20_ugen20.c
+--- a/lib/libusbhid/Makefile
++++ b/lib/libusbhid/Makefile
+@@ -6,6 +6,7 @@
+ 
+ LDADD= -lbsd
+ SHLIB_MAJOR= 4
++SHLIB_MINOR= 1
+ 
+ MLINKS=	usbhid.3 libusbhid.3 usbhid.3 hid_get_report_desc.3 \
+ 	usbhid.3 hid_dispose_report_desc.3 \

Added: trunk/freebsd-libs/debian/patches/makefile_inc.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/makefile_inc.diff	                        (rev 0)
+++ trunk/freebsd-libs/debian/patches/makefile_inc.diff	2012-01-31 18:55:25 UTC (rev 4046)
@@ -0,0 +1,7 @@
+--- /dev/null
++++ b/lib/Makefile.inc
+@@ -0,0 +1,4 @@
++# Default version for system libs (override in <lib>/Makefile if necessary)
++SHLIB_MAJOR?= 0
++
++WARNS?=	6

Modified: trunk/freebsd-libs/debian/patches/series
===================================================================
--- trunk/freebsd-libs/debian/patches/series	2012-01-31 18:54:58 UTC (rev 4045)
+++ trunk/freebsd-libs/debian/patches/series	2012-01-31 18:55:25 UTC (rev 4046)
@@ -1,5 +1,4 @@
 cdefs_macros.diff
-00_sbuf_page_size.diff
 01_sys_cam.diff
 02_libcam.diff
 03_libsbuf.diff
@@ -14,4 +13,6 @@
 12_usb.diff
 13_jail.diff
 14_alias.diff
-cpumask_t.diff
+makefile_inc.diff
+sysconf_cpuset_size.diff
+libusb_backward.diff

Added: trunk/freebsd-libs/debian/patches/sysconf_cpuset_size.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/sysconf_cpuset_size.diff	                        (rev 0)
+++ trunk/freebsd-libs/debian/patches/sysconf_cpuset_size.diff	2012-01-31 18:55:25 UTC (rev 4046)
@@ -0,0 +1,22 @@
+--- a/lib/libmemstat/memstat_uma.c
++++ b/lib/libmemstat/memstat_uma.c
+@@ -305,6 +305,7 @@
+ 	char name[MEMTYPE_MAXNAME];
+ 	cpuset_t all_cpus;
+ 	long cpusetsize;
++	size_t len;
+ 	kvm_t *kvm;
+ 
+ 	kvm = (kvm_t *)kvm_handle;
+@@ -328,8 +329,9 @@
+ 		list->mtl_error = ret;
+ 		return (-1);
+ 	}
+-	cpusetsize = sysconf(_SC_CPUSET_SIZE);
+-	if (cpusetsize == -1 || (u_long)cpusetsize > sizeof(cpuset_t)) {
++	len = sizeof(cpusetsize);
++	if (sysctlbyname("kern.sched.cpusetsize", &cpusetsize, &len, NULL,
++	    0) == -1 || (u_long)cpusetsize > sizeof(cpuset_t)) {
+ 		list->mtl_error = MEMSTAT_ERROR_KVM_NOSYMBOL;
+ 		return (-1);
+ 	}

Modified: trunk/freebsd-libs/debian/rules
===================================================================
--- trunk/freebsd-libs/debian/rules	2012-01-31 18:54:58 UTC (rev 4045)
+++ trunk/freebsd-libs/debian/rules	2012-01-31 18:55:25 UTC (rev 4046)
@@ -28,9 +28,9 @@
 endif
 
 SOURCE = freebsd-libs
-#SVN		:= http://svn.freebsd.org/base/release/$(version).0
+SVN		:= http://svn.freebsd.org/base/release/$(version).0
 #SVN		:= http://svn.freebsd.org/base/releng/$(version)
-SVN		:= http://svn.freebsd.org/base/stable/$(major)
+#SVN		:= http://svn.freebsd.org/base/stable/$(major)
 #SVN		:= http://svn.freebsd.org/base/head
 ORIGDIR = $(SOURCE)-$(tar_version)
 TARNAME = $(SOURCE)_$(tar_version).orig.tar.gz
@@ -39,7 +39,6 @@
 DESTDIR = $(CURDIR)/debian/tmp
 PMAKE = COPTS="$(CFLAGS)" CFLAGS="$(CFLAGS) -isystem /usr/include/freebsd -I$(CURDIR)/debian/local/include" NO_WERROR=1 NOGCCERROR=1 \
         NOSHARED=NO NO_SHARED=NO NO_PROFILE=1 DESTDIR=$(DESTDIR) make
-export SHLIB_MAJOR = 0
 kernel = $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
 
 get-orig-source:
@@ -55,7 +54,7 @@
 	         sys/kern/subr_sbuf.c \
 	         sys/sys/sbuf.h \
 	         share/misc/usb_hid_usages ; do \
-	    svn export -r $(svn_revision) $(SVN)/$$i $(ORIGDIR)/$$i ; \
+	    svn export $(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.*
@@ -221,8 +220,8 @@
 ifeq ($(kernel), kfreebsd)
 	dh_makeshlibs -plibgeom1 --add-udeb=libgeom1-udeb
 	dh_makeshlibs -plibipx2 --add-udeb=libipx2-udeb
-	dh_makeshlibs -plibsbuf0 --add-udeb=libsbuf0-udeb
-	dh_makeshlibs -plibusb2 --add-udeb=libusb2-udeb
+	dh_makeshlibs -plibsbuf6 --add-udeb=libsbuf6-udeb
+	dh_makeshlibs -plibusb2debian --add-udeb=libusb2debian-udeb
 endif
 	dh_installdeb -a
 	dh_shlibdeps -a




More information about the Glibc-bsd-commits mailing list