diff -Nru httrack-3.43.4ubuntu1/configure httrack-3.43.5/configure --- httrack-3.43.4ubuntu1/configure 2009-03-19 10:47:22.000000000 -0700 +++ httrack-3.43.5/configure 2009-05-20 10:14:03.000000000 -0700 @@ -2218,7 +2218,7 @@ # Define the identity of the package. PACKAGE=httrack - VERSION=3.43.4 + VERSION=3.43.5 cat >>confdefs.h <<_ACEOF diff -Nru httrack-3.43.4ubuntu1/configure.in httrack-3.43.5/configure.in --- httrack-3.43.4ubuntu1/configure.in 2009-03-19 10:47:08.000000000 -0700 +++ httrack-3.43.5/configure.in 2009-05-20 10:13:56.000000000 -0700 @@ -1,6 +1,6 @@ AC_INIT(src/httrack.c) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(httrack, 3.43.4) +AM_INIT_AUTOMAKE(httrack, 3.43.5) VERSION_INFO="2:43:0" AM_MAINTAINER_MODE diff -Nru httrack-3.43.4ubuntu1/debian/changelog httrack-3.43.5/debian/changelog --- httrack-3.43.4ubuntu1/debian/changelog 2009-04-28 17:46:46.000000000 -0700 +++ httrack-3.43.5/debian/changelog 2009-05-22 17:10:26.000000000 -0700 @@ -1,3 +1,16 @@ +httrack (3.43.5-1ubuntu1) karmic; urgency=low + + * Merge from debian unstable, remaining changes (LP: #379588): + - Alternatively depend on abrowser in webhttrack. + + -- Nick Ellery Fri, 22 May 2009 17:00:26 -0700 + +httrack (3.43.5-1) unstable; urgency=low + + * Updated to 3.43.5 (3.43-5) + + -- Xavier Roche Wed, 20 May 2009 19:09:11 +0200 + httrack (3.43.4ubuntu1) karmic; urgency=low * Merge from debian unstable, remaining changes (LP: #368951): @@ -5,6 +18,13 @@ -- Nick Ellery Tue, 28 Apr 2009 17:31:34 -0700 +httrack (3.43.4-1) unstable; urgency=low + + * Updated to 3.43.4 (3.43-4) + closes:#516615 + + -- Xavier Roche Thu, 19 Mar 2009 18:42:38 +0100 + httrack (3.43.4) unstable; urgency=low * Updated to 3.43.4 (3.43-4) diff -Nru httrack-3.43.4ubuntu1/history.txt httrack-3.43.5/history.txt --- httrack-3.43.4ubuntu1/history.txt 2009-03-19 10:47:08.000000000 -0700 +++ httrack-3.43.5/history.txt 2009-05-20 10:13:56.000000000 -0700 @@ -4,9 +4,12 @@ This file lists all changes and fixes that have been made for HTTrack. +3.43-5 ++ Fixed: code tag handling bug in certain cases leading to produce invalid links (Tom-tmh13 and William Roeder) + 3.43-4 -+ Fixed: horrible SSL slowdowns due to bogus select() calls (Patrick Pfeifer)
-+ Fixed: Konqueror fixes
++ Fixed: horrible SSL slowdowns due to bogus select() calls (Patrick Pfeifer) ++ Fixed: Konqueror fixes 3.43-3 + Updated: Portugues-Brasil language file diff -Nru httrack-3.43.4ubuntu1/html/httrack.man.html httrack-3.43.5/html/httrack.man.html --- httrack-3.43.4ubuntu1/html/httrack.man.html 2009-03-19 10:47:07.000000000 -0700 +++ httrack-3.43.5/html/httrack.man.html 2009-05-20 10:13:56.000000000 -0700 @@ -1,5 +1,5 @@ - + diff -Nru httrack-3.43.4ubuntu1/man/httrack.1 httrack-3.43.5/man/httrack.1 --- httrack-3.43.4ubuntu1/man/httrack.1 2009-03-19 10:47:06.000000000 -0700 +++ httrack-3.43.5/man/httrack.1 2009-05-20 10:13:55.000000000 -0700 @@ -1,7 +1,7 @@ .\" Process this file with .\" groff -man -Tascii httrack.1 .\" -.TH httrack 1 "Feb 2009" "httrack website copier" +.TH httrack 1 "Mar 2009" "httrack website copier" .SH NAME httrack \- offline browser : copy websites to a local directory .SH SYNOPSIS diff -Nru httrack-3.43.4ubuntu1/src/htsglobal.h httrack-3.43.5/src/htsglobal.h --- httrack-3.43.4ubuntu1/src/htsglobal.h 2009-03-19 10:47:09.000000000 -0700 +++ httrack-3.43.5/src/htsglobal.h 2009-05-20 10:13:56.000000000 -0700 @@ -40,8 +40,8 @@ #define HTTRACK_GLOBAL_DEFH // Version (also check external version information) -#define HTTRACK_VERSION "3.43-4" -#define HTTRACK_VERSIONID "3.43.4" +#define HTTRACK_VERSION "3.43-5" +#define HTTRACK_VERSIONID "3.43.5" #define HTTRACK_AFF_VERSION "3.x" #define HTTRACK_LIB_VERSION "2.0" diff -Nru httrack-3.43.4ubuntu1/src/htsparse.c httrack-3.43.5/src/htsparse.c --- httrack-3.43.4ubuntu1/src/htsparse.c 2009-03-19 10:47:09.000000000 -0700 +++ httrack-3.43.5/src/htsparse.c 2009-05-20 10:13:56.000000000 -0700 @@ -2135,7 +2135,7 @@ strcatbuff(lien, "/"); while( (a > lien) && (*a) && (*a!='/')) a--; if (*a=='/') { // ok on a repéré le dernier / - if (start_of_filename != NULL && a >= start_of_filename) { + if (start_of_filename != NULL && a + 1 >= start_of_filename) { *(a+1)='\0'; // couper } } else {