[oolite] 02/11: Handle split of images and sounds out of upstream main tarball.

Mon Aug 31 02:01:13 UTC 2015

This is an automated email from the git hooks/post-receive script.

nicobou-guest pushed a commit to branch master
in repository oolite.

commit b57c4e86cde00513c3366e9066ab9f2d98ce00a4
Author: Nicolas Boulenguez <nicolas.boulenguez at free.fr>
Date:   Sat Oct 11 17:49:08 2014 +0200

    Handle split of images and sounds out of upstream main tarball.
---
 debian/README.source | 39 +++++++++++++++++++++++++++++++--------
 debian/changelog     |  2 +-
 debian/copyright     | 22 ++++++++++++++++++----
 debian/rules         | 11 +++++++++++
 4 files changed, 61 insertions(+), 13 deletions(-)

diff --git a/debian/README.source b/debian/README.source
index f85e1ce..f82d899 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -1,12 +1,31 @@
-This package uses the default "3.0 (quilt)" source format. Read the
-rest of this file only if you need the latest debian packaging from the
-version control system.
+The Oolite sources are hosted and distributed on GitHub.
+
+Human-readable sources (ObjectiveC, JavaScript and so on) are stored
+in the oolite.git repository.  Some commits are tagged as releases
+according to the usual scheme. Latest version may be detected,
+downloaded and repackaged without non-DFSG stuff with uscan(1).
+
+This documentation will assume that the downloaded version is
+# tag=1.80b
+
+Images and sounds are distributed in a separate git submodule, for
+which diffs do not mean much. Unfortunately, this submodule has no
+tags and we need to manually do uscan's job.
+# binrev=22d5bdb097ef50840f0c6a72dcbbdbd761aff643
+# wget https://github.com/OoliteProject/oolite-binary-resources/archive/$binrev.tar.gz
+# mv $binrev.tar.gz oolite_$tag.orig-binary-resources.tar.gz
+
+This second tarball will be detected by dpkg-source when building the
+source package, mentioned in the dsc file, and extracted into the
+binary-resources/ subdirectory.  The git submodule is intended for
+Resources/Binary/, but dpkg cannot do that directly. A symbolic link
+will fix this before the build process.
 
 The Debian packaging is maintained in a git repository.
 
 The "upstream" branch contains the files distributed by upstream tarballs.
-The "dfsg_clean" branch removes binaries and Mac/Windows specific stuff.
-The debian orig.tar.gz archive will have the same content.
+Meaning: repackaged, unpatched upstream archives, excluding Resources/Binary/.
+The "dfsg_clean" branch was once used, but can now be ignored.
 The "master" branch adds the Debian packaging.
 
 You will need the "git-buildpackage" debian package. Its usage is described
@@ -21,12 +40,16 @@ gbp-clone --all git://anonscm.debian.org/pkg-games/oolite.git
 # Enter the directory containing the local copy.
 cd oolite
 
-# Build the package.
-git buildpackage
+# Extract images and sounds. Git knows nothing about this directory.
+mkdir binary-resources
+tar -xf ../oolite_1.80b.orig-binary-resources.tar.gz -C binary-resources --strip-components=1
+
+# Apply Debian patches, build, unapply Debian patches.
+debuild -us -uc
 
 # Clean the tree.
 debuild clean
 
 Launching "gitk --all &" may help a lot.
 
- -- Nicolas Boulenguez <nicolas at debian.org>, Sun, 11 Aug 2013 04:48:44 +0200
+ -- Nicolas Boulenguez <nicolas at debian.org>, Sat, 11 Oct 2014 20:53:32 +0200
diff --git a/debian/changelog b/debian/changelog
index 189453f..a4e019b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
 oolite (1.80b-1) UNRELEASED; urgency=medium
 
-  * New upstream release. License update.
+  * New upstream release, splitting sound and images. License update.
   * Drop unneeded build dependency on gnustep-core-devel. Closes: #749453.
   * gnustep >= 2.6.6-1 does not need let_gnustep_handle_cflags.diff anymore.
   * watch: upstream migrated to github.
diff --git a/debian/copyright b/debian/copyright
index 89279db..91d2d01 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,12 +4,24 @@ Upstream-Contact: http://www.oolite.org
 Source: http://www.oolite.org.
  The upstream archive is repackaged mainly to avoid generated files
  like Doc/*.pdf src/Core/OOPlanetData.[ch], but we use this
- opportunity to spare space and limit the noise in the VCS.
+ opportunity to spare space, limit noise in the VCS
+ and remove empty directories intended for unused git submodules.
+ .
+ The git submodule in Resources/Binary (images and sounds) is
+ distributed as a separate orig tarball. As dpkg is unable to extract
+ its contents directly into Resources/Binary/ were they belong, they
+ are under binary-resources/*, and symlinked during build.
 Files-Excluded:
  .absolute_gitmodules
  .gitignore
  .gitmodules
  *.xcodeproj
+ deps/Cross-platform-deps
+ deps/libogg
+ deps/libvorbis
+ deps/Linux-deps
+ deps/mozilla
+ deps/Windows-deps
  Doc/AdviceForNewCommanders.odt
  Doc/AdviceForNewCommanders.pdf
  Doc/OoliteReadMe.pdf
@@ -19,9 +31,12 @@ Files-Excluded:
  installers/autopackage
  installers/posix
  installers/win32
+ Mac-specific
+ Resources/Binary
  src/Core/MiniZip
  src/Core/OOPlanetData.c
  src/Core/OOPlanetData.h
+ tests
 Comment:
  Many headers mention the MIT license, but may be ignored
  since Oolite was relicensed in 2007. See the public announcement at
@@ -33,9 +48,8 @@ Copyright: 2004-2014 Giles C Williams and contributors
            2007-2014 the Oolite project
 License: GPL-2+
 
-Files: Resources/*
-       Schemata/*
-       installers/*.png
+Files: binary-resources/*
+       installers/FreeDesktop/oolite-icon.png
 Copyright: 2004-2014 Giles C Williams and contributors
            2007-2014 the Oolite project
 License: GPL-2+ or CC-BY-NC-SA-3.0
diff --git a/debian/rules b/debian/rules
index b8d9f04..89a98de 100755
--- a/debian/rules
+++ b/debian/rules
@@ -86,6 +86,17 @@ override_dh_auto_clean::
 	rm -rf $(OOLITE_APP)
 
 ######################################################################
+IMAGES_SOUNDS_GIT := Resources/Binary
+IMAGES_SOUNDS_DPKG := binary-resources
+# See README.source.
+
+$(OOLITE_APP): $(IMAGES_SOUNDS_GIT)
+$(IMAGES_SOUNDS_GIT): $(IMAGES_SOUNDS_DPKG)
+	ln -s $< $@
+override_dh_auto_clean::
+	rm -fr $(IMAGES_SOUNDS_GIT)
+
+######################################################################
 PLANET_DATA := src/Core/OOPlanetData
 ICOSMESH_DIR := tools/icosmesh
 ICOSMESH_EXE := $(ICOSMESH_DIR)/obj/icosmesh

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/oolite.git

