← Back to branch summary

~ubuntu-branches/ubuntu/utopic/acct/utopic

« back to all changes in this revision

Viewing changes to debian/patches/05-no-info-dir.patch

  • Committer: Bazaar Package Importer
  • Author(s): Colin Watson
  • Date: 2009-11-20 19:00:51 UTC
  • mfrom: (3.1.4 squeeze)
  • Revision ID: james.westby@ubuntu.com-20091120190051-ya3i3t9ygi4jpjgg
Tags: 6.4~pre1-9ubuntu1
* Resynchronise with Debian. Remaining changes:
  - Remove stop links from rc0 and rc6.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/05-no-info-dir.patch
 
1
Author: Santiago Vila <sanvila@debian.org>
 
2
Description: Prevent install-info from running at "make install" time
 
3
 
 
4
diff -ru acct-6.4~pre1.orig/Makefile.in acct-6.4~pre1/Makefile.in
 
5
--- acct-6.4~pre1.orig/Makefile.in      2009-08-24 12:28:51.000000000 +0200
 
6
+++ acct-6.4~pre1/Makefile.in   2009-08-31 13:05:44.000000000 +0200
 
7
@@ -981,8 +981,7 @@
 
8
          done; \
 
9
        done
 
10
        @$(POST_INSTALL)
 
11
-       @if (install-info --version && \
 
12
-            install-info --version 2>&1 | sed 1q | grep -i -v debian) >/dev/null 2>&1; then \
 
13
+       @if false; then \
 
14
          list='$(INFO_DEPS)'; \
 
15
          for file in $$list; do \
 
16
            relfile=`echo "$$file" | sed 's|^.*/||'`; \