diff -Nru kdesrc-build-1.15/debian/changelog kdesrc-build-1.15.1/debian/changelog --- kdesrc-build-1.15/debian/changelog 2012-05-06 17:13:23.000000000 +0000 +++ kdesrc-build-1.15.1/debian/changelog 2012-05-25 10:51:54.000000000 +0000 @@ -1,3 +1,10 @@ +kdesrc-build (1.15.1-1) unstable; urgency=low + + * New upstream release. + * Update watch file to point to ftp.kde.org and to consider xz tarballs. + + -- Pino Toscano Fri, 25 May 2012 12:51:27 +0200 + kdesrc-build (1.15-1) unstable; urgency=low * New upstream release. diff -Nru kdesrc-build-1.15/debian/watch kdesrc-build-1.15.1/debian/watch --- kdesrc-build-1.15/debian/watch 2011-03-01 08:59:37.000000000 +0000 +++ kdesrc-build-1.15.1/debian/watch 2012-05-25 10:43:03.000000000 +0000 @@ -1,3 +1,3 @@ version=3 -http://kdesrc-build.kde.org/releases/ kdesrc-build-(.*).tar.bz2 +ftp://ftp.kde.org/pub/kde/stable/kdesrc-build/([\d.]+)/src/kdesrc-build-([\d.]+).tar.(?:bz2|xz) diff -Nru kdesrc-build-1.15/doc/index.docbook kdesrc-build-1.15.1/doc/index.docbook --- kdesrc-build-1.15/doc/index.docbook 2012-05-05 23:37:48.000000000 +0000 +++ kdesrc-build-1.15.1/doc/index.docbook 2012-05-22 00:52:24.000000000 +0000 @@ -107,8 +107,8 @@ &FDLNotice; -2012-05-05 -1.15 +2012-05-21 +1.15.1 &kdesrc-build; is a script which builds and installs &kde; software diff -Nru kdesrc-build-1.15/doc/man-kdesrc-build.1.docbook kdesrc-build-1.15.1/doc/man-kdesrc-build.1.docbook --- kdesrc-build-1.15/doc/man-kdesrc-build.1.docbook 2012-05-05 23:37:48.000000000 +0000 +++ kdesrc-build-1.15.1/doc/man-kdesrc-build.1.docbook 2012-05-22 00:52:24.000000000 +0000 @@ -21,13 +21,13 @@ MichaelPyne mpyne@kde.org -2012-05-05 +2012-05-21 kdesrc-build 1 -1.15 +1.15.1 diff -Nru kdesrc-build-1.15/kdesrc-build kdesrc-build-1.15.1/kdesrc-build --- kdesrc-build-1.15/kdesrc-build 2012-05-05 23:37:48.000000000 +0000 +++ kdesrc-build-1.15.1/kdesrc-build 2012-05-22 00:52:24.000000000 +0000 @@ -70,7 +70,7 @@ KDE_PROJECT_ID => 'kde-projects', # git-repository-base for kde_projects.xml }; -my $versionNum = '1.15'; +my $versionNum = '1.15.1'; # This is a hash since Perl doesn't have a "in" keyword. my %ignore_list; # List of packages to refuse to include in the build list. @@ -678,7 +678,9 @@ # Parent if (!$callbackRef && debugging()) { # If no other callback given, pass to debug() if debug-mode is on. - $callbackRef = sub { my $line = shift; chomp $line; debug($line); }; + $callbackRef = sub { + return unless $_; chomp; debug($_); + }; } # Final fallback: Do nothing @@ -3464,6 +3466,17 @@ return qw{qmake}; } + # Returns the absolute path to 'qmake'. Note the actual executable name may + # not necessarily be 'qmake' as some distributions rename it to allow for + # co-installability with Qt 3 (and 5...) + # If no suitable qmake can be found, undef is returned. + # This is a "static class method" i.e. use QMakeBuildSystem::absPathToQMake() + sub absPathToQMake + { + my @possibilities = qw/qmake qmake4 qmake-qt4 qmake-mac/; + return grep { main::absPathToExecutable($_) } @possibilities; + } + # Return value style: boolean sub configureInternal { @@ -3483,7 +3496,10 @@ } p_chdir($builddir); - return log_command($module, 'qmake', [ 'qmake', $projectFiles[0] ]) == 0; + + my $qmake = absPathToQMake(); + return 0 unless $qmake; + return log_command($module, 'qmake', [ $qmake, $projectFiles[0] ]) == 0; } 1; @@ -4352,14 +4368,14 @@ # Remove srcdir my $srcdir = $self->fullpath('source'); note ("\tRemoving b[r[$self source]."); - safe_rmtree($srcdir); + main::safe_rmtree($srcdir); } if($remove_setting eq 'builddir' || $remove_setting eq 'all') { # Remove builddir note ("\tRemoving b[r[$self build directory]."); - safe_rmtree($builddir); + main::safe_rmtree($builddir); } return 1; @@ -7769,7 +7785,14 @@ cmake => 'CMake', ); - if (!absPathToExecutable($prog)) { + my $programPath = absPathToExecutable($prog); + + # qmake is not necessarily named 'qmake' + if (!$programPath && $prog eq 'qmake') { + $programPath = QMakeBuildSystem::absPathToQMake(); + } + + if (!$programPath) { # Don't complain about Qt if we're building it... if ($prog eq 'qmake' && ( grep { $_->buildSystemType() eq 'Qt' } (@buildModules)) || diff -Nru kdesrc-build-1.15/kdesrc-build-test.pl kdesrc-build-1.15.1/kdesrc-build-test.pl --- kdesrc-build-1.15/kdesrc-build-test.pl 2012-05-05 23:37:48.000000000 +0000 +++ kdesrc-build-1.15.1/kdesrc-build-test.pl 2012-05-22 00:52:24.000000000 +0000 @@ -98,13 +98,23 @@ $ctx->setOption('branch', '4.3'); # Commence testing proper +p_chdir ($testSourceDirName); + SKIP: { skip 'git not installed', 1 unless defined absPathToExecutable('git'); + if (!is(system('git', 'init', 'test-git-dir'), 0, 'Create new git directory')) { + skip 'git does not work', 1; + } + + p_chdir('test-git-dir'); + my @gitStatusOutput = filter_program_output(sub { /On branch/ }, qw/git status/); is(@gitStatusOutput, 1, 'Correct number of items from filter_program_output'); is(`git status`, join('', filter_program_output(undef, qw/git status/)), 'Ensure filter_program_output works w/ no filter'); is($ctx->getSourceDir(), $ENV{HOME} . "/kdesrc-build-unused", 'Correct tilde-expansion for source-dir'); + + p_chdir($testSourceDirName); } # We know tilde-expansion works for source-dir, reset to our temp dir. diff -Nru kdesrc-build-1.15/README kdesrc-build-1.15.1/README --- kdesrc-build-1.15/README 2012-05-05 23:37:48.000000000 +0000 +++ kdesrc-build-1.15.1/README 2012-05-22 00:52:24.000000000 +0000 @@ -1,4 +1,4 @@ -kdesrc-build 1.15 +kdesrc-build 1.15.1 *** QUICK HOWTO ***