[openlugaru] 01/01: Make rules & install produce some kind of debs

Martin Werner arand-guest at moszumanska.debian.org
Tue Jan 17 20:50:07 UTC 2017 

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

arand-guest pushed a commit to branch master
in repository openlugaru.

commit 39f2a31eacdaeca6aa6fb92fc4af6829999a172c
Author: Martin Erik Werner <martinerikwerner at gmail.com>
Date:   Tue Jan 17 21:14:33 2017 +0100

    Make rules & install produce some kind of debs
    
    Quick cleanup of rules and install files, based on Lugaru HD release
    announcement in order to make the source package produce some actual
    .deb output with at least the basic components in place.
---
 debian/TODO                    |  5 +++-
 debian/changelog               |  6 +++++
 debian/openlugaru-data.install |  2 +-
 debian/openlugaru.install      |  9 +++----
 debian/rules                   | 61 ++++--------------------------------------
 5 files changed, 20 insertions(+), 63 deletions(-)

diff --git a/debian/TODO b/debian/TODO
index 4bd9e24..334947e 100644
--- a/debian/TODO
+++ b/debian/TODO
@@ -16,6 +16,7 @@
 * Replace (/sync?) man page with upstream Dist/lugaru.6
 
 * Check and likely clean up install structure (removing symlinks..).
+  - Ongoing by mew
 
 * Check, drop/refresh debian/patches/*.
 
@@ -30,7 +31,9 @@
   included in install.
 
 * Replace current icon extracted from .ico file with png version Dist/lugaru.png.
+  - Ongoing by mew
 
 * Update/clean up debian/rules.
+  - Ongoing by mew
 
- -- Martin Erik Werner <martinerikwerner at gmail.com>  Sun, 01 Jan 2017 03:12:32 +0100
+ -- Martin Erik Werner <martinerikwerner at gmail.com>  Tue, 17 Jan 2017 21:13:55 +0100
diff --git a/debian/changelog b/debian/changelog
index 36eecaa..1a684b2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+openlugaru (1.1-1) UNRELEASED; urgency=medium
+
+  * New upstream release
+
+ -- Martin Erik Werner <martinerikwerner at gmail.com>  Tue, 17 Jan 2017 19:56:10 +0100
+
 openlugaru-data (0~20110520.1+hge4354-4) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/openlugaru-data.install b/debian/openlugaru-data.install
index b12ab91..5bad92b 100644
--- a/debian/openlugaru-data.install
+++ b/debian/openlugaru-data.install
@@ -1 +1 @@
-Data/ usr/share/games/openlugaru
+usr/share/games
diff --git a/debian/openlugaru.install b/debian/openlugaru.install
index a7a4cb3..39b445a 100644
--- a/debian/openlugaru.install
+++ b/debian/openlugaru.install
@@ -1,5 +1,4 @@
-Source/win-res/Lugaru.png usr/share/icons/hicolor/128x128/apps
-debian/openlugaru.desktop /usr/share/applications
-debian/openlugaru.png usr/share/icons/hicolor/48x48/apps
-debian/openlugaru.xpm usr/share/pixmaps
-debian/scripts/openlugaru usr/games
+usr/games
+usr/share/appdata
+usr/share/applications
+usr/share/icons
diff --git a/debian/rules b/debian/rules
index 51ddcfd..2ee3b5c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,62 +1,11 @@
 #!/usr/bin/make -f
-# -*- makefile -*-
 
 %:
 	dh $@
 
 override_dh_auto_configure:
-	dh_auto_configure -- -DLUGARU_INSTALL_PREFIX=/usr/lib/games/openlugaru/
-
-override_dh_auto_build:
-	convert 'Source/win-res/lugaru.ico[6]' debian/openlugaru.png
-	convert 'Source/win-res/lugaru.ico[7]' debian/openlugaru.xpm
-	dh_auto_build
-
-override_dh_install:
-	dh_install
-	mkdir -p debian/openlugaru/usr/lib/games/openlugaru
-	mv debian/openlugaru/usr/lib/games/openlugaru/lugaru \
-		debian/openlugaru/usr/lib/games/openlugaru/openlugaru
-	mv debian/openlugaru/usr/share/icons/hicolor/128x128/apps/Lugaru.png \
-		debian/openlugaru/usr/share/icons/hicolor/128x128/apps/openlugaru.png
-
-URL="https://lugaru.googlecode.com/hg/"
-REV_ORIG=$(shell dpkg-parsechangelog | sed -rne 's,^Version: .*[+~]hg([0-9a-z]+).*,\1,p')
-DATEREV_ORIG=$(shell dpkg-parsechangelog | sed -rne 's,^Version: .*[+~]([0-9]+.[0-9]+).*,\1,p')
-DIR_ORIG=openlugaru-0~$(DATEREV_ORIG)+hg$(REV_ORIG).orig
-TARBALL_ORIG=openlugaru_0~$(DATEREV_ORIG)+hg$(REV_ORIG)+dfsg.orig.tar.gz
-get-orig-source:
-	rm -rf $(DIR_ORIG)
-	hg clone $(URL) $(DIR_ORIG) -r $(REV_ORIG)
-	find $(DIR_ORIG) -name ".hgignore" -print -delete
-	find $(DIR_ORIG) -name ".hgsigs" -print -delete
-	find $(DIR_ORIG) -name ".hgtags" -print -delete
-	rm -rf $(DIR_ORIG)/.hg/
-	rm -rf $(DIR_ORIG)/Data/
-	rm -rf $(DIR_ORIG)/Dependencies/
-	rm -rf $(DIR_ORIG)/Xcode/
-	rm -f $(DIR_ORIG)/CONTENT-LICENSE.txt
-	GZIP="--best" tar -cz --owner root --group root --mode a+rX \
-		 -f $(TARBALL_ORIG) $(DIR_ORIG)
-	rm -rf $(DIR_ORIG)
-
-URL="https://lugaru.googlecode.com/hg/"
-REV_CUR=$(shell hg identify -i $(URL) | cut --characters=-5)
-# Can't get date of last hg commit easily, use current date as fallback
-DATEREV_CUR=$(shell date +%Y%m%d).1
-DIR_CUR=openlugaru-0~$(DATEREV_CUR)+hg$(REV_CUR).orig
-TARBALL_CUR=openlugaru_0~$(DATEREV_CUR)+hg$(REV_CUR)+dfsg.orig.tar.gz
-get-current-source:
-	rm -rf $(DIR_CUR)
-	hg clone $(URL) $(DIR_CUR) -r $(REV_CUR)
-	find $(DIR_CUR) -name ".hgignore" -print -delete
-	find $(DIR_CUR) -name ".hgsigs" -print -delete
-	find $(DIR_CUR) -name ".hgtags" -print -delete
-	rm -rf $(DIR_CUR)/.hg/
-	rm -rf $(DIR_CUR)/Data/
-	rm -rf $(DIR_CUR)/Dependencies/
-	rm -rf $(DIR_CUR)/Xcode/
-	rm -f $(DIR_CUR)/CONTENT-LICENSE.txt
-	GZIP="--best" tar -cz --owner root --group root --mode a+rX \
-		 -f $(TARBALL_CUR) $(DIR_CUR)
-	rm -rf $(DIR_CUR)
+	dh_auto_configure -- \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		-DSYSTEM_INSTALL=ON \
+		-DCMAKE_INSTALL_BINDIR=games \
+		-DCMAKE_INSTALL_DATADIR=share/games

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

More information about the Pkg-games-commits mailing list