Bug#1007596: NMU libdbd-sybase-perl 1.14-1.1

2023-09-01 Thread Steve Langasek
On Tue, Aug 22, 2023 at 09:04:33PM +0200, Bastian Germann wrote:
> I am uploading a NMU to DELAYED/10 in order to fix this.
> The debdiff is attached.

Thanks for this upload, Bastian!  I hadn't replied, but I did have a look at
the debdiff and it looked fine to me.  This is long overdue, so thank you
again for taking care of it.

-- 
Steve Langasek   Give me a lever long enough and a Free OS
Debian Developer   to set it on, and I can move the world.
Ubuntu Developer   https://www.debian.org/
slanga...@ubuntu.com vor...@debian.org


signature.asc
Description: PGP signature


Bug#1007596: NMU libdbd-sybase-perl 1.14-1.1

2023-08-22 Thread Bastian Germann

I am uploading a NMU to DELAYED/10 in order to fix this.
The debdiff is attached.diff -Nru libdbd-sybase-perl-1.14/Makefile.PL 
libdbd-sybase-perl-1.14/Makefile.PL
--- libdbd-sybase-perl-1.14/Makefile.PL 2023-08-22 14:12:05.0 +
+++ libdbd-sybase-perl-1.14/Makefile.PL 2011-04-25 09:00:44.0 +
@@ -57,7 +57,7 @@
(
$^O eq 'VMS'
? ( MAN3PODS => { 'Sybase.pm' => 'blib/man3/DBD_Sybase.3' } )
-   : ( MAN3PODS => { 'Sybase.pm' => 'blib/man3/DBD::Sybase.3pm' } )
+   : ( MAN3PODS => { 'Sybase.pm' => 'blib/man3/DBD::Sybase.3' } )
),
(
$] >= 5.005
@@ -132,15 +132,20 @@
$SYBASE .= "/$ENV{SYBASE_OCS}";
}
 
+   my $libfound = 0;
my $libsub   = '';
foreach $libdir ( 'lib', 'lib64' ) {
if ( -d "$SYBASE/$libdir" ) {
if ( checkLib($SYBASE) ) {
+   $libfound = 1;
$libsub   = $libdir;
}
}
}
 
+   die "Can't find any Sybase libraries in $SYBASE/lib or $SYBASE/lib64"
+ unless $libfound;
+
my $inc_found = 0;
if ( -d "$SYBASE/include" && -f "$SYBASE/include/cspublic.h" ) {
++$inc_found;
@@ -332,17 +337,16 @@
last if -e $file;
}
 
+   open( IN, $file ) || die "Can't open $file: $!";
+   binmode(IN);
my $version;
-   if (open(IN, $file)) {
-   binmode(IN);
-   while() {
-   if(/Sybase Client-Library\/([^\/]+)\//) {
-   $version = $1;
-   last;
-   }
+   while () {
+   if (/Sybase Client-Library\/([^\/]+)\//) {
+   $version = $1;
+   last;
}
-   close(IN);
}
+   close(IN);
if ( !$version ) {
print "Unknown Client Library version - assuming FreeTDS.\n";
}
diff -Nru libdbd-sybase-perl-1.14/debian/changelog 
libdbd-sybase-perl-1.14/debian/changelog
--- libdbd-sybase-perl-1.14/debian/changelog2023-08-22 14:12:05.0 
+
+++ libdbd-sybase-perl-1.14/debian/changelog2023-08-22 14:05:19.0 
+
@@ -1,3 +1,11 @@
+libdbd-sybase-perl (1.14-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Convert to source format 3.0.  Closes: #1007596.
+  * Drop Vcs fields.  Closes: #1031984.
+
+ -- Bastian Germann   Tue, 22 Aug 2023 14:05:19 +
+
 libdbd-sybase-perl (1.14-1) unstable; urgency=low
 
   * New upstream release.
diff -Nru libdbd-sybase-perl-1.14/debian/control 
libdbd-sybase-perl-1.14/debian/control
--- libdbd-sybase-perl-1.14/debian/control  2023-08-22 14:12:05.0 
+
+++ libdbd-sybase-perl-1.14/debian/control  2023-08-22 14:05:19.0 
+
@@ -4,8 +4,6 @@
 Build-Depends: debhelper (>= 8.9.8~), perl (>= 5.8.0), freetds-dev (>= 0.63), 
libdbi-perl (>= 1.612-1~), dpkg-dev (>= 1.15.7)
 Maintainer: Steve Langasek 
 Standards-Version: 3.9.2
-Vcs-Bzr: 
nosmart+http://bzr.debian.org/bzr/users/vorlon/libdbd-sybase-perl/trunk/
-Vcs-Browser: 
http://anonscm.debian.org/loggerhead/users/vorlon/libdbd-sybase-perl/trunk/
 
 Package: libdbd-sybase-perl
 Architecture: any
diff -Nru libdbd-sybase-perl-1.14/debian/patches/makefile.patch 
libdbd-sybase-perl-1.14/debian/patches/makefile.patch
--- libdbd-sybase-perl-1.14/debian/patches/makefile.patch   1970-01-01 
00:00:00.0 +
+++ libdbd-sybase-perl-1.14/debian/patches/makefile.patch   2023-08-22 
14:05:19.0 +
@@ -0,0 +1,48 @@
+--- libdbd-sybase-perl-1.14.orig/Makefile.PL
 libdbd-sybase-perl-1.14/Makefile.PL
+@@ -132,20 +132,15 @@ sub configure {
+   $SYBASE .= "/$ENV{SYBASE_OCS}";
+   }
+ 
+-  my $libfound = 0;
+   my $libsub   = '';
+   foreach $libdir ( 'lib', 'lib64' ) {
+   if ( -d "$SYBASE/$libdir" ) {
+   if ( checkLib($SYBASE) ) {
+-  $libfound = 1;
+   $libsub   = $libdir;
+   }
+   }
+   }
+ 
+-  die "Can't find any Sybase libraries in $SYBASE/lib or $SYBASE/lib64"
+-unless $libfound;
+-
+   my $inc_found = 0;
+   if ( -d "$SYBASE/include" && -f "$SYBASE/include/cspublic.h" ) {
+   ++$inc_found;
+@@ -337,16 +332,17 @@ sub getLibVersion {
+   last if -e $file;
+   }
+ 
+-  open( IN, $file ) || die "Can't open $file: $!";
+-  binmode(IN);
+   my $version;
+-  while () {
+-  if (/Sybase Client-Library\/([^\/]+)\//) {
+-  $version = $1;
+-  last;
++  if (open(IN, $file)) {
++  binmode(IN);
++  while() {
++  if(/Sybase Client-Library\/([^\/]+)\//) {
++