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

thansen pushed a commit to branch master
in repository libdumb.

commit 1a5466105fa71e1b9c510cee247ff93e2824cc2a
Author: Tobias Hansen <than...@debian.org>
Date:   Sun Sep 3 00:24:43 2017 +0100

    Update packaging for cmake.
---
 debian/compat                |  2 +-
 debian/control               |  6 ++---
 debian/libaldmb1-dev.install |  2 ++
 debian/libaldmb1.docs        |  1 -
 debian/libaldmb1.install     |  1 +
 debian/libdumb1-dev.install  |  2 ++
 debian/libdumb1.docs         |  1 -
 debian/libdumb1.install      |  1 +
 debian/rules                 | 56 ++++++--------------------------------------
 9 files changed, 17 insertions(+), 55 deletions(-)

diff --git a/debian/compat b/debian/compat
index ec63514..f599e28 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/control b/debian/control
index a5fb641..6e8d8ad 100644
--- a/debian/control
+++ b/debian/control
@@ -3,9 +3,9 @@ Section: libs
 Priority: optional
 Maintainer: Debian Games Team <pkg-games-de...@lists.alioth.debian.org>
 Uploaders: Tobias Hansen <than...@debian.org>
-Build-Depends: debhelper (>= 9), liballegro4-dev
-Standards-Version: 3.9.7
-Homepage: http://dumb.sourceforge.net/
+Build-Depends: cmake, debhelper (>= 10), liballegro4-dev, libargtable2-dev, 
libsdl2-dev
+Standards-Version: 4.1.0
+Homepage: https://github.com/kode54/dumb
 Vcs-Git: https://anonscm.debian.org/git/pkg-games/libdumb.git
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-games/libdumb.git
 
diff --git a/debian/libaldmb1-dev.install b/debian/libaldmb1-dev.install
new file mode 100644
index 0000000..e448735
--- /dev/null
+++ b/debian/libaldmb1-dev.install
@@ -0,0 +1,2 @@
+usr/lib/*/libaldmb.so
+usr/include/aldumb.h
diff --git a/debian/libaldmb1.docs b/debian/libaldmb1.docs
index 1bd39ea..dd6d57b 100644
--- a/debian/libaldmb1.docs
+++ b/debian/libaldmb1.docs
@@ -1,3 +1,2 @@
-docs
 examples
 readme.txt
diff --git a/debian/libaldmb1.install b/debian/libaldmb1.install
new file mode 100644
index 0000000..a1d7b9e
--- /dev/null
+++ b/debian/libaldmb1.install
@@ -0,0 +1 @@
+usr/lib/*/libaldmb.so.*
diff --git a/debian/libdumb1-dev.install b/debian/libdumb1-dev.install
new file mode 100644
index 0000000..c14896f
--- /dev/null
+++ b/debian/libdumb1-dev.install
@@ -0,0 +1,2 @@
+usr/lib/*/libdumb.so
+usr/include/dumb.h
diff --git a/debian/libdumb1.docs b/debian/libdumb1.docs
index 1bd39ea..dd6d57b 100644
--- a/debian/libdumb1.docs
+++ b/debian/libdumb1.docs
@@ -1,3 +1,2 @@
-docs
 examples
 readme.txt
diff --git a/debian/libdumb1.install b/debian/libdumb1.install
new file mode 100644
index 0000000..bd88fcb
--- /dev/null
+++ b/debian/libdumb1.install
@@ -0,0 +1 @@
+usr/lib/*/libdumb.so.*
diff --git a/debian/rules b/debian/rules
index 2769337..84be51d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,59 +1,17 @@
 #!/usr/bin/make -f
-# debian/rules for libdumb - uses debhelper.
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-CFLAGS  := $(shell dpkg-buildflags --get CFLAGS)
-LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS)
 
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
-# Compilation options
-export CONFIG_FLAGS="--prefix=/usr"
+DEB_CMAKE_OPTIONS ?= -DCMAKE_BUILD_TYPE=Release \
+                     -DCMAKE_INSTALL_PREFIX=/usr \
+                     -DBUILD_SHARED_LIBS:BOOL=ON \
+                     -DLIB_SUFFIX=/${DEB_HOST_MULTIARCH}
 
 %:
