r50253 - in /trunk/libauthen-krb5-perl: Krb5.pm Makefile.PL debian/changelog debian/patches/better-compiler-flags debian/patches/fix_pod

[jawnsy-guest at users.alioth.debian.org]

Author: jawnsy-guest
Date: Tue Jan  5 16:31:32 2010
New Revision: 50253

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=50253
Log:
* Add DEP3 patch headers
* No longer install README or TODO, same info in POD

Modified:
    trunk/libauthen-krb5-perl/Krb5.pm
    trunk/libauthen-krb5-perl/Makefile.PL
    trunk/libauthen-krb5-perl/debian/changelog
    trunk/libauthen-krb5-perl/debian/patches/better-compiler-flags
    trunk/libauthen-krb5-perl/debian/patches/fix_pod

Modified: trunk/libauthen-krb5-perl/Krb5.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libauthen-krb5-perl/Krb5.pm?rev=50253&op=diff
==============================================================================
--- trunk/libauthen-krb5-perl/Krb5.pm (original)
+++ trunk/libauthen-krb5-perl/Krb5.pm Tue Jan  5 16:31:32 2010
@@ -599,6 +599,8 @@
 
 =back
 
+=back
+
 =head1 AUTHOR
 
 Jeff Horwitz (jeff at smashing.org)

Modified: trunk/libauthen-krb5-perl/Makefile.PL
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libauthen-krb5-perl/Makefile.PL?rev=50253&op=diff
==============================================================================
--- trunk/libauthen-krb5-perl/Makefile.PL (original)
+++ trunk/libauthen-krb5-perl/Makefile.PL Tue Jan  5 16:31:32 2010
@@ -8,7 +8,8 @@
 # any extra libraries?
 # add -lresolv here if you get errors like the following (usually on linux):
 #  undefined symbol: __res_search
-my $KRB5_EXTRALIBS = '-lresolv';
+# Only needed with static linking, so not needed on Debian.
+#my $KRB5_EXTRALIBS = '-lresolv';
 
 # location of Kerberos 5 includes
 my $KRB5_INCDIR = '/usr/include';
@@ -30,10 +31,14 @@
 	$cryptolib = '-lcrypto';
 }
 
+# Don't add -L/usr/lib or -I/usr/include; they can cause problems.
+my $ldflags  = ($KRB5_LIBDIR eq '/usr/lib')     ? '' : "-L${KRB5_LIBDIR}";
+my $cppflags = ($KRB5_INCDIR eq '/usr/include') ? '' : "-I${KRB5_INCDIR}";
+
 WriteMakefile(
     'NAME'	=> 'Authen::Krb5',
     'VERSION_FROM' => 'Krb5.pm',
-    'LIBS'	=> ["-L${KRB5_LIBDIR} -lkrb5 ${cryptolib} -lcom_err $KRB5_EXTRALIBS"],
+    'LIBS'     => ["$ldflags -lkrb5 ${cryptolib} -lcom_err $KRB5_EXTRALIBS"],
     'DEFINE'	=> '',
-    'INC'	=> "-I${KRB5_INCDIR} $KRB5_EXTRAINCS"
+    'INC'      => "$cppflags $KRB5_EXTRAINCS"
 );

Modified: trunk/libauthen-krb5-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libauthen-krb5-perl/debian/changelog?rev=50253&op=diff
==============================================================================
--- trunk/libauthen-krb5-perl/debian/changelog (original)
+++ trunk/libauthen-krb5-perl/debian/changelog Tue Jan  5 16:31:32 2010
@@ -3,9 +3,6 @@
   TODO:
   - d/copyright: changelog says "add myself to cpyright" - not really :)
     update format. update years of upstream copyright
-  - README and TODO are not installed any more. on purpose? by accident?
-    not mentioned in changelog
-  - (cosmetic) patch headers -> DEP3
 
   [ Jonathan Yu ]
   * New upstream release
@@ -16,6 +13,8 @@
   * Slight rewrite of control description
   * Remove perl-path patch, replace with override
   * Refresh all remaining patches
+  * Add DEP3 patch headers
+  * No longer install README or TODO, same info in POD
 
   [ gregor herrmann ]
   * Add debian/README.source to document quilt usage, as required by

Modified: trunk/libauthen-krb5-perl/debian/patches/better-compiler-flags
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libauthen-krb5-perl/debian/patches/better-compiler-flags?rev=50253&op=diff
==============================================================================
--- trunk/libauthen-krb5-perl/debian/patches/better-compiler-flags (original)
+++ trunk/libauthen-krb5-perl/debian/patches/better-compiler-flags Tue Jan  5 16:31:32 2010
@@ -1,7 +1,11 @@
-Don't link with -lresolv to avoid unnecessary shared library
-dependencies.  Strip unnecessary -I/usr/include and -L/usr/lib
-flags which may cause problems.
-
+Description: don't link with -lresolv
+ Don't link with -lresolv to avoid unnecessary shared library
+ dependencies. Strip unnecessary -I/usr/include and -L/usr/lib
+ flags which may cause problems.
+Author: Russ Allbery <rra at debian.org>
+Reviewed-By: Jonathan Yu <jawnsy at cpan.org>
+Origin: vendor
+Forwarded: not-needed
 --- a/Makefile.PL
 +++ b/Makefile.PL
 @@ -8,7 +8,8 @@

Modified: trunk/libauthen-krb5-perl/debian/patches/fix_pod
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libauthen-krb5-perl/debian/patches/fix_pod?rev=50253&op=diff
==============================================================================
--- trunk/libauthen-krb5-perl/debian/patches/fix_pod (original)
+++ trunk/libauthen-krb5-perl/debian/patches/fix_pod Tue Jan  5 16:31:32 2010
@@ -1,4 +1,8 @@
-# Fix manpage-has-errors-from-pod2man
+Description: fix manpage-has-errors-from-pod2man
+Author: Maximilian Gaß <mxey at cloudconnected.org>
+Reviewed-by: Jonathan Yu <jawnsy at cpan.org>
+Origin: vendor
+Forwarded: no
 --- a/Krb5.pm
 +++ b/Krb5.pm
 @@ -599,6 +599,8 @@