[Blends-commit] [SCM] blends-dev branch, master, updated. e92f76df405668338d2ec60542ef318f829c0f49

Andreas Tille tille at debian.org
Fri Aug 1 06:29:04 UTC 2014


The following commit has been merged in the master branch:
commit e92f76df405668338d2ec60542ef318f829c0f49
Author: Andreas Tille <tille at debian.org>
Date:   Fri Aug 1 08:28:44 2014 +0200

    Force explicitly "Section: metapackage" to the metapackages except if something else than 'misc' was set.  For the reason of this change please see bug #720199

diff --git a/debian/blends-common.NEWS.Debian b/debian/blends-common.NEWS.Debian
index 4db4770..632dc88 100644
--- a/debian/blends-common.NEWS.Debian
+++ b/debian/blends-common.NEWS.Debian
@@ -1,11 +1,11 @@
 blends (0.6.9) unstable; urgency=low
 
-  * Do not try to take over config files from /etc/cdd -
-    it just leads to trouble and is not worth the effort
-    because they are unchanged in most practical cases
-    --> Please check the files in /etc/cdd if existant and
-        take over the changes manually if needed to
-        /etc/blends
+  Do not try to take over config files from /etc/cdd -
+  it just leads to trouble and is not worth the effort
+  because they are unchanged in most practical cases
+  --> Please check the files in /etc/cdd if existant and
+      take over the changes manually if needed to
+      /etc/blends
 
  -- Andreas Tille <tille at debian.org>  Mon, 11 Jan 2010 19:23:04 +0100
 
diff --git a/debian/changelog b/debian/changelog
index 41291ed..128940f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,13 +1,17 @@
-blends (0.6.92) UNRELEASED; urgency=medium
+blends (0.6.92) unstable; urgency=medium
 
   [ Andreas Tille ]
   * Updated doc
+  * Force explicitly "Section: metapackage" to the metapackages except
+    if something else than 'misc' was set.  For the reason of this change
+    please see bug #720199
+  * Reformat NEWS.Debian entry
 
   [ Franklin Weng ]
   * Added EzGo as existing Blend
   * Better documentation for non-metapackages
 
- -- Andreas Tille <tille at debian.org>  Fri, 11 Apr 2014 15:56:32 +0200
+ -- Andreas Tille <tille at debian.org>  Mon, 28 Jul 2014 09:59:12 +0200
 
 blends (0.6.91) unstable; urgency=low
 
diff --git a/devtools/blend-gen-control b/devtools/blend-gen-control
index e20e30d..3e65a8e 100755
--- a/devtools/blend-gen-control
+++ b/devtools/blend-gen-control
@@ -181,8 +181,14 @@ sub gen_control {
 	}
         print "Package: $task\n";
 	
+	# metapackages should not be Section misc -> see #720199
+	if (defined $taskinfo{$task}{'Section'} && $taskinfo{$task}{'Section'} ne 'misc') {
+            print "Section: $taskinfo{$task}{'Section'}\n" ;
+        } else {
+            print "Section: metapackage\n" ;
+        }
         my $header;
-        for $header (qw(Section Architecture Priority)) {
+        for $header (qw(Architecture Priority)) {
             print "$header: $taskinfo{$task}{$header}\n"
                 if (defined $taskinfo{$task}{$header});
         }

-- 
Git repository for blends code



More information about the Blends-commit mailing list