← Back to branch summary

~ubuntu-branches/ubuntu/precise/xterm/precise-updates

« back to all changes in this revision

Viewing changes to package/debian/rules

  • Committer: Bazaar Package Importer
  • Author(s): Michael Vogt
  • Date: 2011-06-17 10:40:36 UTC
  • mfrom: (1.4.12 upstream) (11.1.26 sid)
  • Revision ID: james.westby@ubuntu.com-20110617104036-id4ml81yetasewp9
Tags: 270-1ubuntu1
* Merge from debian unstable.  Remaining changes:
  - debian/patches/950_ubuntu_charclass_highlight.diff: Enabled URL
    highlighting
  - debian/patches/Add 951_uxterm_utf8_title.diff: Set utf8Titles to true by
    default when using uxterm, so that it displays utf8 directories in titles
    properly.  May cause issues with apps that use control sequences for
    updating the xterm titlebar - users should use xterm or set utf8Title
    to false in this case.
  - debian/gbp.conf: Use "Ubuntu" in "debian-branch" directly

Show diffs side-by-side

added added

removed removed

Lines of Context:
package/debian/rules
139
139
                DESTDIR=$(DSTDIR)
140
140
 
141
141
        # Follow-up with a check against the installed resource files.
142
 
        ( cd $(DSTDIR)$(PKG_APPDEFAULTS) && $(SHELL) -c 'for p in *;do diff -u $$p $(PKG_APPDEFAULTS)/; done' ; exit 0 )
 
142
        ( cd $(DSTDIR)$(PKG_APPDEFAULTS) \
 
143
          && $(SHELL) -c 'for p in *; do \
 
144
                test -f $(PKG_APPDEFAULTS)/$$p && \
 
145
                diff -u $(PKG_APPDEFAULTS)/$$p $$p; \
 
146
                done' ; \
 
147
          exit 0 )
143
148
 
144
149
        # The Debian package does not install desktop files.
145
150
        # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=486317
155
160
 
156
161
        ( cd $(DSTDIR)$(PKG_DESKTOP) \
157
162
          && $(SHELL) -c 'for p in *;do \
 
163
                test -f $(PKG_DESKTOP)/$$p && \
 
164
                diff -u $(PKG_DESKTOP)/$$p $$p; \
158
165
                test -n "$(PKG_SUFFIX)" && mv $$p `basename $$p .desktop`$(PKG_SUFFIX).desktop; \
159
 
                diff -u $$p $(PKG_DESKTOP)/; \
160
166
                done' ; \
161
167
          exit 0 )
162
168