From 2c4050f2f601244c1e33debd02b1d971aef32b04 Mon Sep 17 00:00:00 2001
From: Romain Francoise <rfrancoise@debian.org>
Date: Sat, 13 Jul 2019 20:48:26 +0200
Subject: [PATCH] Import patches-unapplied version 1.9.0-2 to debian/sid

Imported using git-ubuntu import.

Changelog parent: adb17766d71c3a56540e17ea78bcd2a8c2803c3e

New changelog entries:
  [ Luca Boccassi ]
  * Install upstream pkg-config file (closes: #922219).
  [ Romain Francoise ]
  * Bump Standards-Version to 4.4.0.
  * Upload to unstable.

Signed-off-by: Bryce Harrington <bryce@bryceharrington.org>
---
 debian/changelog               | 11 +++++++++++
 debian/control                 |  2 +-
 debian/libpcap0.8-dev.install  |  1 +
 debian/patches/shared-lib.diff | 19 +------------------
 4 files changed, 14 insertions(+), 19 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f626c7b..7ffb3f6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+libpcap (1.9.0-2) unstable; urgency=medium
+
+  [ Luca Boccassi ]
+  * Install upstream pkg-config file (closes: #922219).
+
+  [ Romain Francoise ]
+  * Bump Standards-Version to 4.4.0.
+  * Upload to unstable.
+
+ -- Romain Francoise <rfrancoise@debian.org>  Sat, 13 Jul 2019 20:48:26 +0200
+
 libpcap (1.9.0-1) experimental; urgency=medium
 
   * New upstream release:
diff --git a/debian/control b/debian/control
index 7618470..fedb931 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Build-Depends: autotools-dev,
                flex,
                libbluetooth-dev [linux-any],
                linux-libc-dev (>= 2.6.27) [i386]
-Standards-Version: 4.1.2
+Standards-Version: 4.4.0
 Homepage: http://www.tcpdump.org/
 Vcs-Browser: https://salsa.debian.org/rfrancoise/libpcap
 Vcs-Git: https://salsa.debian.org/rfrancoise/libpcap.git
diff --git a/debian/libpcap0.8-dev.install b/debian/libpcap0.8-dev.install
index 09f7c61..d4bd144 100644
--- a/debian/libpcap0.8-dev.install
+++ b/debian/libpcap0.8-dev.install
@@ -2,4 +2,5 @@ usr/bin
 usr/include/pcap*
 usr/lib/*/libpcap.a
 usr/lib/*/libpcap.so
+usr/lib/*/pkgconfig/libpcap.pc
 usr/share/man
diff --git a/debian/patches/shared-lib.diff b/debian/patches/shared-lib.diff
index 7524c8c..fbeac51 100644
--- a/debian/patches/shared-lib.diff
+++ b/debian/patches/shared-lib.diff
@@ -112,24 +112,7 @@ build a shared library.
  #
  # Remote pcap daemon.
  #
-@@ -538,7 +569,7 @@
- 
- FORCE:
- 
--install: install-shared install-archive libpcap.pc pcap-config @INSTALL_RPCAPD@
-+install: install-shared install-archive pcap-config @INSTALL_RPCAPD@
- 	[ -d $(DESTDIR)$(libdir) ] || \
- 	    (mkdir -p $(DESTDIR)$(libdir); chmod 755 $(DESTDIR)$(libdir))
- 	[ -d $(DESTDIR)$(includedir) ] || \
-@@ -561,7 +592,6 @@
- 	$(INSTALL_PROGRAM) pcap-config $(DESTDIR)$(bindir)/pcap-config
- 	[ -d $(DESTDIR)$(libdir)/pkgconfig ] || \
- 	    (mkdir -p $(DESTDIR)$(libdir)/pkgconfig; chmod 755 $(DESTDIR)$(libdir)/pkgconfig)
--	$(INSTALL_DATA) libpcap.pc $(DESTDIR)$(libdir)/pkgconfig/libpcap.pc
- 	for i in $(MAN1); do \
- 		$(INSTALL_DATA) $(srcdir)/$$i \
- 		    $(DESTDIR)$(mandir)/man1/$$i; done
-@@ -617,11 +647,9 @@
+@@ -617,11 +648,9 @@
  install-shared-so: libpcap.so
  	[ -d $(DESTDIR)$(libdir) ] || \
  	    (mkdir -p $(DESTDIR)$(libdir); chmod 755 $(DESTDIR)$(libdir))
-- 
2.25.0