← Back to branch summary

~ubuntu-branches/ubuntu/hardy/linux-restricted-modules-envy-2.6.24/hardy-proposed

« back to all changes in this revision

Viewing changes to debian/rules

  • Committer: Bazaar Package Importer
  • Author(s): Alberto Milone (tseliot)
  • Date: 2008-05-11 22:53:29 UTC
  • Revision ID: james.westby@ubuntu.com-20080511225329-m0gxdmd7wujlchbf
Tags: 2.6.24.500-500.29
* Fix (LP: ##227717) Look for diversions in xorg-driver-fglrx-envy.preinst and remove them
* touch envy-dkms directly into the package
* Be more tolerant when diversions of 32bit compatibility libraries no
  longer exist
* Check diversions in nvidia-glx-dev in a more sensible way

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/rules
1172
1172
                install $(CURDIR)/debian/nvidia-glx$${nv_flav}-envy.reportbug                   \
1173
1173
                        $(CURDIR)/debian/nvidia-glx$${nv_flav}-envy/usr/share/bug/nvidia-glx$${nv_flav}-envy/script; \
1174
1174
                mkdir -p $(CURDIR)/debian/nvidia-glx$${nv_flav}-envy/etc/default/;                      \
1175
 
                if ! [ -f $(CURDIR)/debian/envy-dkms ]; then                                                                    \
1176
 
                        touch $(CURDIR)/debian/envy-dkms;                                                                               \
1177
 
                fi;                                                                             \
1178
 
                install $(CURDIR)/debian/envy-dkms                                                                              \
1179
 
                                $(CURDIR)/debian/nvidia-glx$${nv_flav}-envy/etc/default/;                       \
 
1175
                touch $(CURDIR)/debian/nvidia-glx$${nv_flav}-envy/etc/default/envy-dkms ;       \
1180
1176
                rm -f $(CURDIR)/debian/envy-dkms;                                                                               \
1181
1177
                mkdir -p $(CURDIR)/debian/nvidia$${nv_flav}-kernel-source-envy ;                        \
1182
1178
                cp -a $(CURDIR)/debian/nv$${nv_flav}-kernel-source-envy/*                               \