Bug #11567

devel branch ISO build broken with pidgin 2.11.0-0+deb8u1

Added by intrigeri 2016-07-16 03:13:32 . Updated 2016-07-16 17:54:59 .

Status:
Resolved
Priority:
High
Assignee:
anonym
Category:
Target version:
Tails_2.5
Start date:
2016-07-16
Due date:
% Done:

100%

Feature Branch:
Type of work:
Code
Blueprint:

Starter:
Affected tool:
Deliverable for:

Description

07:15:56 Checking for .orig files
07:15:57 Some patches are fuzzy and leave .orig files around:
07:15:57 /usr/share/applications/pidgin.desktop.orig
07:15:57 E: config/chroot_local-hooks/01-check-for-dot-orig-files failed (exit non-zero). You should check for errors.

We should unfuzzy that patch or, better, replace it with a perl/sed command.

Subtasks

Related issues

Related to Tails - Bug #11568: stable branch ISO build broken with pidgin 2.11.0-0+deb8u1 Resolved 2016-07-16

History

#1 Updated by intrigeri 2016-07-16 03:13:50

I’ll handle it on Monday if nobody beats me to it.

#2 Updated by intrigeri 2016-07-16 03:14:46

  • Subject changed from ISO build broken with pidgin 2.11.0-0+deb8u1 to devel branch ISO build broken with pidgin 2.11.0-0+deb8u1

#3 Updated by intrigeri 2016-07-16 03:15:42

  • related to Bug #11568: stable branch ISO build broken with pidgin 2.11.0-0+deb8u1 added

#4 Updated by intrigeri 2016-07-16 14:35:13

  • Status changed from Confirmed to Fix committed
  • Assignee set to anonym
  • % Done changed from 0 to 50

Pushed commit:eb816e6f3120e8722cebbfce8551096973dcf9f3 directly to stable and devel, please review. Note that stable build will still be broken until Bug #11568 is fixed as well.

#5 Updated by intrigeri 2016-07-16 17:54:59

  • Status changed from Fix committed to Resolved
  • % Done changed from 50 to 100

Applied in changeset commit:eb816e6f3120e8722cebbfce8551096973dcf9f3.