← Back to branch summary

~ubuntu-branches/ubuntu/wily/sgt-puzzles/wily

« back to all changes in this revision

Viewing changes to debian/patches/301_fix-install-dirs.diff

  • Committer: Package Import Robot
  • Author(s): Ben Hutchings
  • Date: 2014-10-01 22:10:50 UTC
  • mfrom: (1.2.14)
  • Revision ID: package-import@ubuntu.com-20141001221050-a83g6j14c9dal6ek
Tags: 20140928.r10274-1
http://bugs.debian.org/718354
* New upstream version
  - Version scheme is now date-based
  - Fix a failure to warn about non-unique rows/columns in non-square Unruly
    grids (Closes: #718354)
* Add Debian menu entries for Range and Signpost
* debian/watch: Delete, as new versions are date-based and there is
  currently no obvious way to find the last date changed
* Disable 304_combine-binaries.diff which no longer applies
* Build using autotools
  - Drop patches 301_fix-install-dirs.diff, 305_no-werror.diff
* Exclude puzzles.chm from orig tarball because it requires non-free tools
  to regenerate from source
* Update policy version to 3.9.6; no changes required

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/301_fix-install-dirs.diff
1
 
Author: Ben Hutchings <ben@decadent.org.uk>
2
 
Description: Set installation directories according to FHS.
3
 
 
4
 
--- sgt-puzzles.orig/mkfiles.pl
5
 
+++ sgt-puzzles/mkfiles.pl
6
 
@@ -1123,12 +1123,12 @@
7
 
     "INSTALL=install\n",
8
 
     "INSTALL_PROGRAM=\$(INSTALL)\n",
9
 
     "INSTALL_DATA=\$(INSTALL)\n",
10
 
-    "prefix=/usr/local\n",
11
 
+    "prefix=/usr\n",
12
 
     "exec_prefix=\$(prefix)\n",
13
 
     "bindir=\$(exec_prefix)/bin\n",
14
 
     "gamesdir=\$(exec_prefix)/games\n",
15
 
     "sharedir=\$(prefix)/share\n",
16
 
-    "mandir=\$(prefix)/man\n",
17
 
+    "mandir=\$(sharedir)/man\n",
18
 
     "man1dir=\$(mandir)/man1\n",
19
 
     "CFLAGS += -DSHAREDIR=\"\\\"\$(sharedir)\\\"\"\n",
20
 
     "\n";