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

« back to all changes in this revision

Viewing changes to debian/patches/20_hacks_man_section.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
* 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:
 
1
# We use section 6x (games!) for the hacks, but put them in the
 
2
# man6 directory anyway
 
3
 
 
4
Index: xscreensaver/hacks/Makefile.in
 
5
===================================================================
 
6
--- xscreensaver.orig/hacks/Makefile.in 2009-06-21 20:31:33.000000000 +0200
 
7
+++ xscreensaver/hacks/Makefile.in      2009-06-21 20:33:16.000000000 +0200
 
8
@@ -18,8 +18,8 @@
 
9
 datadir                = @datadir@
 
10
 mandir         = @mandir@
 
11
 libexecdir     = @libexecdir@
 
12
-mansuffix      = 6
 
13
-manNdir                = $(mandir)/man$(mansuffix)
 
14
+mansuffix      = 6x
 
15
+manNdir                = $(mandir)/man6
 
16
 
 
17
 HACKDIR                = @HACKDIR@
 
18
 HACK_CONF_DIR  = @HACK_CONF_DIR@
 
19
Index: xscreensaver/hacks/glx/Makefile.in
 
20
===================================================================
 
21
--- xscreensaver.orig/hacks/glx/Makefile.in     2009-06-21 20:31:33.000000000 +0200
 
22
+++ xscreensaver/hacks/glx/Makefile.in  2009-06-21 20:31:38.000000000 +0200
 
23
@@ -19,8 +19,8 @@
 
24
 datadir                = @datadir@
 
25
 mandir         = @mandir@
 
26
 libexecdir     = @libexecdir@
 
27
-mansuffix      = 6
 
28
-manNdir                = $(mandir)/man$(mansuffix)
 
29
+mansuffix      = 6x
 
30
+manNdir                = $(mandir)/man6
 
31
 
 
32
 HACKDIR                = @HACKDIR@
 
33
 HACK_CONF_DIR  = @HACK_CONF_DIR@