[SCM] Debian packaging of allegro4.4 branch, master, updated. 71421ac32e8a782a224c62a896d039ec1188c0f0

Andreas Rönnquist gusnan at gusnan.se
Sun Apr 1 17:10:52 UTC 2012 

The following commit has been merged in the master branch:
commit fe876d6f8e8b744fc13637af1608402e4ad08221
Author: Andreas Rönnquist <gusnan at gusnan.se>
Date:   Sun Apr 1 18:20:37 2012 +0200

    Remove demo and example packages, install examples to doc package

diff --git a/debian/allegro-demo.menu b/debian/allegro-demo.menu
deleted file mode 100644
index 8ff013a..0000000
--- a/debian/allegro-demo.menu
+++ /dev/null
@@ -1,2 +0,0 @@
-?package(allegro-demo):needs="X11" section="Games/Action" \
-  title="Allegro Demo" command="/usr/games/all-demo"
diff --git a/debian/allegro-demos.install b/debian/allegro-demos.install
deleted file mode 100644
index 7b8f35e..0000000
--- a/debian/allegro-demos.install
+++ /dev/null
@@ -1,6 +0,0 @@
-/usr/games/skater
-/usr/games/skater_agl
-/usr/games/shooter
-/usr/share/games/allegro-demos/skater/demo.dat
-/usr/share/games/allegro-demos/skater/level.dat
-/usr/share/games/allegro-demos/shooter/demo.dat
diff --git a/debian/allegro4.4-examples.1 b/debian/allegro4.4-examples.1
deleted file mode 100644
index fd31f87..0000000
--- a/debian/allegro4.4-examples.1
+++ /dev/null
@@ -1,34 +0,0 @@
-.TH ALLEGRO 1 "8 June 2003" Version 4.0.3
-.SH NAME
-allegro-examples - small example programs to demonstrate the power of Allegro
-.SH SYNOPSIS
-.B allegro-examples
-.br
-.B playfli-from-Allegro
-[OPTIONS]
-.br
-.B midikeyboard-from-Allegro
-.br
-.B calculator-from-Allegro
-.br
-
-.SH DESCRIPTION
-.PP
-
-allegro-examples is a small overview program, used to start misc.
-examples. Tree of them can be called directly from the command line:
-playfli-from-Allegro (player for FLI/FLC animations),
-midikeyboard-from-Allegro (midi keyboard), calculator-from-Allegro
-(small graphical calculator).
-
-.SH SEE ALSO
-.BR allegro-config (1)
-.br
-The
-.BR allegro
-info entry
-.br
-Additional documentation and example files are contained in the liballegro-doc package on Debian systems.
-.SH COPYRIGHT
-This manual page was   written   by   Eduard   Bloch <blade at debian.org>,
-for the Debian GNU/Linux  system  (but may be used by others).
diff --git a/debian/allegro4.4-examples.install b/debian/allegro4.4-examples.install
deleted file mode 100644
index 82a220c..0000000
--- a/debian/allegro4.4-examples.install
+++ /dev/null
@@ -1,9 +0,0 @@
-/usr/lib/*/allegro4.4-examples/ex*
-/usr/lib/*/allegro4.4-examples/running.dat
-/usr/lib/*/allegro4.4-examples/planet.pcx
-/usr/lib/*/allegro4.4-examples/mysha.pcx
-/usr/lib/*/allegro4.4-examples/inkblot.tga
-/usr/lib/*/allegro4.4-examples/unifont.dat
-/usr/lib/*/allegro4.4-examples/example.dat
-/usr/lib/*/allegro4.4-examples/allegro.pcx
-
diff --git a/debian/allegro4.4-examples.menu b/debian/allegro4.4-examples.menu
deleted file mode 100644
index 1ef2e53..0000000
--- a/debian/allegro4.4-examples.menu
+++ /dev/null
@@ -1,2 +0,0 @@
-?package(allegro-examples):needs="X11" section="Applications/Programming" \
-  title="Allegro example programs" command="/usr/bin/x-terminal-emulator -e /usr/bin/allegro-examples"
diff --git a/debian/control b/debian/control
index 4fa3eb2..331fc7c 100644
--- a/debian/control
+++ b/debian/control
@@ -82,32 +82,6 @@ Description: SVGAlib video plugin for the Allegro library
  games and other types of multimedia programming. It is used by many
  DOS games and can be used to port them easily to Linux.
 
-Package: allegro-demos
-Architecture: any
-Section: games
-Depends: ${misc:Depends}, ${shlibs:Depends}, allegro-demo-data, liballegrogl
-Description: cool games, demonstrating the power of the Allegro library
- These games are distributed with the Allegro library and shows a new
- Allegro programmer the power of this lib. But they are more than the
- usual feature demos, they are fully playable and may make some fun...
-
-Package: allegro4.4-examples
-Architecture: any
-Section: utils
-Pre-Depends: multiarch-support
-Depends: ${misc:Depends}, ${shlibs:Depends}, dialog
-Suggests: liballegro-doc
-Description: example programs and demo tools for the Allegro library
- This package contain some example programs that are distributed with
- the Allegro library and small tools that can be used on console or in X11:
- .
-   - FLI player
-   - WAV/VOC player
-   - simple graphical calculator
-   - graphical midi "keyboard"
- .
- The programs are accessible via the "allegro-examples" program.
- 
 Package: liballegro-doc
 Section: doc
 Architecture: all
