← Back to branch summary

~ubuntu-branches/ubuntu/trusty/xscreensaver/trusty

« back to all changes in this revision

Viewing changes to debian/patches/80_Makefile_in-clean-fix.patch

  • Committer: Bazaar Package Importer
  • Author(s): Robert Ancell
  • Date: 2009-11-30 13:33:13 UTC
  • mfrom: (1.1.8 upstream) (2.1.6 squeeze)
  • Revision ID: james.westby@ubuntu.com-20091130133313-3b5nz2e7hvbb8h3l
Tags: 5.10-3ubuntu1
https://launchpad.net/bugs/489062
* Merge with Debian unstable, remaining changes: (LP: #489062)
  - debian/control: add Build-Depends on ubuntu-artwork
  - debian/rules: use /usr/share/backgrounds
  - debian/control: Move xli | xloadimage recommends to suggests
  - debian/split-hacks.config: Use different set of default hacks to Debian
  - debian/source_xscreensaver.py: Add apport hook
  - debian/patches/53_XScreenSaver.ad.in.patch: Use Ubuntu branding

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/80_Makefile_in-clean-fix.patch
 
1
#
 
2
# The autoconf makefiles make for some interesting chicken and the
 
3
# egg problems when running debian/rules clean:
 
4
# po/Makefile distclean depends on ./config.status through its
 
5
# Makefile target, so clean the subdirs first
 
6
# This is maybe another autoconf 2.64 problem
 
7
#
 
8
Index: xscreensaver/Makefile.in
 
9
===================================================================
 
10
--- xscreensaver.orig/Makefile.in       2009-09-07 00:23:53.000000000 +0200
 
11
+++ xscreensaver/Makefile.in    2009-09-07 00:24:14.000000000 +0200
 
12
@@ -54,8 +54,8 @@
 
13
        @$(MAKE_SUBDIR2)
 
14
 
 
15
 distclean:: clean
 
16
-       -rm -f config.h Makefile config.status config.cache config.log TAGS *~ "#"* intltool-extract intltool-merge intltool-update
 
17
        @$(MAKE_SUBDIR2)
 
18
+       -rm -f config.h Makefile config.status config.cache config.log TAGS *~ "#"* intltool-extract intltool-merge intltool-update
 
19
 
 
20
 dist:: tar
 
21