Please merge acpid 1:2.0.7-1 (main) from Debian unstable (main)

Looks like the patch does not apply againts 1:2.0.0-2

daniel@bert:~/acpid-2.0.0$ patch -p1 < ../acpid.debdiff
patching file acpid.install
Hunk #1 FAILED at 1.
1 out of 1 hunk FAILED -- saving rejects to file acpid.install.rej
patching file acpid.preinst
Hunk #1 FAILED at 16.
1 out of 1 hunk FAILED -- saving rejects to file acpid.preinst.rej
patching file acpid.upstart
patching file changelog
Hunk #1 FAILED at 1.
Hunk #2 FAILED at 6.
Hunk #3 FAILED at 13.
Hunk #4 FAILED at 259.
4 out of 4 hunks FAILED -- saving rejects to file changelog.rej
patching file control
Hunk #1 FAILED at 1.
1 out of 1 hunk FAILED -- saving rejects to file control.rej
patching file rules
Hunk #1 FAILED at 24.
1 out of 1 hunk FAILED -- saving rejects to file rules.rej
daniel@bert:~/acpid-2.0.0$

Alright I fixed my changelog and I am attaching the fixed diff. Daniel could you try patching with -p0 geser tested it and said it works fine on -p0. Thanks.

Did you edit the patch file by hand?

daniel@bert:~/acpid-2.0.1$ patch -p0 < ../acpid.debdiff
patching file debian/acpid.install
patching file debian/acpid.preinst
patching file debian/acpid.upstart
patching file debian/changelog
patch: **** malformed patch at line 79: + -- Vikram Dhillon <email address hidden> Thu, 14 Jan 2010 23:17:43 -0500

daniel@bert:~/acpid-2.0.1$

Sorry for the inconvenience Daniel, and thanks for waiting, I fixed the patch :)

vikram@ubuntu-devel:~/Documents/MOTU/syncs/acpid_merge/build/acpid-2.0.1$ patch -p0 < debian_acpid.debdiff
patching file debian/acpid.install
patching file debian/acpid.preinst
patching file debian/acpid.upstart
patching file debian/changelog
patching file debian/control
patching file debian/powerbtn.sh
patching file debian/rules
vikram@ubuntu-devel:~/Documents/MOTU/syncs/acpid_merge/build/acpid-2.0.1$

A few things I noticed in your patch:
 - 'karmic' instead of 'lucid'
 - You updated the Standards-Version which is an unnecessary string change and best done in Debian
 - Where is the following change: "drop the Recommends: on acpi-support-base for the same reason."?
 - Where is the following change: "Bump build-dependency on debhelper for Upstart-aware dh_installinit"?
 - Where is "Source /usr/share/acpi-support/power-funcs in powerbtn.sh (LP: #508073)"?

Also will this need a Feature Freeze exception: https://wiki.ubuntu.com/FreezeExceptionProcess

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 03/02/2010 03:55 AM, Daniel Holbach wrote:
> Also will this need a Feature Freeze exception:
> https://wiki.ubuntu.com/FreezeExceptionProcess
>

I fixed the changes you asked, attaching the fixed diff, also can I just
request the feature freeze exception here? The patch also applies fine
on -p0 :

vikram@ubuntu-devel:~/Documents/MOTU/syncs/acpid_merge/build/acpid-2.0.2$ patch
- -p0 < acpid_merge_fixed
patching file Changelog
patching file Makefile
patching file README
patching file README-NETLINK
patching file connection_list.c
patching file debian/acpid.install
patching file debian/acpid.preinst
patching file debian/acpid.upstart
patching file debian/changelog
patching file debian/control
patching file debian/powerbtn.sh
patching file debian/rules
patching file event.c
vikram@ubuntu-devel:~/Documents/MOTU/syncs/acpid_merge/build/acpid-2.0.2$

- --
Regards,
Vikram Dhillon

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)

iEYEARECAAYFAkuTCdsACgkQcoBavQdRHcy/dACfZpWOYvlJLU1CnuBwf+mZrpgb
0PsAnj74ppVSobQS4RI2Qagqjaq4Qdcr
=jgz8
-----END PGP SIGNATURE-----

Feature Freeze Exception Requested:

Reason: A patch is provided to merge a package (acpid) from Debian Testing to Ubuntu Lucid LTS Release.

unsubscribing ubuntu-sponsors. Resubscribe once FFe is granted.

> Reason: A patch is provided to merge a package (acpid) from Debian Testing to Ubuntu Lucid LTS Release.

That is not a very strong reason. There seem to be tons of changes in acpid in Debian, and we have been in feature freeze for quite some time. NACK for lucid for now, until/unless someone provides a stronger reason, in which case this can be revisited.

unsubscribing release team in the meantime since this has been nack'ed for lucid.

Can you update your debdiff against the latest version in unstable and resubscribe ubuntu-sponsors?

As there's not been any activity for a while, I'm going to do this merge.

This bug was fixed in the package acpid - 1:2.0.7-1ubuntu1

---------------
acpid (1:2.0.7-1ubuntu1) natty; urgency=low

  * Merge from debian unstable (LP: #507778), remaining changes:
    - Replace init script with Upstart job
      + This does not load modules, unlike the init script, since these are
        all loaded by ACPI:* modaliases now (and thus by udev)
    - debian/control: Bump build-dependency on debhelper for Upstart-aware
      dh_installinit
    - debian/preinst, debian/acpid.install, debian/control, debian/rules:
      continue installing /etc/acpi/events/powerbtn and /etc/acpi/powerbtn.sh,
      deferring the migration to acpi-support-base; and drop the Recommends:
      on acpi-support-base for the same reason.
    - Source /usr/share/acpi-support/power-funcs in powerbtn.sh (LP: #508073)
    - debian/powerbtn.sh: ensure that /usr/share/acpi-support/power-funcs
      exists before sourcing it; note that acpid does not depend on
      acpi-support (which is fine, as it brings in lots of X dependencies
      not appropriate for servers); this fix will allow Ubuntu servers
      (especially those in VMs) to run acpid and catch and handle power
      button events again; LP: #570450
  * Dropped changes:
    - New patch, missing-includes, to fix missing includes of sys/types.h and
      sys/stat.h for umask() and stat() in acpid.c; fixes FTBFS: no longer
      needed
    - Update patch missing-includes to also fix the same missing includes in
      sock.c; this is all fixed in 2.0.x versions of acpid: no longer needed

acpid (1:2.0.7-1) unstable; urgency=low

  * Imported Upstream version 2.0.7

acpid (1:2.0.6-2) unstable; urgency=low

  * Added prepatch from 2.0.7 to remove superfluous logging. (Closes:
    #598198)
  * Added prepatch from 2.0.7 to add support for more buttons. (Closes:
    #600564) - thanks to Stanislav Maslovski
    <email address hidden>
  * Bumped Standards-Version to 3.9.1, no changes needed.

acpid (1:2.0.6-1) unstable; urgency=low

  * Imported Upstream version 2.0.6

acpid (1:2.0.5-1) unstable; urgency=low

  * Imported Upstream version 2.0.5

acpid (1:2.0.4-1) unstable; urgency=low

  * New Upstream version 2.0.4
  * Added source format file.

acpid (1:2.0.3-1) unstable; urgency=low

  * New Upstream version 2.0.3

acpid (1:2.0.2-1) unstable; urgency=low

  * New upstream version.
  * Bumped Standards-Version to 3.8.4, no changes needed.

acpid (1:2.0.1-2) unstable; urgency=low

  * Acpid does work on non-i386/amd64 archs but not on non-linux
    systems.
  * Prevent breakage of Xserver resulting from a may connection number
    that was set too low. (Closes: #565908) - thanks to Willi Mann
    <email address hidden>
  * Extended kacpimon description to explain the package a little bit
    better.
  * Escape unescaped dashes in manpage.

acpid (1:2.0.1-1) unstable; urgency=low

  * Imported Upstream version 2.0.1
  * Removed patch system which is no longer needed because upstream included
    all our patches.
  * Install kacpimon manpage.

acpid (1:2.0.0-2) unstable; urgency=low

  * Put kacpimon back into the right section and priority.
  * Make loading of all modules work with modules.dep files wit...