[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#699471: tasksel: diff for NMU version 3.14+nmu1



Package: tasksel
Version: 3.14
Severity: normal
Tags: patch pending

Dear maintainer,

I've prepared an NMU for tasksel (versioned as 3.14+nmu1) and will
upload it in a few seconds.  diff against 3.14 attached, I'm pretending
3.14+deb7u1 never happened.

diff against current git master:

diff --git a/debian/changelog b/debian/changelog
index d03e7e0..bf94793 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,14 +1,16 @@
-tasksel (3.15) UNRELEASED; urgency=low
+tasksel (3.14+nmu1) unstable; urgency=low
+
+  [ Julien Cristau ]
+  * Non-maintainer upload.
 
   [ Joey Hess ]
-  * Change default desktop to xfce.
   * Fix typo in changelog. Closes: #694894
   
   [ Christian Perrier ]
   * Add Depends to network-manager-gnome on task-gnome-desktop
     Closes: #697868
 
- -- Christian Perrier <bubulle@debian.org>  Sun, 11 Nov 2012 12:01:59 +0100
+ -- Julien Cristau <jcristau@debian.org>  Thu, 31 Jan 2013 19:19:25 +0100
 
 tasksel (3.14) unstable; urgency=low
 

Cheers,
Julien
diff -Nru tasksel-3.14/.gitattributes tasksel-3.14+nmu1/.gitattributes
--- tasksel-3.14/.gitattributes	2011-04-23 07:51:14.000000000 +0200
+++ tasksel-3.14+nmu1/.gitattributes	1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-debian/changelog merge=dpkg-mergechangelogs
diff -Nru tasksel-3.14/debian/changelog tasksel-3.14+nmu1/debian/changelog
--- tasksel-3.14/debian/changelog	2012-10-30 19:09:30.000000000 +0100
+++ tasksel-3.14+nmu1/debian/changelog	2013-01-31 19:19:56.000000000 +0100
@@ -1,3 +1,17 @@
+tasksel (3.14+nmu1) unstable; urgency=low
+
+  [ Julien Cristau ]
+  * Non-maintainer upload.
+
+  [ Joey Hess ]
+  * Fix typo in changelog. Closes: #694894
+  
+  [ Christian Perrier ]
+  * Add Depends to network-manager-gnome on task-gnome-desktop
+    Closes: #697868
+
+ -- Julien Cristau <jcristau@debian.org>  Thu, 31 Jan 2013 19:19:25 +0100
+
 tasksel (3.14) unstable; urgency=low
 
   [ Joey Hess ]
@@ -405,8 +419,8 @@
     packages. In other words, the Task field overrides are not needed,
     and are going away. The overrides file uploaded with this version
     of tasksel is empty.
-  * Tasksel no longer looks for desc files in /usr/share/taksel/,
-    instead it looks in /usr/share/taksel/descs/. This was necessary
+  * Tasksel no longer looks for desc files in /usr/share/tasksel/,
+    instead it looks in /usr/share/tasksel/descs/. This was necessary
     because aptitude crashes on the new debian-tasks.desc file without
     Description fields.
   * Remove rarian-compat from task-gnome-desktop. Dependencies on
diff -Nru tasksel-3.14/debian/control tasksel-3.14+nmu1/debian/control
--- tasksel-3.14/debian/control	2012-10-30 19:08:23.000000000 +0100
+++ tasksel-3.14+nmu1/debian/control	2013-01-31 19:17:35.000000000 +0100
@@ -72,7 +72,9 @@
 Depends: ${misc:Depends}, 
 	task-desktop,
 # only depend on a very minimal gnome desktop, to ensure it fits on CD1
-	gnome-core
+	gnome-core,
+# but we need a working network setup at least
+	network-manager-gnome
 Recommends:
 # The full gnome desktop environment should be included if possible
 # even if the larger gnome metapackage doesn't fit.

Attachment: signature.asc
Description: Digital signature


Reply to: