Merge lp:~debbie-beliveau/ubuntu/maverick/ubiquity/ubiquity-depends-fix into lp:ubuntu/maverick/ubiquity

[Debbie Beliveau]

Cleans up runtime dependencies by removing (unspecified) dependency on perl-modules and specifying dependency on wget. userdel change already reviewed by Martin Pitt (though "|| true" portion of change was added after his review).

[Debbie Beliveau (debbie-beliveau)]

Hi Evan,

Martin Pitt suggested I pass the userdel change to you and I figured I'd add the wget change as well.

Let me know if you have any questions or would rather me file a bug and attach a patch.

-Debbie

[Matt Zimmerman (mdz)]

perl-modules is declared as a Suggests of adduser. This means that perl-modules is "related" to the depending package and "can perhaps enhance its usefulness, but that installing this one without them is perfectly reasonable."

Since basic deluser functionality works without perl-modules, I think this is accurate. perl-modules is only required for --remove-home. I am surprised if ubiquity doesn't depend on perl somewhere in its dependency chain, but technically ubiquity should probably depend on perl if it requires this functionality.

Suggestions:
- Revise the comment and changelog with regard to the perl-modules dependency
- Consider using plain deluser (without --remove-home) instead of userdel, since they have different behavior (and could diverge more in the future)

[lp:~debbie-beliveau/ubuntu/maverick/ubiquity/ubiquity-depends-fix]

343. By Debbie Beliveau on 2010-06-24

  * bin/oem-config-wrapper: use deluser instead of userdel to delete oem user
  * and change comment explaining why /home/oem is being deleted manually
  * debian/changelog: update existing 2.2.25 entry to reflect above changes
  * Change distribution to UNRELEASED

[Debbie Beliveau (debbie-beliveau)]

Modified changes in response to suggestions from Matt. Specifically, use deluser instead of userdel and update comments and changelog accordingly.

Unmerged revisions

343. By Debbie Beliveau on 2010-06-24

  * bin/oem-config-wrapper: use deluser instead of userdel to delete oem user
  * and change comment explaining why /home/oem is being deleted manually
  * debian/changelog: update existing 2.2.25 entry to reflect above changes
  * Change distribution to UNRELEASED

342. By Debbie Beliveau on 2010-06-22

* bin/oem-config-wrapper: Use userdel rather than deluser to remove oem user
  as deluser requires perl-modules which is a large, unspecified dependency
* debian/control: Add wget to Depends as ubi-language.py plugin calls wget

=== modified file 'bin/oem-config-wrapper'
--- bin/oem-config-wrapper	2010-04-14 17:38:36 +0000
+++ bin/oem-config-wrapper	2010-06-24 23:40:56 +0000
@@ -11,7 +11,11 @@
 
 # Remove the temporary OEM configuration user, if possible.
 if getent passwd oem >/dev/null; then
-	deluser --quiet --remove-home oem || true
+	# Manually remove /home/oem rather than pass --remove-home to deluser
+	# as --remove-home uses perl-modules which is not required by ubiquity
+	# (and ideally should not be for size reasons).
+	deluser --quiet oem || true
+	rm -rf /home/oem
 fi
 
 # Cleanup from anything the early command prepared

=== modified file 'debian/changelog'
--- debian/changelog	2010-04-29 10:36:42 +0000
+++ debian/changelog	2010-06-24 23:40:56 +0000
@@ -1,3 +1,12 @@
+ubiquity (2.2.25) UNRELEASED; urgency=low
+
+  * bin/oem-config-wrapper: Manually remove /home/oem rather than pass
+    --remove-home to deluser as --remove-home uses perl-modules which is not
+    required by ubiquity (and ideally should not be for size reasons).
+  * debian/control: Add wget to Depends as ubi-language.py plugin calls wget
+
+ -- Debbie Beliveau <[e-mail]>  Tue, 22 Jun 2010 14:43:03 -0400
+
 ubiquity (2.2.24) lucid-updates; urgency=low
 
   * Automatic update of included source packages: migration-assistant

=== modified file 'debian/control'
--- debian/control	2010-04-19 09:33:15 +0000
+++ debian/control	2010-06-24 23:40:56 +0000
@@ -10,7 +10,7 @@
 
 Package: ubiquity
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, debconf (>= 1.4.72ubuntu5), ubiquity-frontend-${mangled-version}, ubiquity-artwork-${mangled-version}, laptop-detect, lsb-release, ubiquity-casper, python-apt (>= 0.6.16.2ubuntu4), ${console-setup-depends}, iso-codes, passwd, adduser, os-prober, rdate, ntfsprogs [any-alpha any-amd64 any-i386 any-ia64 any-lpia], ecryptfs-utils, cryptsetup, python-pyicu, reiserfsprogs, language-selector-common (>= 0.4.16)
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, debconf (>= 1.4.72ubuntu5), ubiquity-frontend-${mangled-version}, ubiquity-artwork-${mangled-version}, laptop-detect, lsb-release, ubiquity-casper, python-apt (>= 0.6.16.2ubuntu4), ${console-setup-depends}, iso-codes, passwd, adduser, os-prober, rdate, ntfsprogs [any-alpha any-amd64 any-i386 any-ia64 any-lpia], ecryptfs-utils, cryptsetup, python-pyicu, reiserfsprogs, language-selector-common (>= 0.4.16), wget
 Recommends: grub-pc [any-amd64 any-i386 any-lpia] | grub [any-amd64 any-i386 any-lpia], flash-kernel [armel], uboot-mkimage [armel], uboot-envtools [armel], redboot-tools [armel], yaboot [powerpc], hfsutils [powerpc], silo [sparc], dmraid
 Conflicts: ubuntu-express, espresso, espresso-utils, espresso-locale, espresso-keyboard-setup, espresso-kbd-chooser, espresso-timezone, user-setup (<< 0.05ubuntu6), partman, espresso-grub, espresso-yaboot
 Replaces: ubuntu-express, espresso, espresso-utils, espresso-locale, espresso-keyboard-setup, espresso-kbd-chooser, espresso-timezone, user-setup (<< 0.05ubuntu6), partman, espresso-grub, espresso-yaboot, ubiquity-frontend-gtk (<< 0.99.82)