[Bug 42803] cruft in two patches in the ubuntu-specific patchset

[dkg]

Public bug reported:

Affects: gdm (Ubuntu)
       Severity: Normal
       Priority: (none set)
         Status: Unconfirmed


Description:
This is a low-priority bug focused on cleaning up the ubuntu changeset
for gdm:

It appears that debian/patches/11_powermanagement.patch (at least in
version 2.14.4-0ubuntu3) contains a set of .orig files, which most
likely represent the crufty residue of some failed patch application at
some point.  You could reduce the size of this patch significantly (and
help clean up 17_icons_for_menu.patch, which tries to clean up after one
of these files -- gui/greeter/greeter_system.c.orig).  Hopefully,
reducing the size of a patch will help its adoption by upstream and by
debian.

Thanks for maintaining gdm for ubuntu!

  --dkg

----------------------------------------------------
Here's the bit i'm talking about:

[dkg at pluto patches]$ pwd
/home/cal/dkg/src/gdm/gdm-2.14.4/debian/patches
[dkg at pluto patches]$ grep -irA4 '\.orig ' *
11_powermanagement.patch:diff -Nur gdm-2.13.0.8/daemon/gdmconfig.c.orig gdm-2.13.0.8.new/daemon/gdmconfig.c.orig
11_powermanagement.patch---- gdm-2.13.0.8/daemon/gdmconfig.c.orig	1970-01-01 01:00:00.000000000 +0100
11_powermanagement.patch-+++ gdm-2.13.0.8.new/daemon/gdmconfig.c.orig	2006-02-14 15:23:30.000000000 +0100
11_powermanagement.patch-@@ -0,0 +1,2492 @@
11_powermanagement.patch-+/* GDM - The GNOME Display Manager
--
11_powermanagement.patch:diff -Nur gdm-2.13.0.8/daemon/gdm.c.orig gdm-2.13.0.8.new/daemon/gdm.c.orig
11_powermanagement.patch---- gdm-2.13.0.8/daemon/gdm.c.orig	1970-01-01 01:00:00.000000000 +0100
11_powermanagement.patch-+++ gdm-2.13.0.8.new/daemon/gdm.c.orig	2006-02-14 15:23:30.000000000 +0100
11_powermanagement.patch-@@ -0,0 +1,3372 @@
11_powermanagement.patch-+/* GDM - The GNOME Display Manager
--
11_powermanagement.patch:diff -Nur gdm-2.13.0.8/daemon/gdm.h.orig gdm-2.13.0.8.new/daemon/gdm.h.orig
11_powermanagement.patch---- gdm-2.13.0.8/daemon/gdm.h.orig	1970-01-01 01:00:00.000000000 +0100
11_powermanagement.patch-+++ gdm-2.13.0.8.new/daemon/gdm.h.orig	2006-02-14 15:23:30.000000000 +0100
11_powermanagement.patch-@@ -0,0 +1,1245 @@
11_powermanagement.patch-+/* GDM - The GNOME Display Manager
--
11_powermanagement.patch:diff -Nur gdm-2.13.0.8/gui/greeter/greeter.c.orig gdm-2.13.0.8.new/gui/greeter/greeter.c.orig
11_powermanagement.patch---- gdm-2.13.0.8/gui/greeter/greeter.c.orig	1970-01-01 01:00:00.000000000 +0100
11_powermanagement.patch-+++ gdm-2.13.0.8.new/gui/greeter/greeter.c.orig	2006-02-14 15:23:30.000000000 +0100
11_powermanagement.patch-@@ -0,0 +1,1348 @@
11_powermanagement.patch-+/* GDM - The GNOME Display Manager
--
11_powermanagement.patch:diff -Nur gdm-2.13.0.8/gui/greeter/greeter_item.c.orig gdm-2.13.0.8.new/gui/greeter/greeter_item.c.orig
11_powermanagement.patch---- gdm-2.13.0.8/gui/greeter/greeter_item.c.orig	1970-01-01 01:00:00.000000000 +0100
11_powermanagement.patch-+++ gdm-2.13.0.8.new/gui/greeter/greeter_item.c.orig	2006-02-14 15:23:30.000000000 +0100
11_powermanagement.patch-@@ -0,0 +1,218 @@
11_powermanagement.patch-+/* GDM - The GNOME Display Manager
--
11_powermanagement.patch:diff -Nur gdm-2.13.0.8/gui/greeter/greeter_system.c.orig gdm-2.13.0.8.new/gui/greeter/greeter_system.c.orig
11_powermanagement.patch---- gdm-2.13.0.8/gui/greeter/greeter_system.c.orig	1970-01-01 01:00:00.000000000 +0100
11_powermanagement.patch-+++ gdm-2.13.0.8.new/gui/greeter/greeter_system.c.orig	2006-02-14 15:23:30.000000000 +0100
11_powermanagement.patch-@@ -0,0 +1,447 @@
11_powermanagement.patch-+/* GDM - The GNOME Display Manager
--
17_icons_for_menu.patch:diff -Nur gdm-2.13.0.9/gui/greeter/greeter_system.c.orig gdm-2.13.0.9.new/gui/greeter/greeter_system.c.orig
17_icons_for_menu.patch---- gdm-2.13.0.9/gui/greeter/greeter_system.c.orig	2006-03-07 11:59:43.000000000 +0000
17_icons_for_menu.patch-+++ gdm-2.13.0.9.new/gui/greeter/greeter_system.c.orig	1970-01-01 01:00:00.000000000 +0100
17_icons_for_menu.patch-@@ -1,447 +0,0 @@
17_icons_for_menu.patch--/* GDM - The GNOME Display Manager
[dkg at pluto patches]$

-- 
cruft in two patches in the ubuntu-specific patchset
https://launchpad.net/bugs/42803