diff --git a/debian/rules b/debian/rules
index 399135a..52c46e2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,10 +16,10 @@ DEB_CMAKE_OPTIONS ?= -DCMAKE_VERBOSE_MAKEFILE=ON \
 		-DCMAKE_BUILD_TYPE=Release \
 		-DWANT_EXAMPLES=ON
 
-EXAMP_DIR ?= usr/lib/$(DEB_HOST_MULTIARCH)/allegro4.4-examples/
 DOC_DIR ?= usr/share/doc/liballegro-doc/
 DOC_INFO_DIR ?= usr/share/info/
 DOC_HTML_DIR ?= usr/share/doc/liballegro-doc/html/
+DOC_EXAMPLES_DIR ?= usr/share/doc/liballegro-doc/examples/
 
 %:
 	dh $@ 
@@ -35,34 +35,21 @@ override_dh_auto_build:
 
 override_dh_auto_install:
 	$(MAKE) --directory=build install DESTDIR=$(CURDIR)/debian/tmp
-# Fix the examples
-	mkdir -p $(CURDIR)/debian/tmp/$(EXAMP_DIR)
-	cp -R build/examples/ex* $(CURDIR)/debian/tmp/$(EXAMP_DIR)
-	cp -R build/examples/running.dat $(CURDIR)/debian/tmp/$(EXAMP_DIR)
-	cp -R build/examples/planet.pcx $(CURDIR)/debian/tmp/$(EXAMP_DIR)
-	cp -R build/examples/mysha.pcx $(CURDIR)/debian/tmp/$(EXAMP_DIR)
-	cp -R build/examples/inkblot.tga $(CURDIR)/debian/tmp/$(EXAMP_DIR)
-	cp -R build/examples/unifont.dat $(CURDIR)/debian/tmp/$(EXAMP_DIR)
-	cp -R build/examples/example.dat $(CURDIR)/debian/tmp/$(EXAMP_DIR)
-	cp -R build/examples/allegro.pcx $(CURDIR)/debian/tmp/$(EXAMP_DIR)
 # Move docs to proper location - fixes FSSTND-dir-in-usr
 	mkdir -p $(CURDIR)/debian/tmp/$(DOC_DIR)
 	mkdir -p $(CURDIR)/debian/tmp/$(DOC_INFO_DIR)
 	mkdir -p $(CURDIR)/debian/tmp/$(DOC_HTML_DIR)
+	mkdir -p $(CURDIR)/debian/tmp/$(DOC_EXAMPLES_DIR)
 	cp $(CURDIR)/debian/tmp/usr/doc/allegro-4.4.2/* $(CURDIR)/debian/tmp/$(DOC_DIR)
 	cp $(CURDIR)/debian/tmp/usr/info/allegro.info $(CURDIR)/debian/tmp/$(DOC_INFO_DIR)
 	cp build/docs/html/* $(CURDIR)/debian/tmp/$(DOC_HTML_DIR)
-# Move the demos to the proper folders
-	mkdir -p $(CURDIR)/debian/tmp/usr/games/
-	mkdir -p $(CURDIR)/debian/tmp/usr/share/games/allegro-demos/skater
-	mkdir -p $(CURDIR)/debian/tmp/usr/share/games/allegro-demos/shooter
-	cp build/demos/skater/skater $(CURDIR)/debian/tmp/usr/games
-	cp build/demos/skater/skater_agl $(CURDIR)/debian/tmp/usr/games
-	cp build/demos/skater/demo.dat $(CURDIR)/debian/tmp/usr/share/games/allegro-demos/skater
-	cp build/demos/skater/level.dat $(CURDIR)/debian/tmp/usr/share/games/allegro-demos/skater
-	cp build/demos/shooter/shooter $(CURDIR)/debian/tmp/usr/games
-	cp build/demos/shooter/demo.dat $(CURDIR)/debian/tmp/usr/share/games/allegro-demos/shooter
-	
+# Create examples source tar.gz
+	rm -rf build/tmp; mkdir build/tmp
+	cp examples/*.c examples/*.h examples/*.pcx examples/*.dat examples/*.txt examples/*.ini build/tmp/
+	cd build/tmp
+	tar czvf source.tar.gz *
+	cd ../..
+	cp build/tmp/source.tar.gz $(CURDIR)/debian/tmp/$(DOC_EXAMPLES_DIR)
 
 #override_dh_auto_test:
 #	cd build && tests/test_driver --nodisplay ../tests/test_*.ini

-- 
Debian packaging of allegro4.4

More information about the Pkg-games-commits mailing list