diffstat of debian/ for lsof_4.86+dfsg-1 lsof_4.86+dfsg-1ubuntu2

 changelog             |   14 ++++++++++++++
 control               |    6 +++---
 patches/modern-getopt |   39 +++++++++++++++++++++++++++++++++++++++
 patches/series        |    1 +
 rules                 |   14 ++++++++++++++
 5 files changed, 71 insertions(+), 3 deletions(-)

diff -Nru lsof-4.86+dfsg/debian/changelog lsof-4.86+dfsg/debian/changelog
--- lsof-4.86+dfsg/debian/changelog	2012-04-25 06:11:26.000000000 +0000
+++ lsof-4.86+dfsg/debian/changelog	2012-12-02 02:33:33.000000000 +0000
@@ -1,3 +1,17 @@
+lsof (4.86+dfsg-1ubuntu2) raring; urgency=low
+
+  * Use appropriate compiler, ar, and ranlib when cross-building.
+  * Honour DEB_BUILD_OPTIONS=nocheck.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Sun, 02 Dec 2012 02:33:32 +0000
+
+lsof (4.86+dfsg-1ubuntu1) quantal; urgency=low
+
+  * Use Getopt::Std rather than getopts.pl and drop dependency on
+    libperl4-corelibs-perl.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Sun, 06 May 2012 16:30:51 +0100
+
 lsof (4.86+dfsg-1) unstable; urgency=low
 
   [ Nicholas Bamber ]
diff -Nru lsof-4.86+dfsg/debian/control lsof-4.86+dfsg/debian/control
--- lsof-4.86+dfsg/debian/control	2012-04-25 00:38:48.000000000 +0000
+++ lsof-4.86+dfsg/debian/control	2012-05-06 15:30:54.000000000 +0000
@@ -1,7 +1,8 @@
 Source: lsof
 Section: utils
 Priority: standard
-Maintainer: Norbert Tretkowski <nobse@debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Norbert Tretkowski <nobse@debian.org>
 Uploaders: Nicholas Bamber <nicholas@periapt.co.uk>,
  Raoul Gunnar Borenius <borenius@dfn.de>
 Build-Depends: debhelper (>= 8.0.0)
@@ -12,8 +13,7 @@
 
 Package: lsof
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends},
- libperl4-corelibs-perl | perl (<< 5.12.3-7)
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: Utility to list open files
  Lsof is a Unix-specific diagnostic tool.  Its name stands
  for LiSt Open Files, and it does just that.  It lists
diff -Nru lsof-4.86+dfsg/debian/patches/modern-getopt lsof-4.86+dfsg/debian/patches/modern-getopt
--- lsof-4.86+dfsg/debian/patches/modern-getopt	1970-01-01 00:00:00.000000000 +0000
+++ lsof-4.86+dfsg/debian/patches/modern-getopt	2012-05-06 15:27:26.000000000 +0000
@@ -0,0 +1,39 @@
+Description: Use Getopt::Std rather than getopts.pl
+Author: Colin Watson <cjwatson@ubuntu.com>
+Forwarded: no
+Last-Update: 2012-05-06
+
+Index: b/scripts/identd.perl5
+===================================================================
+--- a/scripts/identd.perl5
++++ b/scripts/identd.perl5
+@@ -20,7 +20,7 @@
+ ###################################################################
+ 
+ use Socket;
+-require 'getopts.pl';
++use Getopt::Std;
+ 
+ # Set path to lsof.
+ 
+@@ -36,7 +36,7 @@
+ 
+ $Timeout = "120";
+ 
+-&Getopts('t:');
++&getopts('t:');
+ if ($opt_t) {
+     $Timeout = $opt_t;
+ }
+Index: b/scripts/sort_res.perl5
+===================================================================
+--- a/scripts/sort_res.perl5
++++ b/scripts/sort_res.perl5
+@@ -33,7 +33,6 @@
+ #	-removing unuseful line number arg.
+ #	-display global size
+ 
+-require 'getopts.pl';
+ my @args = @_;
+ 
+ # Set path to lsof.
diff -Nru lsof-4.86+dfsg/debian/patches/series lsof-4.86+dfsg/debian/patches/series
--- lsof-4.86+dfsg/debian/patches/series	2012-04-20 18:58:54.000000000 +0000
+++ lsof-4.86+dfsg/debian/patches/series	2012-05-06 15:25:23.000000000 +0000
@@ -1,3 +1,4 @@
 manpage
 examples
 tests
+modern-getopt
diff -Nru lsof-4.86+dfsg/debian/rules lsof-4.86+dfsg/debian/rules
--- lsof-4.86+dfsg/debian/rules	2012-04-25 06:14:09.000000000 +0000
+++ lsof-4.86+dfsg/debian/rules	2012-12-02 02:26:04.000000000 +0000
@@ -18,6 +18,18 @@
 LSOF_CFGL := $(shell dpkg-buildflags --get LDFLAGS)
 export LSOF_CFGL
 
+DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+ifneq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
+    export LSOF_CC := $(DEB_HOST_GNU_TYPE)-gcc
+    export LSOF_CCV := $(shell $(LSOF_CC) -v 2>&1 | sed -n 's/.*version \(.*\)/\1/p')
+    export LINUX_CONF_CC := gcc
+    export LSOF_AR := $(DEB_HOST_GNU_TYPE)-ar cr
+    export LSOF_RANLIB := $(DEB_HOST_GNU_TYPE)-ranlib
+    # Autodetection will fail.
+    LSOF_CFGF += -DHAS_STRFTIME
+endif
+
 override_dh_auto_clean:
 	dh_auto_clean
 	rm -f dfile.c dlsof.h dmnt.c dnode.c dproc.c dproto.h dsock.c dstore.c machine.h Makefile
@@ -32,7 +44,9 @@
 	dh_installchangelogs 00DIST
 
 override_dh_auto_test:
+ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 	cd tests && make test && make opt && cd -
+endif
 
 %:
 	dh $@