-       dh $@ --parallel
-
-override_dh_auto_clean:
-       $(MAKE) veryclean
-       rm -f `find -name '*.a'` make/dumbask make/config.txt
-       rm -Rf obj/unix/release/ lib/unix/
-       rm -f libdumb.so.1.0.0 libaldmb.so.1.0.0 libdumb.a libaldmb.a
-       dh_auto_clean
-
-override_dh_auto_build:
-       echo 'include make/unix.inc' > make/config.txt
-       echo 'ALL_TARGETS := core core-examples core-headers' >> make/config.txt
-       echo 'ALL_TARGETS += allegro allegro-examples allegro-headers' >> 
make/config.txt
-       echo 'PREFIX := /usr' >> make/config.txt
-       mkdir -p obj/unix/release/
-       mkdir -p lib/unix/
-       $(MAKE) lib/unix/libdumb.a
-       $(MAKE) lib/unix/libaldmb.a
-       cp lib/unix/libdumb.a .
-       cp lib/unix/libaldmb.a .
-       $(MAKE) clean
-       $(MAKE) lib/unix/libdumb.a CFLAGS_EXTRA=-fPIC
-       $(MAKE) lib/unix/libaldmb.a CFLAGS_EXTRA=-fPIC
-       $(CC) $(CFLAGS) $(LDFLAGS) -Wl,-soname,libdumb.so.1 -shared `sed -ne 
'/^CORE_MODULES :=/,/c$$/p' < Makefile | sed -e 's,\\\\,,' -e 
's,.*/\\(.*\\)\\.c,obj/unix/release/\\1.o,' | tail -n +2` -o libdumb.so.1.0.0 
-lm -lc
-       ln -s libdumb.so.1.0.0 libdumb.so
-       $(CC) $(CFLAGS) $(LDFLAGS) -Wl,-soname,libaldmb.so.1 -shared `sed -ne 
'/^ALLEGRO_MODULES :=/,/c$$/p' < Makefile | sed -e 's,\\\\,,' -e 
's,.*/\\(.*\\)\\.c,obj/unix/release/\\1.o,' | tail -n +2` -o libaldmb.so.1.0.0 
-L. -ldumb `allegro-config --libs` -lm -lc
-       rm -f libdumb.so
-
-override_dh_auto_install:
-       dh_install -plibdumb1 libdumb.so.1.0.0 usr/lib/$(DEB_HOST_MULTIARCH)
-       dh_install -plibaldmb1 libaldmb.so.1.0.0 usr/lib/$(DEB_HOST_MULTIARCH)
-       dh_install -plibdumb1-dev libdumb.a usr/lib/$(DEB_HOST_MULTIARCH)
-       dh_install -plibaldmb1-dev libaldmb.a usr/lib/$(DEB_HOST_MULTIARCH)
-       dh_install -plibdumb1-dev include/dumb.h usr/include
-       dh_install -plibaldmb1-dev include/aldumb.h usr/include
+       dh $@ --builddirectory=build
 
-override_dh_link:
-       dh_link -plibdumb1 usr/lib/$(DEB_HOST_MULTIARCH)/libdumb.so.1.0.0 
usr/lib/$(DEB_HOST_MULTIARCH)/libdumb.so.1
-       dh_link -plibdumb1-dev usr/lib/$(DEB_HOST_MULTIARCH)/libdumb.so.1 
usr/lib/$(DEB_HOST_MULTIARCH)/libdumb.so
-       dh_link -plibaldmb1 usr/lib/$(DEB_HOST_MULTIARCH)/libaldmb.so.1.0.0 
usr/lib/$(DEB_HOST_MULTIARCH)/libaldmb.so.1
-       dh_link -plibaldmb1-dev usr/lib/$(DEB_HOST_MULTIARCH)/libaldmb.so.1 
usr/lib/$(DEB_HOST_MULTIARCH)/libaldmb.so
+override_dh_auto_configure:
+       dh_auto_configure -- $(DEB_CMAKE_OPTIONS)
 
 override_dh_installdocs:
        dh_installdocs -plibdumb1

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

_______________________________________________
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

Reply via email to