← Back to branch summary

~ubuntu-branches/debian/sid/xscreensaver/sid

« back to all changes in this revision

Viewing changes to debian/rules

  • Committer: Bazaar Package Importer
  • Author(s): Jose Luis Rivas, Tormod Volden, Jose Luis Rivas
  • Date: 2008-07-15 14:48:48 UTC
  • mfrom: (1.1.5 upstream)
  • Revision ID: james.westby@ubuntu.com-20080715144848-c6c6mhyxij0dk2p7
Tags: 5.05-3
http://bugs.debian.org/482385
http://bugs.debian.org/428797
http://bugs.debian.org/471920
http://bugs.debian.org/453708
http://bugs.debian.org/473681
http://bugs.debian.org/479715
http://bugs.debian.org/480231
http://bugs.debian.org/480592
http://bugs.debian.org/484112
[ Tormod Volden ]
* debian/patches/10_jwz-xscreensaver-randr-patch-3.patch:
  from upstream, addresses issues with xrandr/xinerama
  (Closes: #482385, #428797, #471920, #453708, #473681, #479715, #480231)
* fixed typo "screen < real_nscreens" in driver/lock:1527 from above patch
* drop 61_DualHead-nVidia_bug471920.patch (obsolete)
* drop 67_XineRama-mode_bug473681.patch (obsolete)
* fix m6502.o typo in hacks/Makefile.in
* refresh 53_XScreenSaver.ad.in.patch
* refresh (disabled) 60_add-ant-hack.patch

[ Jose Luis Rivas ]
* add xscreensaver-demo desktop file, thanks to Daniel Dickinson
  (Closes: #480592)
* update package descriptions (thanks jwz)
* fix categories in xscreensaver.menu
* change build-deps from xlibmesa-gl-dev to libgl1-mesa-dev,
  xutils to xutils-dev, x-dev to x11proto-core-dev.
* bump Standards-Version to 3.8.0
* add Vcs fields and Homepage to debian/control
* Flurry is not installed until the bug get fixed (Closes: #484112)

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/rules
14
14
# dpkg-buildpackage in a package-independent way, and so these targets
15
15
# are obsolete.
16
16
 
 
17
# Modified on July 2007 by Jose Luis Rivas.
 
18
 
 
19
# Including quilt.make
 
20
include /usr/share/quilt/quilt.make
 
21
 
17
22
export DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
18
23
export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
19
24
 
20
 
build:
 
25
build: patch build-stamp
 
26
build-stamp:
21
27
        dh_testdir
22
 
        -test -r /usr/share/misc/config.sub && \
23
 
          cp -f /usr/share/misc/config.sub config.sub
24
 
        -test -r /usr/share/misc/config.guess && \
25
 
          cp -f /usr/share/misc/config.guess config.guess
 
28
 
 
29
        cp debian/xscreensaver.svg utils/images/xscreensaver.svg
 
30
 
 
31
        # generate POT file for translators
 
32
        cd po; intltool-update --verbose -p; cd ..
 
33
 
 
34
        # these are for some reason in the upstream tarball, preserve them
 
35
        [ -f driver/XScreenSaver_ad.h.upstream ] || [ ! -f driver/XScreenSaver_ad.h ] || \
 
36
                mv driver/XScreenSaver_ad.h driver/XScreenSaver_ad.h.upstream
 
37
        [ -f driver/XScreenSaver_Xm_ad.h.upstream ] || [ ! -f driver/XScreenSaver_Xm_ad.h ] || \
 
38
                mv driver/XScreenSaver_Xm_ad.h driver/XScreenSaver_Xm_ad.h.upstream
 
39
 
 
40
        # configs files are outdated so we build with the updated ones
 
41
        [ ! -f config.sub.upstream ] && mv config.sub config.sub.upstream && cp /usr/share/misc/config.sub config.sub
 
42
        [ ! -f config.guess.upstream ] && mv config.guess config.guess.upstream && cp /usr/share/misc/config.guess config.guess
 
43
        # Configure for xscreensaver
26
44
        ./configure --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE) \
27
45
                --prefix=/usr \
28
46
                --without-gl --with-pam --with-gtk --without-kerberos \
29
47
                --with-gnome --with-hackdir=/usr/lib/xscreensaver \
30
48
                --with-configdir=/usr/share/xscreensaver/config \
31
 
                --mandir=/usr/share/man --with-login-manager
 
49
                --mandir=/usr/share/man --with-login-manager \
 
50
                --with-proc-interrupts
32
51
        cp driver/XScreenSaver.ad driver/XScreenSaver.ad-nogl
 
52
        # Configure for xscreensaver-gl
33
53
        ./configure --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE) \
34
54
                --prefix=/usr \
35
55
                --with-gl --with-pam --with-gtk --without-kerberos \
36
56
                --with-gnome --with-hackdir=/usr/lib/xscreensaver \
37
57
                --with-configdir=/usr/share/xscreensaver/config \
38
 
                --mandir=/usr/share/man --with-login-manager
 
58
                --mandir=/usr/share/man --with-login-manager \
 
59
                --with-proc-interrupts
39
60
        $(MAKE) 
40
 
        touch build
41
 
 
42
 
clean:
 
61
        touch build-stamp
 
62
 
 
63
clean:  clean-patched unpatch
 
64
 
 
65
clean-patched:
43
66
        dh_testdir
44
67
        dh_testroot
45
 
        -$(MAKE) distclean
46
 
        
47
 
        # generate POT file for translators
48
 
        cd po; intltool-update --verbose -p
49
 
        
50
 
        rm -f build
51
 
        rm -rf config.log config.h
 
68
        rm -f build-stamp
 
69
        [ ! -f Makefile ] || $(MAKE) distclean
 
70
        rm -f config.log config.h
52
71
        rm -rf driver/XScreenSaver.ad-nogl
53
 
        rm -rf *~ debian/tmp debian/xscreensaver debian/xscreensaver-gl
 
72
        rm -rf *~ debian/tmp debian/xscreensaver debian/xscreensaver-gl \
 
73
                debian/xscreensaver-gl-extra debian/xscreensaver-data \
 
74
                debian/xscreensaver-data-extra
54
75
        rm -rf debian/*~ debian/files*
55
76
        rm -f po/.intltool-merge-cache
56
 
        -test -r /usr/share/misc/config.sub && \
57
 
          rm -f config.sub
58
 
        -test -r /usr/share/misc/config.guess && \
59
 
          rm -f config.guess
 
77
        [ ! -f config.sub.upstream ] || mv config.sub.upstream config.sub
 
78
        [ ! -f config.guess.upstream ] || mv config.guess.upstream config.guess
 
79
        [ ! -f driver/XScreenSaver_ad.h.upstream ] || mv driver/XScreenSaver_ad.h.upstream driver/XScreenSaver_ad.h
 
80
        [ ! -f driver/XScreenSaver_Xm_ad.h.upstream ] || mv driver/XScreenSaver_Xm_ad.h.upstream driver/XScreenSaver_Xm_ad.h
 
81
        rm -f utils/images/xscreensaver.svg
60
82
        dh_clean
61
83
 
62
84
binary-indep:   build
67
89
        dh_testroot
68
90
        dh_clean -k
69
91
        rm -rf debian/tmp debian/xscreensaver debian/xscreensaver-gl \
70
 
                debian/xscreensaver-gnome debian/xscreensaver-nognome
 
92
                debian/xscreensaver-gnome debian/xscreensaver-nognome \
 
93
                debian/xscreensaver-data debian/xscreensaver-data-extra \
 
94
                debian/xscreensaver-gl-extra
71
95
        $(MAKE) install_prefix=$(CURDIR)/debian/tmp \
72
96
                GTK_DATADIR=/usr/share KDEDIR=/usr install
 
97
        # Adding `NoDisplay=True' in gnome-screensaver-properties.desktop
 
98
        echo "NoDisplay=true" >> debian/tmp/usr/share/applications/gnome-screensaver-properties.desktop
73
99
        dh_installdirs -a
74
100
        dh_installdocs -a
75
101
        dh_installchangelogs -a
 
102
        # install .desktop files used by gnome-screensaver
 
103
        mkdir -p $(CURDIR)/debian/tmp/usr/share/applications/screensavers
 
104
        cp $(CURDIR)/debian/screensavers-desktop-files/*.desktop \
 
105
                $(CURDIR)/debian/tmp/usr/share/applications/screensavers/
 
106
        #
 
107
        # Adding a `x` at the end of all manpages:
 
108
        #for i in $$( ls debian/tmp/usr/share/man/man6/ ); do mv debian/tmp/usr/share/man/man6/$$i debian/tmp/usr/share/man/man6/$$( echo $$i )x; done 
 
109
        for i in debian/tmp/usr/share/man/man6/*; do mv $${i} $${i}x; done
 
110
        mv debian/tmp/usr/share/man/man6/xscreensaver-gl-helper.6x debian/tmp/usr/share/man/man6/xscreensaver-gl-helper.6
76
111
        dh_movefiles -a
77
112
        dh_install -a
78
113
        # make sure we got everything that was installed
81
116
        dh_installpam -a
82
117
        dh_installmenu -a
83
118
        # install app-defaults to proper places
84
 
        mv debian/xscreensaver/etc/X11/app-defaults/XScreenSaver \
 
119
        mv debian/xscreensaver-data/etc/X11/app-defaults/XScreenSaver \
85
120
                debian/xscreensaver-gl/etc/X11/app-defaults/XScreenSaver-gl
86
121
        install -m 644 -o root -g root driver/XScreenSaver.ad-nogl \
87
 
                debian/xscreensaver/etc/X11/app-defaults/XScreenSaver-nogl
 
122
                debian/xscreensaver-data/etc/X11/app-defaults/XScreenSaver-nogl
88
123
        # Hopefully prevent nVidia brain damage
89
124
        # This is supposed to prevent accidentially linking against the
90
125
        # binary nvidia drivers. Deinstall or divert them before building!