here's a patch to exclude the DejaVuSans.ttf that is included with
upstream, and instead use the one in fonts-dejavu-core, which fixes a
lintian complaint.

Another issue I've noticed is sid has llvm-dev at 3.2, wheezy has
llvm-dev at 3.0 but a separate llvm-3.1-dev, and jessie only has llvm
2.8. bit of a mess for us, gambas needs llvm >= 3.1

I've included another patch which switches to llvm-3.1-dev (i.e. so it
works on wheezy), I wonder if this could allow gambas3 to go into
wheezy-backports.

Ian
diff --git a/debian/control b/debian/control
index 77d7918..84ec114 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Homepage: http://gambas.sourceforge.net
 Maintainer: Gambas Debian Maintainers <[email protected]> 
 Uploaders: Ian Haywood <[email protected]>, David Paleino <[email protected]>, José L. Redrejo Rodríguez <[email protected]>
-Build-Depends: debhelper (>> 7), dh-autoreconf, libpq-dev, libv4l-dev [linux-any], libv4l-dev [kfreebsd-any], libcam-dev [kfreebsd-any], libmysqlclient-dev, libbz2-dev, libglew-dev, libqt4-dev, libqt4-opengl-dev, libcurl4-openssl-dev, libsdl-mixer1.2-dev, libsqlite0-dev, libxml2-dev, libxslt1-dev, kdelibs5-dev, libssl-dev, zlib1g-dev, unixodbc-dev, libsqlite3-dev, libgtk2.0-dev, libxt-dev, pkg-config, mesa-common-dev, libsdl-sound1.2-dev, libsdl-image1.2-dev, libsdl-gfx1.2-dev, libsdl-ttf2.0-dev, libpcre3-dev, libsdl1.2-dev, libjpeg-dev, libpng12-dev, libpoppler-private-dev, libimlib2-dev, librsvg2-dev, bzip2, gettext, libxtst-dev, libffi-dev, libdbus-1-dev, libgnome-keyring-dev, libgtkglext1-dev, linux-libc-dev [linux-any], libc0.1 [kfreebsd-any], libqtwebkit-dev, libgsl0-dev, libncurses5-dev, libtool, libgmime-2.6-dev, llvm-dev (>> 1:3.1) [amd64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc]
+Build-Depends: debhelper (>> 7), dh-autoreconf, libpq-dev, libv4l-dev [linux-any], libv4l-dev [kfreebsd-any], libcam-dev [kfreebsd-any], libmysqlclient-dev, libbz2-dev, libglew-dev, libqt4-dev, libqt4-opengl-dev, libcurl4-openssl-dev, libsdl-mixer1.2-dev, libsqlite0-dev, libxml2-dev, libxslt1-dev, kdelibs5-dev, libssl-dev, zlib1g-dev, unixodbc-dev, libsqlite3-dev, libgtk2.0-dev, libxt-dev, pkg-config, mesa-common-dev, libsdl-sound1.2-dev, libsdl-image1.2-dev, libsdl-gfx1.2-dev, libsdl-ttf2.0-dev, libpcre3-dev, libsdl1.2-dev, libjpeg-dev, libpng12-dev, libpoppler-private-dev, libimlib2-dev, librsvg2-dev, bzip2, gettext, libxtst-dev, libffi-dev, libdbus-1-dev, libgnome-keyring-dev, libgtkglext1-dev, linux-libc-dev [linux-any], libc0.1 [kfreebsd-any], libqtwebkit-dev, libgsl0-dev, libncurses5-dev, libtool, libgmime-2.6-dev, llvm-3.1-dev [amd64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc]
 Standards-Version: 3.9.3
 
 Package: gambas3
@@ -475,7 +475,7 @@ Description: Gambas report component
 Package: gambas3-gb-sdl
 Architecture: any
 Section: libdevel
-Depends: ${misc:Depends}, ${shlibs:Depends}, gambas3-runtime (>= ${binary:Version}), fonts-dejavu-core 
+Depends: ${misc:Depends}, ${shlibs:Depends}, gambas3-runtime (>= ${binary:Version}), ttf-dejavu-core 
 Description: Gambas SDL component
  Gambas is a free development environment based on a Basic interpreter
  with object extensions, like Visual Basic(tm) (but it is NOT a clone!).
diff --git a/debian/rules b/debian/rules
index 5dea789..8701acb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,7 +12,7 @@ configure:
 
 config.status: configure
 
-	CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" CXXFLAGS="$(CXXFLAGS)" LLVM_CONFIG=/usr/bin/llvm-config ./configure --host=$(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) --build=$(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) -C --prefix=/usr --with-sdl-includes=/usr/include/SDL --with-sdl-libraries=/usr/lib --with-libxml-includes=/usr/include/libxml2 --with-xslt-includes=/usr/include/libxslt
+	LLVM_CONFIG=/usr/bin/llvm-config-3.1 CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" CXXFLAGS="$(CXXFLAGS)" LLVM_CONFIG=/usr/bin/llvm-config ./configure --host=$(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) --build=$(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) -C --prefix=/usr --with-sdl-includes=/usr/include/SDL --with-sdl-libraries=/usr/lib --with-libxml-includes=/usr/include/libxml2 --with-xslt-includes=/usr/include/libxslt
 	touch configure-stamp
 
 
diff --git a/debian/control b/debian/control
index fac88fa..77d7918 100644
--- a/debian/control
+++ b/debian/control
@@ -475,7 +475,7 @@ Description: Gambas report component
 Package: gambas3-gb-sdl
 Architecture: any
 Section: libdevel
-Depends: ${misc:Depends}, ${shlibs:Depends}, gambas3-runtime (>= ${binary:Version})
+Depends: ${misc:Depends}, ${shlibs:Depends}, gambas3-runtime (>= ${binary:Version}), fonts-dejavu-core 
 Description: Gambas SDL component
  Gambas is a free development environment based on a Basic interpreter
  with object extensions, like Visual Basic(tm) (but it is NOT a clone!).
diff --git a/debian/gambas3-gb-sdl.dirs b/debian/gambas3-gb-sdl.dirs
new file mode 100644
index 0000000..0c1c7c2
--- /dev/null
+++ b/debian/gambas3-gb-sdl.dirs
@@ -0,0 +1 @@
+usr/share/gambas3/gb.sdl
diff --git a/debian/gambas3-gb-sdl.install b/debian/gambas3-gb-sdl.install
index 0142dbc..a0b2acc 100644
--- a/debian/gambas3-gb-sdl.install
+++ b/debian/gambas3-gb-sdl.install
@@ -1,6 +1,4 @@
 usr/lib/gambas3/gb.sdl.component
-usr/lib/gambas3/gb.sdl.so
-usr/lib/gambas3/gb.sdl.so.*
-usr/share/gambas3/gb.sdl
+usr/lib/gambas3/gb.sdl.so*
 usr/share/gambas3/info/gb.sdl.info
 usr/share/gambas3/info/gb.sdl.list
diff --git a/debian/gambas3-gb-sdl.links b/debian/gambas3-gb-sdl.links
new file mode 100644
index 0000000..d26c39c
--- /dev/null
+++ b/debian/gambas3-gb-sdl.links
@@ -0,0 +1 @@
+usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf usr/share/gambas3/gb.sdl/DejaVuSans.ttf

Attachment: signature.asc
Description: OpenPGP digital signature

_______________________________________________
Pkg-gambas-devel mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-gambas-devel

Reply via email to