From 876d2bc1eb4907fa27f93d6337dcff15db73c438 Mon Sep 17 00:00:00 2001 From: niels Date: Sat, 31 Jan 2015 21:56:40 +0100 Subject: [PATCH] update package build scripts --- veejay-current/veejay-server/debian/changelog | 4 +++- veejay-current/veejay-server/debian/control | 24 +++++++++---------- veejay-current/veejay-server/debian/copyright | 8 ++++++- veejay-current/veejay-server/debian/rules | 11 ++++----- veejay-current/veejay-server/veejay.spec.in | 6 ++--- 5 files changed, 28 insertions(+), 25 deletions(-) diff --git a/veejay-current/veejay-server/debian/changelog b/veejay-current/veejay-server/debian/changelog index cb235840..0a80d4f0 100644 --- a/veejay-current/veejay-server/debian/changelog +++ b/veejay-current/veejay-server/debian/changelog @@ -1,4 +1,6 @@ -veejay (1.5.9) unstable; urgency=low +veejay (1.5.47) unstable; urgency=low + + * 1.5.47 release * 1.5.9 release diff --git a/veejay-current/veejay-server/debian/control b/veejay-current/veejay-server/debian/control index 3eb48448..6db22b70 100644 --- a/veejay-current/veejay-server/debian/control +++ b/veejay-current/veejay-server/debian/control @@ -2,30 +2,28 @@ Source: veejay Section: video Priority: optional Maintainer: Niels Elburg +Standards-Version: 3.8.4 Build-Depends: debhelper, autotools-dev, - d-shlibs, - flex,bison, libavcodec-dev, libavformat-dev, libavutil-dev, - libdirectfb-dev, - libdv4-dev, libgtk2.0-dev, libjack-dev, - libjpeg62-dev, + libjpeg-dev, libsdl1.2-dev, libswscale-dev, libxml2-dev, - libx11-dev -Standards-Version: 3.8.4 -Homepage: http://www.veejayhq.net/ + libx11-dev, + libmjpegtools-dev, + libfreetype6-dev, + libquicktime-dev +Homepage: http://www.veejayhq.net/ Package: veejay Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, libveejay0 (>= ${source:Version}), - ffmpeg,jackd -Recommends: reloaded (>= 1.5.6) +Depends: ${shlibs:Depends}, ${misc:Depends}, libveejay (>= ${source:Version}) +Recommends: reloaded (>= 1.5.21) Suggests: veejay-utils, frei0r-plugins Description:Veejay a visual instrument and realtime video sampler. With veejay, you can play the video like you would play a piano. The @@ -61,9 +59,9 @@ Description: Veejay a visual instrument and realtime video sampler. model with multiple clients. . This package contains the debugging symbols. - . -Package: libveejay0 + +Package: libveejay Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} diff --git a/veejay-current/veejay-server/debian/copyright b/veejay-current/veejay-server/debian/copyright index 7a0146ad..d17445e9 100644 --- a/veejay-current/veejay-server/debian/copyright +++ b/veejay-current/veejay-server/debian/copyright @@ -1,12 +1,14 @@ This work was packaged for Debian by: + Niels Elburg , Jan. 2015 Jof Thibaut on Tue, 01 Feb 2011 22:48:10 +0100 + It was downloaded from http://www.veejayhq.net/ Upstream Author(s): - Niels Elburg + Niels Elburg Veejay contributors: Jeff Carpenter @@ -53,4 +55,8 @@ The Debian packaging is: and is licensed under the GPL version 3, see `/usr/share/common-licenses/GPL-3'. + Copyright (C) 2015 Niels Elburg + and is licensed under the GPL version 3, + see `/usr/share/common-licenses/GPL-3'. + diff --git a/veejay-current/veejay-server/debian/rules b/veejay-current/veejay-server/debian/rules index 2e51487c..bf1fd7dd 100755 --- a/veejay-current/veejay-server/debian/rules +++ b/veejay-current/veejay-server/debian/rules @@ -1,21 +1,18 @@ #!/usr/bin/make -f # -*- makefile -*- -export PKG_CONFIG_PATH=/usr/lib/pkgconfig - -%: dh $@ override_dh_auto_configure: ifeq ($(DEB_HOST_ARCH),i386) - dh_auto_configure -- --enable-debug + sh autogen.sh + dh_auto_configure -- -with-arch-target=generic sed -i "s%#define HAVE_ASM_3DNOW%/* #undef HAVE_ASM_3DNOW */%g" config.h - sed -i "s%#define HAVE_ASM_MMX2%/* #undef HAVE_ASM_MMX2 */%g" config.h - sed -i "s%#define HAVE_ASM_SSE2%/* #undef HAVE_ASM_SSE2 */%g" config.h sed -i "s%#define HAVE_CMOV%/* #undef HAVE_CMOV */%g" config.h endif ifeq ($(DEB_HOST_ARCH),amd64) - dh_auto_configure -- --enable-debug + sh autogen.sh + dh_auto_configure -- --with-arch-target=generic sed -i "s%#define HAVE_ASM_3DNOW%/* #undef HAVE_ASM_3DNOW */%g" config.h endif diff --git a/veejay-current/veejay-server/veejay.spec.in b/veejay-current/veejay-server/veejay.spec.in index f3794bc5..44e57faf 100644 --- a/veejay-current/veejay-server/veejay.spec.in +++ b/veejay-current/veejay-server/veejay.spec.in @@ -2,7 +2,7 @@ # neededforbuild update-desktop-files gtk2-devel-packages glib2 gtk2 libglade3 libdv libxml2 jack DirectFB SDL libjpeg freetype2 gtk2-devel glib2-devel libglade-devel libxml2-devel jack-devel pkgconfig SDL-devel libjpeg-devel freetype2-devel valgrind alsa-devel alsa slang-devel slang libstdc++-devel libstdc++ zlib-devel zlib %define name veejay -%define version 1.3 +%define version 1.5 %define release stable %define prefix /usr @@ -80,8 +80,7 @@ CXXFLAGS="$RPM_OPT_FLAGS" \ ./configure \ --prefix=%{prefix} \ --mandir=%{_mandir} \ - --with-gveejayreloaded \ - --with-swscaler + --with-arch-target=generic %build # Setup for parallel builds @@ -118,6 +117,7 @@ rm -f %{buildroot}%{_libdir}/lib*.la %{_mandir}/man1/* %changelog -n veejay +* Jan 2015 - update build (niels) * Wed Mar 21 2007 - cleanup * Sat Nov 20 2005 - bla * Sat Apr 23 2005 - oc2pus@arcor.de 0.8-0.oc2pus.1