[Pkg-erlang-commits] r1764 - in libsdl-erlang/trunk/debian: . patches source
sgolovan at alioth.debian.org
sgolovan at alioth.debian.org
Fri Apr 1 12:36:13 UTC 2016
Author: sgolovan
Date: 2016-04-01 12:36:12 +0000 (Fri, 01 Apr 2016)
New Revision: 1764
Added:
libsdl-erlang/trunk/debian/dh-rebar.conf
libsdl-erlang/trunk/debian/patches/rebar.patch
libsdl-erlang/trunk/debian/source/
libsdl-erlang/trunk/debian/source/format
Removed:
libsdl-erlang/trunk/debian/README.source
libsdl-erlang/trunk/debian/patches/driver.patch
libsdl-erlang/trunk/debian/patches/gl.patch
libsdl-erlang/trunk/debian/patches/pic.patch
Modified:
libsdl-erlang/trunk/debian/changelog
libsdl-erlang/trunk/debian/compat
libsdl-erlang/trunk/debian/control
libsdl-erlang/trunk/debian/erlang-esdl-dev.install
libsdl-erlang/trunk/debian/erlang-esdl-doc.install
libsdl-erlang/trunk/debian/patches/series
libsdl-erlang/trunk/debian/rules
libsdl-erlang/trunk/debian/watch
Log:
[esdl]
* New upstream release.
* Switched to 3.0 (quilt) source format and bumped the debhelper
compatibility version to 9.
* Switched to rebar for building the package because it's the only
supported build mechanism now.
* Bumped standards version to 3.9.7.
Deleted: libsdl-erlang/trunk/debian/README.source
===================================================================
--- libsdl-erlang/trunk/debian/README.source 2016-03-26 09:28:57 UTC (rev 1763)
+++ libsdl-erlang/trunk/debian/README.source 2016-04-01 12:36:12 UTC (rev 1764)
@@ -1,8 +0,0 @@
-This package uses quilt to manage all modifications to the upstream
-source. Changes are stored in the source package as diffs in
-debian/patches and applied during the build.
-
-To get detailed instructions on how to apply the series of patches
-and modify them, please read /usr/share/doc/quilt/README.source
-
- -- Sergei Golovan <sgolovan at debian.org> Sat, 17 Oct 2009 14:29:52 +0400
Modified: libsdl-erlang/trunk/debian/changelog
===================================================================
--- libsdl-erlang/trunk/debian/changelog 2016-03-26 09:28:57 UTC (rev 1763)
+++ libsdl-erlang/trunk/debian/changelog 2016-04-01 12:36:12 UTC (rev 1764)
@@ -1,8 +1,13 @@
-esdl (1.2-3) UNRELEASED; urgency=low
+esdl (1.3.1-1) unstable; urgency=low
- * NOT RELEASED YET
+ * New upstream release.
+ * Switched to 3.0 (quilt) source format and bumped the debhelper
+ compatibility version to 9.
+ * Switched to rebar for building the package because it's the only
+ supported build mechanism now.
+ * Bumped standards version to 3.9.7.
- -- Sergei Golovan <sgolovan at debian.org> Fri, 13 Jan 2012 10:20:21 +0400
+ -- Sergei Golovan <sgolovan at debian.org> Fri, 01 Apr 2016 14:40:59 +0300
esdl (1.2-2) unstable; urgency=low
Modified: libsdl-erlang/trunk/debian/compat
===================================================================
--- libsdl-erlang/trunk/debian/compat 2016-03-26 09:28:57 UTC (rev 1763)
+++ libsdl-erlang/trunk/debian/compat 2016-04-01 12:36:12 UTC (rev 1764)
@@ -1 +1 @@
-5
+9
Modified: libsdl-erlang/trunk/debian/control
===================================================================
--- libsdl-erlang/trunk/debian/control 2016-03-26 09:28:57 UTC (rev 1763)
+++ libsdl-erlang/trunk/debian/control 2016-04-01 12:36:12 UTC (rev 1764)
@@ -3,10 +3,10 @@
Priority: optional
Maintainer: Debian Erlang Packagers <pkg-erlang-devel at lists.alioth.debian.org>
Uploaders: Sergei Golovan <sgolovan at debian.org>
-Build-Depends: debhelper (>= 5.0.0), quilt, erlang-dev (>= 1:14.b.1),
+Build-Depends: debhelper (>= 9.0.0), dh-rebar, erlang-dev (>= 1:14.b.1), erlang-edoc,
libsdl1.2-dev, libsdl-ttf2.0-dev, libsdl-image1.2-dev,
libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev
-Standards-Version: 3.9.2
+Standards-Version: 3.9.7
Homepage: http://esdl.sourceforge.net
Vcs-Svn: svn://svn.debian.org//svn/pkg-erlang/libsdl-erlang/trunk/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-erlang/libsdl-erlang/trunk/
Added: libsdl-erlang/trunk/debian/dh-rebar.conf
===================================================================
--- libsdl-erlang/trunk/debian/dh-rebar.conf (rev 0)
+++ libsdl-erlang/trunk/debian/dh-rebar.conf 2016-04-01 12:36:12 UTC (rev 1764)
@@ -0,0 +1,5 @@
+PKG_NAME=esdl
+EXEC_REBAR_COMMANDS=compile
+REBAR_LIB_DIR=priv
+REBAR_BIN_DIR=ebin
+REBAR_INCLUDE_DIR=include
Modified: libsdl-erlang/trunk/debian/erlang-esdl-dev.install
===================================================================
--- libsdl-erlang/trunk/debian/erlang-esdl-dev.install 2016-03-26 09:28:57 UTC (rev 1763)
+++ libsdl-erlang/trunk/debian/erlang-esdl-dev.install 2016-04-01 12:36:12 UTC (rev 1764)
@@ -1,2 +1,2 @@
debian/tmp/usr/lib/erlang/lib/esdl-*/include
-debian/tmp/usr/lib/erlang/lib/esdl-*/src/*.hrl
+debian/tmp/usr/lib/erlang/lib/esdl-*/src
Modified: libsdl-erlang/trunk/debian/erlang-esdl-doc.install
===================================================================
--- libsdl-erlang/trunk/debian/erlang-esdl-doc.install 2016-03-26 09:28:57 UTC (rev 1763)
+++ libsdl-erlang/trunk/debian/erlang-esdl-doc.install 2016-04-01 12:36:12 UTC (rev 1764)
@@ -1 +1 @@
-debian/tmp/usr/lib/erlang/lib/esdl-*/doc/* usr/share/doc/erlang-esdl-doc/html
+doc/*.html usr/share/doc/erlang-esdl-doc/html
Deleted: libsdl-erlang/trunk/debian/patches/driver.patch
===================================================================
--- libsdl-erlang/trunk/debian/patches/driver.patch 2016-03-26 09:28:57 UTC (rev 1763)
+++ libsdl-erlang/trunk/debian/patches/driver.patch 2016-04-01 12:36:12 UTC (rev 1764)
@@ -1,103 +0,0 @@
-Patch fixes esdl_driver loading into Erlang R15B.
-
---- esdl-1.2.orig/c_src/esdl_driver.c
-+++ esdl-1.2/c_src/esdl_driver.c
-@@ -32,15 +32,20 @@
-
- #include "esdl.h"
-
-+#if ERL_DRV_EXTENDED_MAJOR_VERSION < 2
-+typedef int ErlDrvSizeT;
-+typedef int ErlDrvSSizeT;
-+#endif
-+
- #define TEMP_BINARY_SIZE 512
-
- static ErlDrvData sdl_driver_start(ErlDrvPort port, char *buff);
- static void sdl_driver_stop(ErlDrvData handle);
- static void sdl_driver_finish(void);
--static int sdl_driver_control(ErlDrvData handle, unsigned int command,
-- char* buf, int count, char** res, int res_size);
--static int sdl_driver_debug_control(ErlDrvData handle, unsigned int command,
-- char* buf, int count, char** res, int res_size);
-+static ErlDrvSSizeT sdl_driver_control(ErlDrvData handle, unsigned int command,
-+ char* buf, ErlDrvSizeT count, char** res, ErlDrvSizeT res_size);
-+static ErlDrvSSizeT sdl_driver_debug_control(ErlDrvData handle, unsigned int command,
-+ char* buf, ErlDrvSizeT count, char** res, ErlDrvSizeT res_size);
-
- static void standard_outputv(ErlDrvData drv_data, ErlIOVec *ev);
-
-@@ -62,6 +67,17 @@
- sdl_driver_control, /* F_PTR control, port_control callback */
- NULL, /* F_PTR timeout, reserved */
- standard_outputv, /* F_PTR outputv, reserved */
-+ NULL,
-+ NULL,
-+ NULL,
-+ NULL,
-+ ERL_DRV_EXTENDED_MARKER,
-+ ERL_DRV_EXTENDED_MAJOR_VERSION,
-+ ERL_DRV_EXTENDED_MINOR_VERSION,
-+ 0,
-+ NULL,
-+ NULL,
-+ NULL
- };
-
- DRIVER_INIT(sdl_driver)
-@@ -176,9 +192,9 @@
- {
- }
-
--static int
-+static ErlDrvSSizeT
- sdl_driver_control(ErlDrvData handle, unsigned op,
-- char* buf, int count, char** res, int res_size)
-+ char* buf, ErlDrvSizeT count, char** res, ErlDrvSizeT res_size)
- {
- sdl_data* sd = (sdl_data *) handle;
- sdl_fun func;
-@@ -190,7 +206,7 @@
- if(op < OPENGL_START) {
- // fprintf(stderr, "Command:%d:%s: ", op, sd->str_tab[op]);fflush(stderr);
- func = sd->fun_tab[op];
-- func(sd, count, buf);
-+ func(sd, (int)count, buf);
- } else {
- // fprintf(stderr, "Command:%d:gl_??\r\n", op); fflush(stderr);
- gl_dispatch(sd, op, count, buf);
-@@ -198,12 +214,12 @@
- }
- // fprintf(stderr, "%s:%d: Eed %d\r\n", __FILE__,__LINE__,op); fflush(stderr);
- (*res) = sd->buff;
-- return sd->len;
-+ return (ErlDrvSSizeT)(sd->len);
- }
-
--static int
-+static ErlDrvSSizeT
- sdl_driver_debug_control(ErlDrvData handle, unsigned op,
-- char* buf, int count, char** res, int res_size)
-+ char* buf, ErlDrvSizeT count, char** res, ErlDrvSizeT res_size)
- {
- sdl_data* sd = (sdl_data *) handle;
- sdl_fun func;
-@@ -215,15 +231,15 @@
- if(op < OPENGL_START) {
- fprintf(stderr, "Command:%d:%s: ", op, sd->str_tab[op]);fflush(stderr);
- func = sd->fun_tab[op];
-- func(sd, count, buf);
-+ func(sd, (int)count, buf);
- if ((len = sd->len) >= 0) {
- fprintf(stderr, "ok %d %p\r\n", len, sd->buff);fflush(stderr);
- (*res) = sd->buff;
-- return len;
-+ return (ErlDrvSSizeT)len;
- } else {
- fprintf(stderr, "error\r\n");fflush(stderr);
- *res = 0;
-- return -1;
-+ return (ErlDrvSSizeT)(-1);
- }
- } else {
- fprintf(stderr, "Command:%d ", op);fflush(stderr);
Deleted: libsdl-erlang/trunk/debian/patches/gl.patch
===================================================================
--- libsdl-erlang/trunk/debian/patches/gl.patch 2016-03-26 09:28:57 UTC (rev 1763)
+++ libsdl-erlang/trunk/debian/patches/gl.patch 2016-04-01 12:36:12 UTC (rev 1764)
@@ -1,23 +0,0 @@
-Patch removes unused includes of gl.hrl which in turn was moved to the
-wxErlang.
-
---- esdl-1.2.orig/src/sdl_img.erl
-+++ esdl-1.2/src/sdl_img.erl
-@@ -16,7 +16,6 @@
- -module(sdl_img).
-
- -include("sdl_img_funcs.hrl").
---include("gl.hrl").
- -include("sdl_util.hrl").
- -include("sdl_video.hrl").
-
---- esdl-1.2.orig/src/sdl_ttf.erl
-+++ esdl-1.2/src/sdl_ttf.erl
-@@ -16,7 +16,6 @@
-
- -include("sdl_ttf.hrl").
- -include("sdl_ttf_funcs.hrl").
---include("gl.hrl").
- -include("sdl_util.hrl").
- -include("sdl_video.hrl").
-
Deleted: libsdl-erlang/trunk/debian/patches/pic.patch
===================================================================
--- libsdl-erlang/trunk/debian/patches/pic.patch 2016-03-26 09:28:57 UTC (rev 1763)
+++ libsdl-erlang/trunk/debian/patches/pic.patch 2016-04-01 12:36:12 UTC (rev 1764)
@@ -1,18 +0,0 @@
-
---- esdl-1.2.orig/c_src/Makefile
-+++ esdl-1.2/c_src/Makefile
-@@ -43,12 +43,12 @@
- INCS = $(GL_INCS) $(SDL_INCS) $(SDL_TTF_INCS) \
- $(SDL_IMAGE_INCS) $(ERL_INCS)
-
-- CFLAGS = -g -O2 -funroll-loops -Wall -ffast-math -fpic \
-+ CFLAGS = -g -O2 -funroll-loops -Wall -ffast-math -fPIC \
- -fomit-frame-pointer $(USE_GL_INCLUDE_DIR) -DSHM \
- $(USE_SDL_TTF) $(USE_SDL_IMAGE) \
- -DPTHREADS $(INCS)
-
-- CLINKFLAGS = -fpic -shared
-+ CLINKFLAGS = -fPIC -shared
-
- SOEXT = so
-
Added: libsdl-erlang/trunk/debian/patches/rebar.patch
===================================================================
--- libsdl-erlang/trunk/debian/patches/rebar.patch (rev 0)
+++ libsdl-erlang/trunk/debian/patches/rebar.patch 2016-04-01 12:36:12 UTC (rev 1764)
@@ -0,0 +1,24 @@
+diff -ru esdl-esdl-1.3.1.orig/rebar.config esdl-esdl-1.3.1/rebar.config
+--- esdl-esdl-1.3.1.orig/rebar.config 2013-12-19 14:51:52.930930018 +0400
++++ esdl-esdl-1.3.1/rebar.config 2013-12-19 15:44:08.918284859 +0400
+@@ -5,8 +5,8 @@
+ %% Also see rebar.config.script
+
+ {port_env, [
+- {"linux", "CFLAGS", "$CFLAGS $SDL_CFLAGS"},
+- {"linux", "LDFLAGS", "$LDFLAGS $SDL_LIBDIR"},
++ {"linux", "CFLAGS", "$CFLAGS $SDL_CFLAGS -DSHM -D_USE_SDL_TTF -D_USE_SDL_IMAGE -DPTHREADS"},
++ {"linux", "LDFLAGS", "$LDFLAGS $SDL_LIBDIR -lSDL_ttf -lSDL_image"},
+
+ {"darwin", "CFLAGS", "$CFLAGS -ObjC -D_OSX_COCOA -I/opt/X11/include"},
+ {"darwin", "LDFLAGS", "$LDFLAGS -framework SDL -rpath @executable_path/../Frameworks"},
+@@ -26,6 +26,8 @@
+ "c_src/esdl_spec.c",
+ "c_src/esdl_util.c",
+ "c_src/esdl_video.c",
++ "c_src/esdl_ttf.c",
++ "c_src/esdl_img.c",
+ "c_src/esdl_wrapper.c"
+ ]}
+ ]}.
+Only in esdl-esdl-1.3.1: .rebar.config.swp
Modified: libsdl-erlang/trunk/debian/patches/series
===================================================================
--- libsdl-erlang/trunk/debian/patches/series 2016-03-26 09:28:57 UTC (rev 1763)
+++ libsdl-erlang/trunk/debian/patches/series 2016-04-01 12:36:12 UTC (rev 1764)
@@ -1,3 +1 @@
-driver.patch
-gl.patch
-pic.patch
+rebar.patch
Modified: libsdl-erlang/trunk/debian/rules
===================================================================
--- libsdl-erlang/trunk/debian/rules 2016-03-26 09:28:57 UTC (rev 1763)
+++ libsdl-erlang/trunk/debian/rules 2016-04-01 12:36:12 UTC (rev 1764)
@@ -6,125 +6,35 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-export QUILT_PATCHES := debian/patches
+v = 1.3.1
--include vsn.mk
-TOPDIR := $(CURDIR)/debian/tmp
-PACKAGEDIR := /usr/lib/erlang/lib/$(ESDL_VSN)
+%:
+ dh $@ --buildsystem=rebar --with rebar
-patch: patch-stamp
-patch-stamp:
- dh_testdir
- quilt push -a || test $$? = 2
- touch patch-stamp
+override_dh_auto_build:
+ dh_auto_build -O--buildsystem=rebar
+ $(MAKE) -C test
-unpatch: patch-stamp
- dh_testdir
- quilt pop -a || test $$? = 2
- rm -rf .pc
- rm -f patch-stamp
+override_dh_auto_clean:
+ dh_auto_clean -O--buildsystem=rebar
+ rm -f test/*.beam
-build: build-indep build-arch
-build-indep: config-stamp build-stamp
-build-arch: config-stamp build-stamp
-build-stamp:
- dh_testdir
- #
- $(MAKE) ENABLE_SDL_TTF=yes ENABLE_SDL_IMAGE=yes
- #
- touch build-stamp
+override_dh_auto_install:
+ dh_auto_install -O--buildsystem=rebar
+ install -m 755 -d debian/tmp/usr/lib/erlang/lib/esdl-$(v)/src
+ install -m 644 src/*.hrl debian/tmp/usr/lib/erlang/lib/esdl-$(v)/src
-config: config-stamp
-config-stamp: patch-stamp
- touch config-stamp
+override_dh_compress:
+ dh_compress -X.wav -X.erl -X.bmp -X.beam -O--buildsystem=rebar
-clean: clean-patched unpatch
- dh_testdir
- dh_testroot
- dh_clean
+override_dh_fixperms:
+ dh_fixperms -O--buildsystem=rebar
+ chmod a-x debian/erlang-esdl-doc/usr/share/doc/erlang-esdl-doc/html/*
+ chmod a-x debian/erlang-esdl-doc/usr/share/doc/erlang-esdl-doc/examples/*
-clean-patched: patch-stamp
- dh_testdir
- dh_testroot
- rm -f build-stamp install-stamp config-stamp
- #
- # Add here commands to clean up after the build process.
- $(MAKE) clean ENABLE_SDL_TTF=yes ENABLE_SDL_IMAGE=yes
- #
- find . -name \*~ -exec rm {} \;
- find . -name erl_crash.dump -exec rm {} \;
-
-install: install-stamp
-install-stamp: build-stamp
- dh_testdir
- dh_testroot
- dh_clean -k
- mkdir -m 755 -p $(TOPDIR)$(PACKAGEDIR)
- #
- # Add here commands to install the package into debian/tmp.
- $(MAKE) install ENABLE_SDL_TTF=yes ENABLE_SDL_IMAGE=yes \
- INSTALLDIR=$(TOPDIR)$(PACKAGEDIR)
- #
- rm -f $(TOPDIR)$(PACKAGEDIR)/Readme*
- rm -f $(TOPDIR)$(PACKAGEDIR)/license.terms
- rm -f $(TOPDIR)$(PACKAGEDIR)/vsn
- #
- chmod a-x $(TOPDIR)$(PACKAGEDIR)/doc/*
- chmod a-x $(TOPDIR)$(PACKAGEDIR)/src/*
- chmod a-x $(TOPDIR)$(PACKAGEDIR)/c_src/*
- chmod a-x $(TOPDIR)$(PACKAGEDIR)/include/*
- #
- touch install-stamp
-
-# Build architecture-independent files here.
-binary-indep: build-stamp install-stamp
- dh_testdir -i
- dh_testroot -i
- dh_installdirs -i
- dh_install -i
- dh_installdocs -i
- dh_installexamples -i
- chmod a-x $(CURDIR)/debian/erlang-esdl-doc/usr/share/doc/erlang-esdl-doc/examples/*
- dh_installchangelogs -i
- dh_strip -i
- dh_compress -i -X.erl -X.beam -X.wav -X.bmp
- dh_fixperms -i
- dh_makeshlibs -i
- dh_installdeb -i
- dh_shlibdeps -i
- erlang-depends -i
- dh_gencontrol -i
- dh_md5sums -i
- dh_builddeb -i
-
-# Build architecture-dependent files here.
-binary-arch: build-stamp install-stamp
- dh_testdir -a
- dh_testroot -a
- dh_installdirs -a
- dh_install -a
- dh_installdocs -a
- dh_installexamples -a
- dh_installchangelogs -a
- install debian/erlang-esdl.lintian-overrides \
- $(CURDIR)/debian/erlang-esdl/usr/share/lintian/overrides/erlang-esdl
- dh_strip -a
- dh_compress -a -X.erl -X.beam -X.wav -X.bmp
- dh_fixperms -a
- dh_makeshlibs -a
- dh_installdeb -a
- dh_shlibdeps -a
- erlang-depends -a
- dh_gencontrol -a
- dh_md5sums -a
- dh_builddeb -a
-
-binary: binary-indep binary-arch
-
-# Probably it's not good to use one particular sf.net mirror
get-orig-source:
- wget -O esdl_1.2.orig.tar.gz \
- http://heanet.dl.sourceforge.net/sourceforge/esdl/esdl-1.2.src.tar.gz
+ wget -O esdl_$(v).orig.tar.gz \
+ http://heanet.dl.sourceforge.net/sourceforge/esdl/esdl-$(v).src.tgz
-.PHONY: build build-indep build-arch clean binary-indep binary-arch binary install get-orig-source \
- clean-patched patch unpatch
+.PHONY: get-orig-source override_dh_auto_build override_dh_auto_clean \
+ override_dh_auto_install override_dh_compress override_dh_fixperms
Added: libsdl-erlang/trunk/debian/source/format
===================================================================
--- libsdl-erlang/trunk/debian/source/format (rev 0)
+++ libsdl-erlang/trunk/debian/source/format 2016-04-01 12:36:12 UTC (rev 1764)
@@ -0,0 +1 @@
+3.0 (quilt)
Modified: libsdl-erlang/trunk/debian/watch
===================================================================
--- libsdl-erlang/trunk/debian/watch 2016-03-26 09:28:57 UTC (rev 1763)
+++ libsdl-erlang/trunk/debian/watch 2016-04-01 12:36:12 UTC (rev 1764)
@@ -3,4 +3,4 @@
# Compulsory line, this is a version 3 file
version=3
-http://sf.net/esdl/esdl-([\d.]*).src.tar.gz
+http://sf.net/esdl/esdl-([\d.]*)\.src\.t(?:ar\.)?gz
More information about the Pkg-erlang-commits
mailing list