[SCM] Debian Qt/KDE packaging tools branch, experimental, updated. master/0.4.2-9-ga96bd7f

[Modestas Vainius]

The following commit has been merged in the experimental branch:
commit e5bb118dec761205f0b90b13a0313de1afd152fb
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Sat Apr 11 16:41:03 2009 +0300

    Improve output of the patch subcommand.
    
    Signed-off-by: Modestas Vainius <modestas at vainius.eu>

diff --git a/symbolshelper/Debian/PkgKde/SymHelper/Handlers.pm b/symbolshelper/Debian/PkgKde/SymHelper/Handlers.pm
index 2e14a8b..02bec6d 100644
--- a/symbolshelper/Debian/PkgKde/SymHelper/Handlers.pm
+++ b/symbolshelper/Debian/PkgKde/SymHelper/Handlers.pm
@@ -432,8 +432,18 @@ sub apply_patch_to_template {
         # Resync private symbols in newsymfile with archsymfile
         $newsymfile->resync_private_symbols($archsymfile);
 
-        # Process lost symbols
-        $insymfile->merge_lost_symbols_to_template($archsymfile, $newsymfile);
+        # Merge lost symbols
+        if ($insymfile->merge_lost_symbols_to_template($archsymfile, $newsymfile)) {
+            # Dump new MISSING symbols
+            my $dummysymfile = new Debian::PkgKde::SymHelper::SymbFile();
+            $dummysymfile->merge_lost_symbols_to_template($archsymfile, $newsymfile);
+
+            info("-- Added new MISSING symbols --\n");
+            while (my ($soname, $obj) = each %{$dummysymfile->{objects}}) {
+                $obj->{deps} = [ 'dummy dep' ];
+            }
+            $dummysymfile->dump(*STDOUT, with_deprecated => 1);
+        }
 
         # Now process new symbols. We need to create a template from them
         if (my $dummysymfile = $newsymfile->get_new_symbols_as_symbfile($archsymfile)) {
@@ -442,6 +452,9 @@ sub apply_patch_to_template {
 
             # Handle min version
             $dummysymfile->handle_min_version($newminver, with_deprecated => 1);
+
+            # Dump new symbols
+            info("-- Added new symbols --\n");
             $dummysymfile->dump(*STDOUT, with_deprecated => 2);
 
             # Create a symbols template for our dummy file
diff --git a/symbolshelper/Debian/PkgKde/SymHelper/SymbFile.pm b/symbolshelper/Debian/PkgKde/SymHelper/SymbFile.pm
index 9edd87d..6b2ba46 100644
--- a/symbolshelper/Debian/PkgKde/SymHelper/SymbFile.pm
+++ b/symbolshelper/Debian/PkgKde/SymHelper/SymbFile.pm
@@ -222,7 +222,8 @@ sub resync_private_symbol_versions {
 
 sub merge_lost_symbols_to_template {
     my ($self, $origsymfile, $newsymfile) = @_;
-    # Note: origsymfile must be = $self->substitute()
+    my $count = 0;
+    # Note: $origsymfile should normally be result of  $self->substitute()
 
     # Process symbols which are missing (lost) in $newsymfile
     for my $n ($newsymfile->get_lost_symbols($origsymfile)) {
@@ -239,7 +240,9 @@ sub merge_lost_symbols_to_template {
             # Mark as missing
             $self->{objects}{$soname}{syms}{$mysym}{deprecated} = "LOST UNKNOWNVER";
         }
+        $count++;
     }
+    return $count;
 }
 
 sub get_new_symbols_as_symbfile {

-- 
Debian Qt/KDE packaging tools