r43281 - in /tools/gnome-pkg-tools: debian/changelog dh/dh_gnome_clean

[jcristau at users.alioth.debian.org]

Author: jcristau
Date: Mon Sep 29 19:17:54 2014
New Revision: 43281

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=43281
Log:
Fix dh_gnome_clean to only consider members of pkg-gnome for addition in Uploaders.

Modified:
    tools/gnome-pkg-tools/debian/changelog
    tools/gnome-pkg-tools/dh/dh_gnome_clean

Modified: tools/gnome-pkg-tools/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/tools/gnome-pkg-tools/debian/changelog?rev=43281&op=diff
==============================================================================
--- tools/gnome-pkg-tools/debian/changelog	[utf-8] (original)
+++ tools/gnome-pkg-tools/debian/changelog	[utf-8] Mon Sep 29 19:17:54 2014
@@ -1,3 +1,9 @@
+gnome-pkg-tools (0.19.5) UNRELEASED; urgency=medium
+
+  * Fix dh_gnome_clean to only consider members of pkg-gnome for addition in Uploaders.
+
+ -- Julien Cristau <jcristau at debian.org>  Mon, 29 Sep 2014 21:15:49 +0200
+
 gnome-pkg-tools (0.19.4) unstable; urgency=low
 
   [ Iain Lane ]

Modified: tools/gnome-pkg-tools/dh/dh_gnome_clean
URL: http://svn.debian.org/wsvn/pkg-gnome/tools/gnome-pkg-tools/dh/dh_gnome_clean?rev=43281&op=diff
==============================================================================
--- tools/gnome-pkg-tools/dh/dh_gnome_clean	[utf-8] (original)
+++ tools/gnome-pkg-tools/dh/dh_gnome_clean	[utf-8] Mon Sep 29 19:17:54 2014
@@ -73,20 +73,23 @@
     my @header = <FILE>;
     close FILE;
 
-    # Determine who uploaded package so far
-    open FILE, "debian/changelog" or die $!;
-    foreach my $line (<FILE>) {
-        if ($line =~ m/^ -- (.*>)  /) {
-            push (@uploaders, $1);
-        }
-    }
-    close FILE;
-
     # Determine pkg-gnome team members
     open FILE, $team_list or die $!;
     foreach my $line (<FILE>) {
         if ($line =~ s/,//) {
             push (@team_list, $line);
+        }
+    }
+    close FILE;
+
+    # Determine who uploaded package so far
+    open FILE, "debian/changelog" or die $!;
+    foreach my $line (<FILE>) {
+        if ($line =~ m/^ -- (.*>)  /) {
+            my $uploader = $1;
+            if (grep { $_ =~ $uploader } @team_list) {
+                push (@uploaders, $uploader);
+            }
         }
     }
     close FILE;
@@ -100,7 +103,7 @@
     }
     $maintainer or die "Unable to determine Maintainer";
 
-    # Maintainer must not be listed in Uploader
+    # Maintainer must not be listed in Uploaders
     if (my ($index) = grep { $team_list[$_] =~ $maintainer } 0..$#team_list) {
         delete $team_list[$index];
     }