[oolite] 01/01: * Debhelper 10. Remove explicit target confusing dh. * Standards-Version: 4.0.1. Only suggest -doc. HTTPS copyright format URL. Handle DEB_BUILD_OPTIONS=nodoc. * Replace handwritten preinst with dpkg-maintscript-helper invocation. * Drop obsolete Break/Replace with 1.74.2-2. * Install now separate image files alongside html docs.
Nicolas Boulenguez
nicolas.boulenguez at free.fr
Sun Aug 13 12:57:51 UTC 2017
This is an automated email from the git hooks/post-receive script.
nicobou-guest pushed a commit to branch master
in repository oolite.
commit 5ceb33e7b8011b6670ba2381a4fc49361bf4f5e4
Author: Nicolas Boulenguez <nicolas.boulenguez at free.fr>
Date: Sun Aug 13 14:56:17 2017 +0200
* Debhelper 10. Remove explicit target confusing dh.
* Standards-Version: 4.0.1. Only suggest -doc.
HTTPS copyright format URL. Handle DEB_BUILD_OPTIONS=nodoc.
* Replace handwritten preinst with dpkg-maintscript-helper invocation.
* Drop obsolete Break/Replace with 1.74.2-2.
* Install now separate image files alongside html docs.
---
debian/changelog | 16 ++++++++++++++++
debian/compat | 2 +-
debian/control | 16 ++++++----------
debian/copyright | 4 ++--
...te-doc.doc-base.oolite-advice_for_new_commander | 1 +
debian/oolite-doc.doc-base.oolite-readme | 1 +
debian/oolite-doc.doc-base.oolite-reference-sheet | 1 +
debian/{oolite.preinst => oolite.maintscript} | 22 ++--------------------
debian/rules | 21 ++++++++++++---------
9 files changed, 42 insertions(+), 42 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 02f4b33..30b6d4c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,19 @@
+oolite (1.84-2) unstable; urgency=medium
+
+ * Debhelper 10. Remove explicit target confusing dh.
+ * Standards-Version: 4.0.1. Only suggest -doc.
+ HTTPS copyright format URL. Handle DEB_BUILD_OPTIONS=nodoc.
+ * Update espeak dependency to espeak-ng. Closes: #844639.
+ * Replace handwritten preinst with dpkg-maintscript-helper invocation.
+ * Allow -doc and -data to satisfy Multi-Arch: foreign dependencies.
+ * Drop obsolete Break/Replace with 1.74.2-2.
+ * Install now separate image files alongside html docs.
+
+ [ Clint Adams <clint at debian.org> ]
+ * Reproducible locale in docs. Closes: #847021.
+
+ -- Nicolas Boulenguez <nicolas at debian.org> Sun, 13 Aug 2017 14:28:04 +0200
+
oolite (1.84-1) unstable; urgency=medium
* New upstream version. Patches:
diff --git a/debian/compat b/debian/compat
index ec63514..f599e28 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/control b/debian/control
index c5eb010..8089ad1 100644
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,8 @@ Source: oolite
Section: games
Priority: optional
Maintainer: Nicolas Boulenguez <nicolas at debian.org>
-Standards-Version: 3.9.8
-Build-Depends: dpkg-dev (>= 1.16.1), debhelper (>= 9),
+Standards-Version: 4.0.1
+Build-Depends: dpkg-dev (>= 1.16.1), debhelper (>= 10),
libsdl1.2-dev, libopenal-dev, libvorbis-dev, libespeak-ng-libespeak-dev,
libminizip-dev,
libgnustep-base-dev,
@@ -18,10 +18,12 @@ Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-games/oolite.git
Package: oolite
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, oolite-data (= ${source:Version})
+Pre-Depends: dpkg (>= 1.17.14)
+# For oolite.maintscript.
Replaces: oolite-data (<< 1.76.1-3)
Breaks: oolite-data (<< 1.76.1-3)
-Recommends: oolite-doc (= ${source:Version}),
- oolite-data-sounds (= ${source:Version})
+Recommends: oolite-data-sounds (= ${source:Version})
+Suggests: oolite-doc (= ${source:Version})
Description: space sim game, inspired by Elite
Oolite is a space sim game, inspired by Elite, powered by Objective-C
and OpenGL, and designed as a small game that is easy for users to pick
@@ -36,8 +38,6 @@ Section: doc
Architecture: all
Multi-Arch: foreign
Depends: ${misc:Depends}
-Replaces: oolite (<<1.74.2-2), oolite-data (<< 1.74.2-2)
-Breaks: oolite (<<1.74.2-2), oolite-data (<< 1.74.2-2)
Suggests: oolite
Description: space sim game, inspired by Elite (documentation)
Oolite is a space sim game, inspired by Elite, powered by Objective-C
@@ -54,8 +54,6 @@ Package: oolite-data
Architecture: all
Multi-Arch: foreign
Depends: ${misc:Depends}
-Replaces: oolite (<<1.74.2-2)
-Breaks: oolite (<<1.74.2-2)
Description: space sim game, inspired by Elite (data files)
Oolite is a space sim game, inspired by Elite, powered by Objective-C
and OpenGL, and designed as a small game that is easy for users to pick
@@ -71,8 +69,6 @@ Package: oolite-data-sounds
Architecture: all
Multi-Arch: foreign
Depends: ${misc:Depends}
-Replaces: oolite-data (<< 1.74.2-2)
-Breaks: oolite-data (<< 1.74.2-2)
Description: space sim game, inspired by Elite (sounds)
Oolite is a space sim game, inspired by Elite, powered by Objective-C
and OpenGL, and designed as a small game that is easy for users to pick
diff --git a/debian/copyright b/debian/copyright
index b2550f2..7b0f19a 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,4 +1,4 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: Oolite
Upstream-Contact: http://www.oolite.org
Source: http://www.oolite.org.
@@ -61,7 +61,7 @@ Copyright: 2006-2009 Eddy Petrişor <eddy.petrisor at gmail.com>
2009 Darren Salt <linux at youmustbejoking.demon.co.uk>
2009 Michael Werle <micha at michaelwerle.com>
2007-2009 Chris Crowther <hikari at hikari.org.uk>
- 2010-2016 Nicolas Boulenguez <nicolas at debian.org>
+ 2010-2017 Nicolas Boulenguez <nicolas at debian.org>
License: GPL-3+
License: GPL-2+
diff --git a/debian/oolite-doc.doc-base.oolite-advice_for_new_commander b/debian/oolite-doc.doc-base.oolite-advice_for_new_commander
index 7a2fa99..09d19e0 100644
--- a/debian/oolite-doc.doc-base.oolite-advice_for_new_commander
+++ b/debian/oolite-doc.doc-base.oolite-advice_for_new_commander
@@ -6,4 +6,5 @@ Section: Games/Simulation
Format: HTML
Files: /usr/share/doc/oolite/AdviceForNewCommanders.html
+ /usr/share/doc/oolite/AdviceForNewCommanders_html_*
Index: /usr/share/doc/oolite/AdviceForNewCommanders.html
diff --git a/debian/oolite-doc.doc-base.oolite-readme b/debian/oolite-doc.doc-base.oolite-readme
index 1479561..aaaae27 100644
--- a/debian/oolite-doc.doc-base.oolite-readme
+++ b/debian/oolite-doc.doc-base.oolite-readme
@@ -6,4 +6,5 @@ Section: Games/Simulation
Format: HTML
Files: /usr/share/doc/oolite/OoliteReadMe.html
+ /usr/share/doc/oolite/OoliteReadMe_html_*
Index: /usr/share/doc/oolite/OoliteReadMe.html
diff --git a/debian/oolite-doc.doc-base.oolite-reference-sheet b/debian/oolite-doc.doc-base.oolite-reference-sheet
index 6e80ad9..10b2733 100644
--- a/debian/oolite-doc.doc-base.oolite-reference-sheet
+++ b/debian/oolite-doc.doc-base.oolite-reference-sheet
@@ -7,4 +7,5 @@ Section: Games/Simulation
Format: HTML
Files: /usr/share/doc/oolite/OoliteRS.html
+ /usr/share/doc/oolite/OoliteRS_html_*
Index: /usr/share/doc/oolite/OoliteRS.html
diff --git a/debian/oolite.preinst b/debian/oolite.maintscript
similarity index 52%
rename from debian/oolite.preinst
rename to debian/oolite.maintscript
index 142396a..2097d73 100644
--- a/debian/oolite.preinst
+++ b/debian/oolite.maintscript
@@ -1,7 +1,3 @@
-#!/bin/sh
-set -e
-
-RESOURCES=/usr/lib/GNUstep/Applications/oolite.app/Resources
# The content of this directory is arch-independant, so it has been
# moved to the /usr/share directory of the oolite-data package and
# replaced with a symbolic link (1.76.1-3 in unstable, 1.77.1-1 in
@@ -9,20 +5,6 @@ RESOURCES=/usr/lib/GNUstep/Applications/oolite.app/Resources
# or vice versa, so we need to remove the previous directory. See
# https://wiki.debian.org/MissingCopyrightFile and #728790.
-case "$1" in
- install|upgrade)
- if test -d $RESOURCES -a ! -h $RESOURCES ; then
- rm -rf $RESOURCES || true
- fi
- ;;
- abort-upgrade)
- ;;
- *)
- echo "preinst called with unknown argument '$1'" >&2
- exit 1
- ;;
-esac
-
-#DEBHELPER#
+# dpkg-maintscript-helper is used since 1.84-2.
-exit 0
+dir_to_symlink /usr/lib/GNUstep/Applications/oolite.app/Resources /usr/share/oolite 1.84-2~
diff --git a/debian/rules b/debian/rules
index 5f59798..9c57af2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -21,10 +21,7 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-POLICY_TARGETS := binary binary-arch binary-indep build build-arch \
- build-indep clean
-.PHONY: $(POLICY_TARGETS)
-$(POLICY_TARGETS):
+%:
dh $@
# Debhelper, please, do not run make -f GNUmakefile without me.
@@ -113,6 +110,8 @@ HTML_FROM_DOC := \
HTML_FROM_ODT := \
Doc/OoliteReadMe.html \
Doc/OoliteRS.html
+html_gen := $(HTML_FROM_DOC) $(HTML_FROM_ODT) \
+ $(patsubst %.html,%_html_*,$(HTML_FROM_DOC) $(HTML_FROM_ODT))
# Attempt to circumvent #730893.
TMP_LOFFICE_HOME := $(CURDIR)/debian/tmp_loffice_config
@@ -126,13 +125,17 @@ override_dh_auto_clean::
# Set locale for reproducible HTML documents.
$(HTML_FROM_DOC) $(HTML_FROM_ODT): export LC_ALL := C.UTF-8
+ifeq (,$(filter nodoc,$(DEB_BUILD_OPTIONS)))
override_dh_auto_build-indep: $(HTML_FROM_DOC) $(HTML_FROM_ODT)
+html_install_unless_nodoc := $(html_gen)
+endif
+# Avoid --outdir which may give wrong references to images.
$(HTML_FROM_DOC): %.html: %.doc
- libreoffice --headless --convert-to html --outdir $(dir $@) $<
+ cd Doc && libreoffice --headless --convert-to html $(subst Doc/,,$<)
$(HTML_FROM_ODT): %.html: %.odt
- libreoffice --headless --convert-to html --outdir $(dir $@) $<
+ cd Doc && libreoffice --headless --convert-to html $(subst Doc/,,$<)
override_dh_auto_clean::
- rm -f $(HTML_FROM_DOC) $(HTML_FROM_ODT)
+ rm -f $(html_gen)
RESOURCES := oolite.app/Resources
SOUNDS := Music Sounds
@@ -146,8 +149,8 @@ override_dh_install:
$(addprefix --exclude=$(RESOURCES)/,$(SOUNDS)) \
$(RESOURCES)/* usr/share/oolite
dh_install --package=oolite-doc \
- $(HTML_FROM_DOC) $(subst .html,.doc,$(HTML_FROM_DOC)) \
- $(HTML_FROM_ODT) $(subst .html,.odt,$(HTML_FROM_ODT)) \
+ $(HTML_FROM_DOC:html=doc) $(HTML_FROM_ODT:html=odt) \
+ $(html_install_unless_nodoc) \
usr/share/doc/oolite
dh_install --remaining-packages
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/oolite.git
More information about the Pkg-games-commits
mailing list