[allegro5] 06/08: Many changes necessary for 5.0 -> 5.2.
Tobias Hansen
thansen at moszumanska.debian.org
Thu Apr 21 16:41:14 UTC 2016
This is an automated email from the git hooks/post-receive script.
thansen pushed a commit to branch master
in repository allegro5.
commit 5c6f07f4769eb01ceeb96d1e1a467b6add5cb120
Author: Tobias Hansen <thansen at localhost.localdomain>
Date: Thu Apr 21 17:18:49 2016 +0100
Many changes necessary for 5.0 -> 5.2.
---
debian/allegro5-doc.doc-base | 2 +-
debian/changelog | 7 +++
debian/compile_examples.sh | 2 +-
debian/control | 84 ++++++++++++++++++++-------
debian/liballegro-acodec5-dev.install | 2 +-
debian/liballegro-acodec5.2.lintian-overrides | 2 +-
debian/liballegro-audio5-dev.install | 2 +-
debian/liballegro-dialog5-dev.install | 2 +-
debian/liballegro-image5-dev.install | 2 +-
debian/liballegro-physfs5-dev.install | 2 +-
debian/liballegro-ttf5-dev.install | 2 +-
debian/liballegro-ttf5.2.lintian-overrides | 2 +-
debian/liballegro-video5-dev.install | 3 +
debian/liballegro-video5.2.install | 1 +
debian/liballegro-video5.2.symbols | 18 ++++++
debian/liballegro5-dev.install | 24 +++++---
debian/rules | 2 +-
17 files changed, 117 insertions(+), 42 deletions(-)
diff --git a/debian/allegro5-doc.doc-base b/debian/allegro5-doc.doc-base
index a2d5d72..3b90609 100644
--- a/debian/allegro5-doc.doc-base
+++ b/debian/allegro5-doc.doc-base
@@ -1,5 +1,5 @@
Document: allegro5
-Title: Allegro 5.0 reference manual
+Title: Allegro 5.2 reference manual
Abstract: This manual describes the API of
the Allegro 5 library.
Section: Programming
diff --git a/debian/changelog b/debian/changelog
index fe6ec82..ffc4fa5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,15 @@
allegro5 (2:5.2.0-1) UNRELEASED; urgency=medium
* New upstream release (Closes: #704141).
+ * Add packages for the new video addon
+ (new build dependency libtheora-dev).
+ * Rename library packages from *5.0 to *5.2.
+ * The pkg-config package names lost the minor version
+ (e.g. allegro-5.pc instead of allegro-5.0.pc).
* Refresh patches.
* Remove require-directx_shaders.c-only-on-windows.patch, applied upstream.
+ * Bump Standards-Version to 3.9.8.
+ *
-- Tobias Hansen <thansen at debian.org> Thu, 21 Apr 2016 16:13:21 +0100
diff --git a/debian/compile_examples.sh b/debian/compile_examples.sh
index f37b2fe..d7b41d8 100644
--- a/debian/compile_examples.sh
+++ b/debian/compile_examples.sh
@@ -19,7 +19,7 @@ ln -s /usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf $HOME/allegro5-example
#For simplicity we link against all libraries provided by Allegro here.
#Probably no example will really need all of them. We put the linker
#flags into a variable:
-ALLEGRO_LIBS=$(pkg-config --libs allegro-5.0 allegro_color-5.0 allegro_font-5.0 allegro_main-5.0 allegro_memfile-5.0 allegro_primitives-5.0 allegro_acodec-5.0 allegro_audio-5.0 allegro_dialog-5.0 allegro_image-5.0 allegro_physfs-5.0 allegro_ttf-5.0)
+ALLEGRO_LIBS=$(pkg-config --libs allegro-5 allegro_color-5 allegro_font-5 allegro_main-5 allegro_memfile-5 allegro_primitives-5 allegro_acodec-5 allegro_audio-5 allegro_dialog-5 allegro_image-5 allegro_physfs-5 allegro_ttf-5 allegro_video-5)
#Switch to the source directory:
cd $HOME/allegro5-examples
diff --git a/debian/control b/debian/control
index 0f108d2..c175afc 100644
--- a/debian/control
+++ b/debian/control
@@ -15,6 +15,7 @@ Build-Depends: debhelper (>= 9),
libphysfs-dev,
libpng-dev,
libpulse-dev,
+ libtheora-dev,
libvorbis-dev,
libxext-dev,
libxxf86vm-dev,
@@ -25,13 +26,13 @@ Build-Depends: debhelper (>= 9),
python,
indent
Build-Depends-Indep: pandoc, pandoc-data (>= 1.11.1-4) | pandoc (<< 1.11.1-4)
-Standards-Version: 3.9.6
+Standards-Version: 3.9.8
Section: libs
Homepage: http://liballeg.org/
Vcs-Git: git://anonscm.debian.org/pkg-games/allegro5.git
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-games/allegro5.git;a=summary
-Package: liballegro5.0
+Package: liballegro5.2
Architecture: any
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
@@ -50,7 +51,7 @@ Section: libdevel
Architecture: any
Multi-Arch: same
Depends: ${misc:Depends},
- liballegro5.0 (= ${binary:Version}),
+ liballegro5.2 (= ${binary:Version}),
libc-dev,
libgl1-mesa-dev,
libglu1-mesa-dev,
@@ -68,7 +69,8 @@ Recommends: liballegro-acodec5-dev,
liballegro-dialog5-dev,
liballegro-image5-dev,
liballegro-physfs5-dev,
- liballegro-ttf5-dev
+ liballegro-ttf5-dev,
+ liballegro-video5-dev
Suggests: allegro5-doc
Description: development files for the Allegro 5 library
This package is needed to build programs using the Allegro 5 library.
@@ -81,13 +83,13 @@ Description: development files for the Allegro 5 library
Although it is not backwards compatible with earlier versions, it still
occupies the same niche and retains a familiar style.
-Package: liballegro-acodec5.0
+Package: liballegro-acodec5.2
Architecture: any
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends},
${misc:Depends},
- liballegro5.0 (= ${binary:Version})
+ liballegro5.2 (= ${binary:Version})
Description: audio codec addon for the Allegro 5 library
This package provides the audio codec addon for the Allegro 5 library.
This addon allows you to load audio sample formats.
@@ -105,7 +107,7 @@ Section: libdevel
Architecture: any
Multi-Arch: same
Depends: ${misc:Depends},
- liballegro-acodec5.0 (= ${binary:Version}),
+ liballegro-acodec5.2 (= ${binary:Version}),
liballegro5-dev (= ${binary:Version}),
libopenal-dev,
libpulse-dev,
@@ -123,12 +125,12 @@ Description: header files for the Allegro 5 audio codec addon
Although it is not backwards compatible with earlier versions, it still
occupies the same niche and retains a familiar style.
-Package: liballegro-audio5.0
+Package: liballegro-audio5.2
Architecture: any
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends},
- liballegro5.0 (= ${binary:Version})
+ liballegro5.2 (= ${binary:Version})
Description: audio addon for the Allegro 5 library
This package provides the audio addon for the Allegro 5 library. This
addon allows you to play sounds in your Allegro 5 programs.
@@ -146,7 +148,7 @@ Section: libdevel
Architecture: any
Multi-Arch: same
Depends: ${misc:Depends},
- liballegro-audio5.0 (= ${binary:Version}),
+ liballegro-audio5.2 (= ${binary:Version}),
liballegro5-dev (= ${binary:Version}),
libopenal-dev,
libpulse-dev
@@ -161,12 +163,12 @@ Description: header files for the Allegro 5 audio addon
Although it is not backwards compatible with earlier versions, it still
occupies the same niche and retains a familiar style.
-Package: liballegro-dialog5.0
+Package: liballegro-dialog5.2
Architecture: any
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends},
- liballegro5.0 (= ${binary:Version})
+ liballegro5.2 (= ${binary:Version})
Description: dialog addon for the Allegro 5 library
This package provides the dialog addon for the Allegro 5 library. This
addon allows you to show dialog boxes.
@@ -184,7 +186,7 @@ Section: libdevel
Architecture: any
Multi-Arch: same
Depends: ${misc:Depends},
- liballegro-dialog5.0 (= ${binary:Version}),
+ liballegro-dialog5.2 (= ${binary:Version}),
liballegro5-dev (= ${binary:Version}),
libgtk2.0-dev
Description: header files for the Allegro 5 dialog addon
@@ -198,12 +200,12 @@ Description: header files for the Allegro 5 dialog addon
Although it is not backwards compatible with earlier versions, it still
occupies the same niche and retains a familiar style.
-Package: liballegro-image5.0
+Package: liballegro-image5.2
Architecture: any
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends},
- liballegro5.0 (= ${binary:Version})
+ liballegro5.2 (= ${binary:Version})
Description: image addon for the Allegro 5 library
This package provides the image addon for the Allegro 5 library. Provides
support for loading image file formats.
@@ -221,7 +223,7 @@ Section: libdevel
Architecture: any
Multi-Arch: same
Depends: ${misc:Depends},
- liballegro-image5.0 (= ${binary:Version}),
+ liballegro-image5.2 (= ${binary:Version}),
liballegro5-dev (= ${binary:Version}),
libjpeg-dev,
libpng-dev
@@ -236,12 +238,12 @@ Description: header files for the Allegro 5 image addon
Although it is not backwards compatible with earlier versions, it still
occupies the same niche and retains a familiar style.
-Package: liballegro-physfs5.0
+Package: liballegro-physfs5.2
Architecture: any
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends},
- liballegro5.0 (= ${binary:Version})
+ liballegro5.2 (= ${binary:Version})
Description: physfs addon for the Allegro 5 library
This package provides the physfs addon for the Allegro 5 library. This
addon provides an interface to the PhysicsFS library, allowing you to
@@ -261,7 +263,7 @@ Section: libdevel
Architecture: any
Multi-Arch: same
Depends: ${misc:Depends},
- liballegro-physfs5.0 (= ${binary:Version}),
+ liballegro-physfs5.2 (= ${binary:Version}),
liballegro5-dev (= ${binary:Version}),
libphysfs-dev
Description: header files for the Allegro 5 physfs addon
@@ -275,12 +277,12 @@ Description: header files for the Allegro 5 physfs addon
Although it is not backwards compatible with earlier versions, it still
occupies the same niche and retains a familiar style.
-Package: liballegro-ttf5.0
+Package: liballegro-ttf5.2
Architecture: any
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends},
- liballegro5.0 (= ${binary:Version})
+ liballegro5.2 (= ${binary:Version})
Description: TTF addon for the Allegro 5 library
This package provides the TTF addon for the Allegro 5 library. This addon
allows you to load and use TTF fonts in your Allegro 5 programs.
@@ -298,7 +300,7 @@ Section: libdevel
Architecture: any
Multi-Arch: same
Depends: ${misc:Depends},
- liballegro-ttf5.0 (= ${binary:Version}),
+ liballegro-ttf5.2 (= ${binary:Version}),
liballegro5-dev (= ${binary:Version}),
libfreetype6-dev
Description: header files for the Allegro 5 TTF addon
@@ -312,6 +314,44 @@ Description: header files for the Allegro 5 TTF addon
Although it is not backwards compatible with earlier versions, it still
occupies the same niche and retains a familiar style.
+Package: liballegro-video5.2
+Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends},
+ liballegro5.2 (= ${binary:Version})
+Description: TTF addon for the Allegro 5 library
+ This package provides the video addon for the Allegro 5 library. This addon
+ allows you to load and display videos in your Allegro 5 programs.
+ .
+ Allegro is a cross-platform library intended for use in computer games
+ and other types of multimedia programming. Allegro 5 is the latest major
+ revision of the library, designed to take advantage of modern hardware
+ (e.g. hardware acceleration using 3D cards) and operating systems.
+ Although it is not backwards compatible with earlier versions, it still
+ occupies the same niche and retains a familiar style.
+
+Package: liballegro-video5-dev
+Priority: extra
+Section: libdevel
+Architecture: any
+Multi-Arch: same
+Depends: ${misc:Depends},
+ liballegro-video5.2 (= ${binary:Version}),
+ liballegro5-dev (= ${binary:Version}),
+ liballegro-audio5-dev (= ${binary:Version}),
+ libtheora-dev,
+Description: header files for the Allegro 5 video addon
+ This package is required to build programs that use the Allegro 5 video
+ addon.
+ .
+ Allegro is a cross-platform library intended for use in computer games
+ and other types of multimedia programming. Allegro 5 is the latest major
+ revision of the library, designed to take advantage of modern hardware
+ (e.g. hardware acceleration using 3D cards) and operating systems.
+ Although it is not backwards compatible with earlier versions, it still
+ occupies the same niche and retains a familiar style.
+
Package: allegro5-doc
Section: doc
Architecture: all
diff --git a/debian/liballegro-acodec5-dev.install b/debian/liballegro-acodec5-dev.install
index c8e9366..320c24c 100644
--- a/debian/liballegro-acodec5-dev.install
+++ b/debian/liballegro-acodec5-dev.install
@@ -1,3 +1,3 @@
usr/include/allegro5/allegro_acodec.h
usr/lib/*/liballegro_acodec.so
-usr/lib/*/pkgconfig/allegro_acodec-5.0.pc
+usr/lib/*/pkgconfig/allegro_acodec-5.pc
diff --git a/debian/liballegro-acodec5.2.lintian-overrides b/debian/liballegro-acodec5.2.lintian-overrides
index 9365b46..914070c 100644
--- a/debian/liballegro-acodec5.2.lintian-overrides
+++ b/debian/liballegro-acodec5.2.lintian-overrides
@@ -1,3 +1,3 @@
# False positive. -D_FORTIFY_SOURCE=2 is set.
# See #673112.
-liballegro-acodec5.0 binary: hardening-no-fortify-functions usr/lib/*/liballegro_acodec.so.*
+liballegro-acodec5.2 binary: hardening-no-fortify-functions usr/lib/*/liballegro_acodec.so.*
diff --git a/debian/liballegro-audio5-dev.install b/debian/liballegro-audio5-dev.install
index e3a5362..2564102 100644
--- a/debian/liballegro-audio5-dev.install
+++ b/debian/liballegro-audio5-dev.install
@@ -1,3 +1,3 @@
usr/include/allegro5/allegro_audio.h
usr/lib/*/liballegro_audio.so
-usr/lib/*/pkgconfig/allegro_audio-5.0.pc
+usr/lib/*/pkgconfig/allegro_audio-5.pc
diff --git a/debian/liballegro-dialog5-dev.install b/debian/liballegro-dialog5-dev.install
index aa66d95..4c2c9ae 100644
--- a/debian/liballegro-dialog5-dev.install
+++ b/debian/liballegro-dialog5-dev.install
@@ -1,3 +1,3 @@
usr/include/allegro5/allegro_native_dialog.h
usr/lib/*/liballegro_dialog.so
-usr/lib/*/pkgconfig/allegro_dialog-5.0.pc
+usr/lib/*/pkgconfig/allegro_dialog-5.pc
diff --git a/debian/liballegro-image5-dev.install b/debian/liballegro-image5-dev.install
index 1fbbdab..c1fe3d8 100644
--- a/debian/liballegro-image5-dev.install
+++ b/debian/liballegro-image5-dev.install
@@ -1,3 +1,3 @@
usr/include/allegro5/allegro_image.h
usr/lib/*/liballegro_image.so
-usr/lib/*/pkgconfig/allegro_image-5.0.pc
+usr/lib/*/pkgconfig/allegro_image-5.pc
diff --git a/debian/liballegro-physfs5-dev.install b/debian/liballegro-physfs5-dev.install
index b21dfa9..bd6fbd4 100644
--- a/debian/liballegro-physfs5-dev.install
+++ b/debian/liballegro-physfs5-dev.install
@@ -1,3 +1,3 @@
usr/include/allegro5/allegro_physfs.h
usr/lib/*/liballegro_physfs.so
-usr/lib/*/pkgconfig/allegro_physfs-5.0.pc
+usr/lib/*/pkgconfig/allegro_physfs-5.pc
diff --git a/debian/liballegro-ttf5-dev.install b/debian/liballegro-ttf5-dev.install
index c7d1bd3..8ddb260 100644
--- a/debian/liballegro-ttf5-dev.install
+++ b/debian/liballegro-ttf5-dev.install
@@ -1,3 +1,3 @@
usr/include/allegro5/allegro_ttf.h
usr/lib/*/liballegro_ttf.so
-usr/lib/*/pkgconfig/allegro_ttf-5.0.pc
+usr/lib/*/pkgconfig/allegro_ttf-5.pc
diff --git a/debian/liballegro-ttf5.2.lintian-overrides b/debian/liballegro-ttf5.2.lintian-overrides
index 7f6d70e..48cd09a 100644
--- a/debian/liballegro-ttf5.2.lintian-overrides
+++ b/debian/liballegro-ttf5.2.lintian-overrides
@@ -1,3 +1,3 @@
# False positive. -D_FORTIFY_SOURCE=2 is set.
# See #673112.
-liballegro-ttf5.0 binary: hardening-no-fortify-functions usr/lib/*/liballegro_ttf.so.*
+liballegro-ttf5.2 binary: hardening-no-fortify-functions usr/lib/*/liballegro_ttf.so.*
diff --git a/debian/liballegro-video5-dev.install b/debian/liballegro-video5-dev.install
new file mode 100644
index 0000000..532927f
--- /dev/null
+++ b/debian/liballegro-video5-dev.install
@@ -0,0 +1,3 @@
+usr/include/allegro5/allegro_video.h
+usr/lib/*/liballegro_video.so
+usr/lib/*/pkgconfig/allegro_video-5.pc
diff --git a/debian/liballegro-video5.2.install b/debian/liballegro-video5.2.install
new file mode 100644
index 0000000..5b31609
--- /dev/null
+++ b/debian/liballegro-video5.2.install
@@ -0,0 +1 @@
+usr/lib/*/liballegro_video.so.*
diff --git a/debian/liballegro-video5.2.symbols b/debian/liballegro-video5.2.symbols
new file mode 100644
index 0000000..1d187cd
--- /dev/null
+++ b/debian/liballegro-video5.2.symbols
@@ -0,0 +1,18 @@
+liballegro_video.so.5.2 liballegro-video5.2 #MINVER#
+ (regex|optional)"_al_*" 2:5.2.0
+ al_close_video at Base 2:5.2.0
+ al_get_video_audio_rate at Base 2:5.2.0
+ al_get_video_event_source at Base 2:5.2.0
+ al_get_video_fps at Base 2:5.2.0
+ al_get_video_frame at Base 2:5.2.0
+ al_get_video_position at Base 2:5.2.0
+ al_get_video_scaled_height at Base 2:5.2.0
+ al_get_video_scaled_width at Base 2:5.2.0
+ al_init_video_addon at Base 2:5.2.0
+ al_is_video_playing at Base 2:5.2.0
+ al_open_video at Base 2:5.2.0
+ al_seek_video at Base 2:5.2.0
+ al_set_video_playing at Base 2:5.2.0
+ al_shutdown_video_addon at Base 2:5.2.0
+ al_start_video at Base 2:5.2.0
+ al_start_video_with_voice at Base 2:5.2.0
diff --git a/debian/liballegro5-dev.install b/debian/liballegro5-dev.install
index af7ec5e..acc4386 100644
--- a/debian/liballegro5-dev.install
+++ b/debian/liballegro5-dev.install
@@ -4,7 +4,6 @@ usr/include/allegro5/internal
usr/include/allegro5/opengl
usr/include/allegro5/platform
usr/include/allegro5/alcompat.h
-usr/include/allegro5/alinline.h
usr/include/allegro5/allegro5.h
usr/include/allegro5/allegro_color.h
usr/include/allegro5/allegro_direct3d.h
@@ -13,15 +12,18 @@ usr/include/allegro5/allegro.h
usr/include/allegro5/allegro_memfile.h
usr/include/allegro5/allegro_opengl.h
usr/include/allegro5/allegro_primitives.h
+usr/include/allegro5/allegro_x.h
usr/include/allegro5/altime.h
usr/include/allegro5/base.h
-usr/include/allegro5/bitmap.h
usr/include/allegro5/bitmap_draw.h
+usr/include/allegro5/bitmap.h
usr/include/allegro5/bitmap_io.h
usr/include/allegro5/bitmap_lock.h
usr/include/allegro5/blender.h
+usr/include/allegro5/clipboard.h
usr/include/allegro5/color.h
usr/include/allegro5/config.h
+usr/include/allegro5/cpu.h
usr/include/allegro5/debug.h
usr/include/allegro5/display.h
usr/include/allegro5/drawing.h
@@ -32,18 +34,22 @@ usr/include/allegro5/fixed.h
usr/include/allegro5/fmaths.h
usr/include/allegro5/fshook.h
usr/include/allegro5/fullscreen_mode.h
+usr/include/allegro5/haptic.h
usr/include/allegro5/joystick.h
usr/include/allegro5/keyboard.h
usr/include/allegro5/keycodes.h
usr/include/allegro5/memory.h
usr/include/allegro5/monitor.h
-usr/include/allegro5/mouse.h
usr/include/allegro5/mouse_cursor.h
+usr/include/allegro5/mouse.h
usr/include/allegro5/path.h
+usr/include/allegro5/render_state.h
+usr/include/allegro5/shader.h
usr/include/allegro5/system.h
usr/include/allegro5/threads.h
usr/include/allegro5/timer.h
usr/include/allegro5/tls.h
+usr/include/allegro5/touch_input.h
usr/include/allegro5/transformations.h
usr/include/allegro5/utf8.h
usr/lib/*/liballegro.so
@@ -52,9 +58,9 @@ usr/lib/*/liballegro_font.so
usr/lib/*/liballegro_main.so
usr/lib/*/liballegro_memfile.so
usr/lib/*/liballegro_primitives.so
-usr/lib/*/pkgconfig/allegro-5.0.pc
-usr/lib/*/pkgconfig/allegro_color-5.0.pc
-usr/lib/*/pkgconfig/allegro_font-5.0.pc
-usr/lib/*/pkgconfig/allegro_main-5.0.pc
-usr/lib/*/pkgconfig/allegro_memfile-5.0.pc
-usr/lib/*/pkgconfig/allegro_primitives-5.0.pc
+usr/lib/*/pkgconfig/allegro-5.pc
+usr/lib/*/pkgconfig/allegro_color-5.pc
+usr/lib/*/pkgconfig/allegro_font-5.pc
+usr/lib/*/pkgconfig/allegro_main-5.pc
+usr/lib/*/pkgconfig/allegro_memfile-5.pc
+usr/lib/*/pkgconfig/allegro_primitives-5.pc
diff --git a/debian/rules b/debian/rules
index e1a8671..9c511f3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -46,7 +46,7 @@ override_dh_auto_test:
cd build && tests/test_driver --no-display ../tests/test_*.ini
override_dh_installchangelogs:
- dh_installchangelogs CHANGES-5.0.txt
+ dh_installchangelogs CHANGES-5.2.txt
override_dh_installexamples-indep:
dh_installexamples
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/allegro5.git
More information about the Pkg-games-commits
mailing list