[Glibc-bsd-commits] r1806 - in trunk/web: . patches

[Petr Salinger]

Author: ps-guest
Date: 2006-12-15 14:42:01 +0100 (Fri, 15 Dec 2006)
New Revision: 1806

Modified:
   trunk/web/NOTES
   trunk/web/patches/libpcap0.8.diff
Log:
* libpcap-dev problems



Modified: trunk/web/NOTES
===================================================================
--- trunk/web/NOTES	2006-12-14 12:00:08 UTC (rev 1805)
+++ trunk/web/NOTES	2006-12-15 13:42:01 UTC (rev 1806)
@@ -175,16 +175,16 @@
 clisp                           2.38-7                  1:2.41-1.dsc
 cpufreqd                        1.2.3-3                 2.2.1-1.dsc
 cvm                             0.71-2                  0.76-2.dsc
-darkstat                        2.6-11                  2.6-13.dsc
+darkstat                        2.6-11                  2.6-13.dsc			b-d libpcap-dev
 db1-compat                      2.1.3-7                 2.1.3-9.dsc
 dnstop                          20050405-1              20060517-1.dsc
-driftnet                        0.1.6-5                 0.1.6-7.dsc
+driftnet                        0.1.6-5                 0.1.6-7.dsc			b-d libpcap-dev
 epm                             3.7-1                   4.0-1.dsc
 expect                          5.43.0-2                5.43.0-8.dsc
 firebird2                       1.5.3.4870-3            1.5.3.4870-11.dsc		builds as root, "fakeroot dpkg-buildpackage -b -uc" fails
 flightgear                      0.9.9-1                 0.9.10-2.dsc
 fprobe                          1.1-4                   1.1-5.dsc
-fragroute                       1.2-7                   1.2-7.1.dsc
+fragroute                       1.2-7                   1.2-7.1.dsc			b-d libpcap-dev
 gcc-4.0                         4.0.3-7                 4.0.3ds1-8.dsc			almost removed
 gkrellm-reminder                2.0.0-1                 2.0.0-2.dsc
 gkrellshoot                     0.4.3-2                 0.4.4-1.dsc

Modified: trunk/web/patches/libpcap0.8.diff
===================================================================
--- trunk/web/patches/libpcap0.8.diff	2006-12-14 12:00:08 UTC (rev 1805)
+++ trunk/web/patches/libpcap0.8.diff	2006-12-15 13:42:01 UTC (rev 1806)
@@ -1,12 +1,12 @@
 Author: aurel32
 Status: don't merge. temporary changes until libpcap transition begins
 
-diff -u libpcap0.8-0.9.4/debian/control libpcap0.8-0.9.4/debian/control
---- libpcap0.8-0.9.4/debian/control
-+++ libpcap0.8-0.9.4/debian/control
-@@ -6,6 +6,14 @@
- Build-Depends: debhelper (>= 4), flex, bison, dpatch, perl
- Standards-Version: 3.6.2.1
+diff -u libpcap0.8-0.9.5/debian/control libpcap0.8-0.9.5/debian/control
+--- libpcap0.8-0.9.5/debian/control
++++ libpcap0.8-0.9.5/debian/control
+@@ -5,11 +5,19 @@
+ Build-Depends: debhelper (>= 5), flex, bison, dpatch, perl
+ Standards-Version: 3.7.2
  
 +Package: libpcap-dev
 +Section: oldlibs
@@ -19,16 +19,22 @@
  Package: libpcap0.8-dev
  Section: libdevel
  Architecture: any
-diff -u libpcap0.8-0.9.4/debian/changelog libpcap0.8-0.9.4/debian/changelog
---- libpcap0.8-0.9.4/debian/changelog
-+++ libpcap0.8-0.9.4/debian/changelog
+ Depends: libpcap0.8 (= ${Source-Version}), libc6-dev
+-Conflicts: libpcap-dev, libpcap0.7-dev
++Conflicts: libpcap-dev (<< 0.9), libpcap0.7-dev
+ Description: Development library and header files for libpcap 0.8
+  Headers, static libraries, and documentation for the libpcap library.
+  .
+diff -u libpcap0.8-0.9.5/debian/changelog libpcap0.8-0.9.5/debian/changelog
+--- libpcap0.8-0.9.5/debian/changelog
++++ libpcap0.8-0.9.5/debian/changelog
 @@ -1,3 +1,9 @@
-+libpcap0.8 (0.9.4-1+kbsd) unreleased; urgency=low
++libpcap0.8 (0.9.5-1+kbsd) unreleased; urgency=low
 +
 +  * Added a libpcap-dev package as libpcap0.7 is fucked on kfreebsd-i386.
 +
 + -- Aurelien Jarno <aurel32 at debian.org>  Wed, 12 Oct 2005 20:50:30 +0200
 +
- libpcap0.8 (0.9.4-1) unstable; urgency=low
+ libpcap0.8 (0.9.5-1) unstable; urgency=low
  
-   * New upstream release, correctly reads files generated by ulogd
+   * New upstream release: no API changes, no ABI changes.