r86 - in unstable/alogg/trunk/debian: . patches
sho at alioth.debian.org
sho at alioth.debian.org
Sun Oct 14 19:07:56 UTC 2007
Author: sho
Date: 2007-10-14 19:07:56 +0000 (Sun, 14 Oct 2007)
New Revision: 86
Added:
unstable/alogg/trunk/debian/compat
unstable/alogg/trunk/debian/patches/200_format_string_types.diff
unstable/alogg/trunk/debian/patches/210_strict_aliasing.diff
Modified:
unstable/alogg/trunk/debian/changelog
unstable/alogg/trunk/debian/control
unstable/alogg/trunk/debian/patches/series
unstable/alogg/trunk/debian/rules
Log:
* debian/rules:
+ Set debhelper compatibility level in debian/compat.
+ Removed duplicate binary-indep target.
+ Don’t ignore make clean errors.
* debian/control:
+ Removed leading “an”s from short descriptions and rephrased long
descriptions.
+ Replaced ${Source-Version} with ${binary:Version}.
* debian/patches/200_format_string_types.diff:
+ New patch. Fix format string warnings that can cause trouble on 64-bit.
* debian/patches/210_strict_aliasing.diff:
+ New patch. <alogg.h> is using Vorbis’s ov_callback structure and must
therefore include <vorbis/vorbisfile.h>.
Modified: unstable/alogg/trunk/debian/changelog
===================================================================
--- unstable/alogg/trunk/debian/changelog 2007-08-18 15:13:51 UTC (rev 85)
+++ unstable/alogg/trunk/debian/changelog 2007-10-14 19:07:56 UTC (rev 86)
@@ -1,5 +1,7 @@
-alogg (1.3.7-1) unstable; urgency=low
+alogg (1.3.7-1) UNRELEASED; urgency=low
+ [ Alexandre Pineau ]
+
* New upstream release
* Move development to Alioth
* debian/rules
@@ -10,29 +12,52 @@
+ New maintainer: Debian allegro packages maintainers
+ add myself to uploaders
+ build-depends
- - replace liballegro-dev by liballegro4.2-dev (Closes: #366764)
+ - replace liballegro-dev by liballegro4.2-dev
- remove docbook-to-man
- add quilt
- update version of debhelper (>= 5)
+ rename libalogg by libalogg1 (Closes: #354516)
+ libalogg becomes a transitional package to provide a smooth upgrade
- + Set policy to 3.7.2.2 -- no changes.
+ + Set policy to 3.7.2.2 -- no changes.
* 010_makefile.diff (new patch from old diff.gz with some changes)
+ replace makedoc by allegro-makedoc
+ Change paths (replace /usr/local by $(DESTDIR)/usr
+ no autodetection of system type
+ remove call to ldconfig (already done by dh_makeshlibs)
- + create links to shared library
+ + create links to shared library
+ add rule clean_obj_lib to remove library object files only
- + remove install_man rule from install rule (already done with
+ + remove install_man rule from install rule (already done with
dh_installman)
- + ...
* update README.debian
* 020_info.diff patch : add number of chapter to be able to build the info
- file with makeinfo
+ file with makeinfo
- -- Alexandre Pineau <alexandre.pineau at free.fr> Fri, 27 Oct 2006 02:35:25 +0200
+ [ Sam Hocevar ]
+ * debian/rules:
+ + Set debhelper compatibility level in debian/compat.
+ + Removed duplicate binary-indep target.
+ + Don’t ignore make clean errors.
+ * debian/control:
+ + Removed leading “an”s from short descriptions and rephrased long
+ descriptions.
+ + Replaced ${Source-Version} with ${binary:Version}.
+ * debian/patches/200_format_string_types.diff:
+ + New patch. Fix format string warnings that can cause trouble on 64-bit.
+ * debian/patches/210_strict_aliasing.diff:
+ + New patch. <alogg.h> is using Vorbis’s ov_callback structure and must
+ therefore include <vorbis/vorbisfile.h>.
+
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Sun, 14 Oct 2007 14:18:18 +0000
+
+alogg (1.3.3-5) unstable; urgency=low
+
+ * Temporary upload to fix pending bugs.
+ * debian/control:
+ + Build-depend on liballegro4.2-dev (Closes: #366764).
+
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Sun, 14 Oct 2007 01:18:53 +0000
+
alogg (1.3.3-4) unstable; urgency=low
* Build-Depends on liballegro-dev (>=2:4.1.15-4)
Added: unstable/alogg/trunk/debian/compat
===================================================================
--- unstable/alogg/trunk/debian/compat (rev 0)
+++ unstable/alogg/trunk/debian/compat 2007-10-14 19:07:56 UTC (rev 86)
@@ -0,0 +1 @@
+5
Modified: unstable/alogg/trunk/debian/control
===================================================================
--- unstable/alogg/trunk/debian/control 2007-08-18 15:13:51 UTC (rev 85)
+++ unstable/alogg/trunk/debian/control 2007-10-14 19:07:56 UTC (rev 86)
@@ -2,7 +2,7 @@
Section: libs
Priority: optional
Maintainer: Debian allegro packages maintainers <pkg-allegro-maintainers at lists.alioth.debian.org>
-Uploaders: Alexandre Pineau <alexandre.pineau at free.fr>
+Uploaders: Alexandre Pineau <alexandre.pineau at free.fr>, Sam Hocevar (Debian packages) <sam+deb at zoy.org>
Build-Depends: debhelper (>= 5), liballegro4.2-dev, libvorbis-dev, quilt, texinfo
Standards-Version: 3.7.2.2
@@ -11,31 +11,34 @@
Architecture: any
Depends: ${shlibs:Depends}
Conflicts: libalogg (<< 1.3.7-1)
-Description: an Ogg/Vorbis Library for Allegro - shared libraries
- alogg is a library which makes it easier to use Ogg/Vorbis
- streams with Allegro. It offers facilities to decode, stream,
- and encode Ogg/Vorbis streams with URL and thread support,
- and integrates those facilities with Allegro's datafile
- and sample loading routines.
+Description: Ogg/Vorbis library for Allegro - shared libraries
+ alogg is a library which makes it easier to use Ogg/Vorbis streams with
+ the Allegro gaming library. It offers facilities to decode, stream, and
+ encode Ogg/Vorbis streams with URL and thread support, and integrates
+ those facilities with Allegro's datafile and sample loading routines.
+ .
+ This package contains the runtime shared libraries.
Package: libalogg-dev
Section: libdevel
Architecture: any
-Depends: libalogg1 (= ${Source-Version}), libvorbis-dev
-Description: an Ogg/Vorbis library for Allegro - development files
- alogg is a library which makes it easier to use Ogg/Vorbis
- streams with Allegro. It offers facilities to decode, stream,
- and encode Ogg/Vorbis streams with URL and thread support,
- and integrates those facilities with Allegro's datafile
- and sample loading routines.
+Depends: libalogg1 (= ${binary:Version}), libvorbis-dev
+Description: Ogg/Vorbis library for Allegro - development files
+ alogg is a library which makes it easier to use Ogg/Vorbis streams with
+ the Allegro gaming library. It offers facilities to decode, stream, and
+ encode Ogg/Vorbis streams with URL and thread support, and integrates
+ those facilities with Allegro's datafile and sample loading routines.
+ .
+ This package contains the development files.
Package: libalogg
Section: libs
Architecture: all
Depends: libalogg1
-Description: an Ogg/Vorbis Library for Allegro (transitional package)
- alogg is a library which makes it easier to use Ogg/Vorbis
- streams with Allegro. It offers facilities to decode, stream,
- and encode Ogg/Vorbis streams with URL and thread support,
- and integrates those facilities with Allegro's datafile
- and sample loading routines.
+Description: Ogg/Vorbis library for Allegro (transitional package)
+ alogg is a library which makes it easier to use Ogg/Vorbis streams with
+ the Allegro gaming library. It offers facilities to decode, stream, and
+ encode Ogg/Vorbis streams with URL and thread support, and integrates
+ those facilities with Allegro's datafile and sample loading routines.
+ .
+ This is a transitional package for upgrades from previous versions.
Added: unstable/alogg/trunk/debian/patches/200_format_string_types.diff
===================================================================
--- unstable/alogg/trunk/debian/patches/200_format_string_types.diff (rev 0)
+++ unstable/alogg/trunk/debian/patches/200_format_string_types.diff 2007-10-14 19:07:56 UTC (rev 86)
@@ -0,0 +1,75 @@
+Index: alogg-1.3.7/alogg.c
+===================================================================
+--- alogg-1.3.7.orig/alogg.c 2007-10-14 14:14:37.000000000 +0000
++++ alogg-1.3.7/alogg.c 2007-10-14 14:17:14.000000000 +0000
+@@ -283,19 +283,20 @@
+ stereo=(info->channels>1);
+
+ num_samples=ov_pcm_total(vf,-1);
+- TRACE("ov_pcm_total says %lld samples\n",num_samples);
++ TRACE("ov_pcm_total says %lld samples\n",(long long int)num_samples);
+ if (num_samples<0) {
+- TRACE("ov_pcm_total failed: %lld - not fatal\n",(ogg_int64_t)num_samples);
++ TRACE("ov_pcm_total failed: %lld - not fatal\n",(long long int)num_samples);
+ }
+ TRACE(
+ "ov_load: create sample: %d bits, %d channels (%s), %ld Hz, %lld samples\n",
+- 16,info->channels,stereo?"stereo":"mono",info->rate,num_samples
++ 16,info->channels,stereo?"stereo":"mono",info->rate,
++ (long long int)num_samples
+ );
+ sample=create_sample(16,stereo,info->rate,num_samples>0?num_samples:1);
+ if (!sample) {
+ TRACE(
+ "Failed creating a sample (%d channels, %ld Hz, %u samples",
+- info->channels,info->rate,(size_t)num_samples
++ info->channels,info->rate,(unsigned int)num_samples
+ );
+ goto load_error_file;
+ }
+@@ -305,7 +306,7 @@
+ if (num_samples<0) {
+ /* If we could not determine the size of the sample, allocate as we go */
+ if (offset+max_read>buffer_size) {
+- TRACE("Buffer too small: adding %u bytes\n",buffer_inc);
++ TRACE("Buffer too small: adding %u bytes\n",(unsigned int)buffer_inc);
+ buffer_size+=buffer_inc;
+ buffer_inc+=buffer_inc/2;
+ #ifdef FORTIFY
+@@ -604,7 +605,7 @@
+ ASSERT(stream);
+ ASSERT(block);
+
+- TRACE("Reading stream data: %u bytes at %p\n",size,block);
++ TRACE("Reading stream data: %u bytes at %p\n",(unsigned int)size,block);
+ /* decode the encoded data */
+ for (;size-read_size>0;) {
+ int ret=read_ogg_data(
+@@ -615,7 +616,8 @@
+ break;
+ }
+ if (ret<0) {
+- TRACE("read_ogg_data returned %d, read size %u\n",ret,read_size);
++ TRACE("read_ogg_data returned %d, read size %u\n",ret,
++ (unsigned int)read_size);
+ if (read_size) break;
+ TRACE("read_ogg_data failed: %d\n",ret);
+ alogg_error_code=ret;
+@@ -623,7 +625,7 @@
+ }
+ read_size+=ret;
+ }
+- TRACE("%u bytes actually read\n",read_size);
++ TRACE("%u bytes actually read\n",(unsigned int)read_size);
+ if (size!=read_size) {
+ /* fill with silence to make sure old data doesn't get played */
+ size_t n;
+@@ -770,7 +772,7 @@
+ ret=encode_buffers_16(buffers,data,num_samples,channels);
+ break;
+ default:
+- TRACE("Unsupported sample size: %d\n",bits);
++ TRACE("Unsupported sample size: %d\n",(int)bits);
+ ret=0;
+ break;
+ }
Added: unstable/alogg/trunk/debian/patches/210_strict_aliasing.diff
===================================================================
--- unstable/alogg/trunk/debian/patches/210_strict_aliasing.diff (rev 0)
+++ unstable/alogg/trunk/debian/patches/210_strict_aliasing.diff 2007-10-14 19:07:56 UTC (rev 86)
@@ -0,0 +1,59 @@
+Index: alogg-1.3.7/alogg.h
+===================================================================
+--- alogg-1.3.7.orig/alogg.h 2005-12-11 20:11:57.000000000 +0000
++++ alogg-1.3.7/alogg.h 2007-10-14 14:29:04.000000000 +0000
+@@ -49,7 +49,7 @@
+ struct DATAFILE;
+ struct AUDIOSTREAM;
+ struct OggVorbis_File;
+-struct ov_callbacks;
++#include <vorbis/vorbisfile.h>
+
+ struct alogg_stream;
+ struct alogg_encoding_data;
+@@ -83,7 +83,7 @@
+ AL_CONST struct DATAFILE *dat,size_t block_size
+ );
+ struct alogg_stream *alogg_start_streaming_callbacks(
+- void *datasource,struct ov_callbacks *callbacks,size_t block_size,
++ void *datasource,ov_callbacks *callbacks,size_t block_size,
+ int (*update)(struct alogg_stream*,void*)
+ );
+ int alogg_read_stream_data(struct alogg_stream*,void *buffer,size_t size);
+Index: alogg-1.3.7/alogg.c
+===================================================================
+--- alogg-1.3.7.orig/alogg.c 2007-10-14 14:29:57.000000000 +0000
++++ alogg-1.3.7/alogg.c 2007-10-14 14:30:40.000000000 +0000
+@@ -502,7 +502,7 @@
+ if (!f) return NULL;
+
+ stream=alogg_start_streaming_callbacks(
+- f,(struct ov_callbacks*)&packfile_callbacks,block_size,NULL
++ f,&packfile_callbacks,block_size,NULL
+ );
+ if (!stream) pack_fclose(f);
+ return stream;
+@@ -526,7 +526,7 @@
+ ovd->allocated=0;
+ ovd->data=dat->dat;
+ stream=alogg_start_streaming_callbacks(
+- ovd,(struct ov_callbacks*)&datafile_callbacks,block_size,NULL
++ ovd,&datafile_callbacks,block_size,NULL
+ );
+ if (!stream) free(ovd);
+ return stream;
+@@ -539,12 +539,12 @@
+ if (!ovd) return NULL;
+ ovd->position=0;
+ return alogg_start_streaming_callbacks(
+- ovd,(struct ov_callbacks*)&memory_callbacks,block_size,NULL
++ ovd,&memory_callbacks,block_size,NULL
+ );
+ }
+
+ alogg_stream *alogg_start_streaming_callbacks(
+- void *datasource,struct ov_callbacks *callbacks,size_t block_size,
++ void *datasource,ov_callbacks *callbacks,size_t block_size,
+ int (*update)(alogg_stream*,void*)
+ )
+ {
Modified: unstable/alogg/trunk/debian/patches/series
===================================================================
--- unstable/alogg/trunk/debian/patches/series 2007-08-18 15:13:51 UTC (rev 85)
+++ unstable/alogg/trunk/debian/patches/series 2007-10-14 19:07:56 UTC (rev 86)
@@ -1,2 +1,4 @@
010_makefile.diff -p1
020_info.diff -p1
+200_format_string_types.diff
+210_strict_aliasing.diff
Modified: unstable/alogg/trunk/debian/rules
===================================================================
--- unstable/alogg/trunk/debian/rules 2007-08-18 15:13:51 UTC (rev 85)
+++ unstable/alogg/trunk/debian/rules 2007-10-14 19:07:56 UTC (rev 86)
@@ -5,9 +5,6 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-# This is the debhelper compatibility version to use.
-export DH_COMPAT=5
-
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
NOPT=1
else
@@ -26,32 +23,23 @@
configure: configure-stamp
configure-stamp:
dh_testdir
- # Add here commands to configure the package.
QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2
-
touch configure-stamp
-
build: build-stamp
build-stamp: configure-stamp
dh_testdir
-
- # Add here commands to compile the package.
$(MAKE) all PTHREAD=1 NOPT=$(NOPT)
$(MAKE) clean_obj_lib
$(MAKE) all SHARED=1 TYPE=txi PTHREAD=1 NOPT=$(NOPT)
-
touch build-stamp
clean:
dh_testdir
dh_testroot
rm -f build-stamp configure-stamp
-
- # Add here commands to clean up after the build process.
- -$(MAKE) clean
+ $(MAKE) clean
QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2
-
dh_clean
install: build
@@ -59,21 +47,13 @@
dh_testroot
dh_clean -k
dh_installdirs -plibalogg-dev usr/share/doc/libalogg-dev/html
-
- # Add here commands to install the package into debian/tmp
$(MAKE) install_lib DESTDIR=$(CURDIR)/debian/tmp
$(MAKE) install SHARED=1 DESTDIR=$(CURDIR)/debian/tmp
-
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
binary-arch: build install
dh_testdir -a
dh_testroot -a
- dh_install --sourcedir=debian/tmp -a
+ dh_install --sourcedir=debian/tmp --list-missing -a
cp -a *.html `pwd`/debian/libalogg-dev/usr/share/doc/libalogg-dev/html
dh_installdocs -a
dh_installman -plibalogg-dev alogg-config.1 -a
@@ -91,7 +71,6 @@
dh_md5sums
dh_builddeb
-# Build architecture-independent files here.
binary-indep: build install
dh_testdir -i
dh_testroot -i
More information about the Pkg-allegro-commits
mailing list