Commit 60058c85 authored by Emmanuel Milou's avatar Emmanuel Milou
Browse files

Merge branch 'master' into release

parents fe277913 70875623
......@@ -2,7 +2,7 @@ Source: sflphone
Maintainer: SavoirFaireLinux Inc <emmanuel.milou@savoirfairelinux.com>
Section: gnome
Priority: optional
Build-Depends: debhelper (>= 5), autoconf, automake, libpulse-dev, libsamplerate0-dev, libcommoncpp2-dev, libccrtp-dev, dbus-c++-1-dev, libcppunit-dev, libgsm1-dev, libspeex-dev, sflphone-iax2-dev, libtool, libgtk2.0-dev, libsexy-dev, libdbus-1-dev, libdbus-glib-1-dev, libnotify-dev, libasound2-dev, libspeexdsp-dev
Build-Depends: debhelper (>= 5), autoconf, automake, libpulse-dev, libsamplerate0-dev, libcommoncpp2-dev, libccrtp-dev, dbus-c++-dev, libcppunit-dev, libgsm1-dev, libspeex-dev, sflphone-iax2-dev, libtool, libgtk2.0-dev, libsexy-dev, libdbus-1-dev, libdbus-glib-1-dev, libnotify-dev, libasound2-dev, libspeexdsp-dev
Standards-Version: 3.7.3
Package: sflphone
......
%define name sflphone
%define version 0.9.2
%define version 0.9.3
Autoreq: 0
Name: %name
Summary: A VoIP daemon with SIP protocol and IAX protocol
Version: %version
Release: 6fedora
Release: 2fedora
License: GPL
Group: System Environment/Daemons
URL: http://www.sflphone.org/
Packager: Yun Liu <yun.liu@savoirfairelinux.com>
Packager: Emmanuel Milou <emmanuel.milouu@savoirfairelinux.com>
Source0: %{name}-%{version}.tar.gz
Source1: libpj-sfl.pc
BuildRoot: %{_tmppath}/%{name}-%{version}
Requires: commoncpp2 ccrtp cppunit libsamplerate pulseaudio-libs-zeroconf pulseaudio-libs-devel gsm speex sflphone-iax2 dbus-c++ libgcc dbus-glib expat gtk2 glibc glib2 dbus-libs dbus-glib libsexy libnotify perl
%description
SFLPhoned is a VoIP daeamon with SIP protocol and IAX protocol.
SFLphoned is a VoIP daeamon with SIP protocol and IAX protocol.
%prep
%setup -q
cd libs/pjproject-1.0
cd libs/pjproject-1.0.1
./configure --prefix=/usr
make dep
make clean
......@@ -41,7 +41,7 @@ cd ..
cd sflphone-gtk/
%makeinstall
cd ../libs/pjproject-1.0
cd ../libs/pjproject-1.0.1
%makeinstall
cd ../..
cd %{buildroot}/usr/bin/
......@@ -69,6 +69,9 @@ rm -rf %{buildroot}
%changelog
* Mon Feb 16 2009 Emmanuel Milou <emmanuel.milou@savoirfairelinux.com> 2fedora
- Packaging 0.9.3-2 sflphone version on Fedora 10
* Mon Jan 26 2009 Yun Liu <yun.liu@savoirfairelinux.com> 6
- Packaging sflphone for Fedora 10
......
%define name sflphone
%define version 0.9.2
%define version 0.9.3
Autoreq: 0
Name: %name
Summary: A VoIP daemon with SIP protocol and IAX protocol
Version: %version
Release: 6suse
Release: 2suse
License: GPL
Group: System Environment/Daemons
URL: http://www.sflphone.org/
Packager: Yun Liu <yun.liu@savoirfairelinux.com>
Packager: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
Source0: %{name}-%{version}.tar.gz
Source1: libpj-sfl.pc
BuildRoot: %{_tmppath}/%{name}-%{version}
Requires: commoncpp2 ccrtp cppunit libsamplerate pulseaudio-libs-zeroconf pulseaudio-libs-devel gsm speex sflphone-iax2 dbus-c++ libgcc dbus-glib expat gtk2 glibc glib2 dbus-libs dbus-glib libsexy libnotify perl
%description
SFLPhoned is a VoIP daeamon with SIP protocol and IAX protocol.
SFLphoned is a VoIP daeamon with SIP protocol and IAX protocol.
%prep
%setup -q
cd libs/pjproject-1.0
cd libs/pjproject-1.0.1
./configure --prefix=/usr
make dep
make clean
......@@ -41,7 +41,7 @@ make prefix=%{buildroot}/usr install
cd sflphone-gtk/
make prefix=%{buildroot}/usr install
cd ../libs/pjproject-1.0
cd ../libs/pjproject-1.0.1
make prefix=%{buildroot}/usr install
cd ../..
......@@ -67,9 +67,10 @@ rm -rf %{buildroot}/usr/include
%clean
rm -rf %{buildroot}
%changelog
* Mon Feb 16 2009 Emmanuel Milou <emmanuel.milou@savoirfairelinux.com> 2suse
- Packaging 0.9.3-2 sflphone version on openSUSE 11
* Mon Jan 26 2009 Yun Liu <yun.liu@savoirfairelinux.com> 6suse
- Packaging sflphone on openSUSE 11
......
......@@ -9,6 +9,7 @@ include('include/header.php');
?>
<div id="content">
<div id="main-image">&nbsp;</div>
<ul class="gallery">
<?php
// $imageDirectory = "./img/gallery";
......@@ -22,7 +23,7 @@ include('include/header.php');
//<li><a href="img/gallery/<?php echo $file " title="Main Window"><img src="img/gallery/thumbs/<?php echo $file " alt="Main Window"></a></li>
//php endforeach;
$images = array(
array('assistant-1.png','File menu'),
array('assistant-1.png','File menu', 'state' => 'active'),
array('main-edit.png','Edit menu'),
array('main-view.png','View menu'),
array('main-help.png','Help menu'),
......@@ -46,7 +47,10 @@ include('include/header.php');
foreach($images as $image){
$fileName = $image[0];
$description = $image[1];
echo "<li><a href='img/gallery/$fileName' title='$description'><img src='img/gallery/thumbs/$fileName' alt='$description'></a></li>";
echo "<li ";
if($image['state'] != null)
echo 'class="active" > ';
echo "<a href='img/gallery/$fileName' title='$description'><img src='img/gallery/thumbs/$fileName' alt='$description'></a></li>";
}
?>
......@@ -67,7 +71,7 @@ include('include/header.php');
$('ul.gallery').galleria({
history : true, // activates the history object for bookmarking, back-button etc.
clickNext : true, // helper for making the image clickable
insert : '#main_image', // the containing selector for our main image
insert : '#main-image',
onImage : function(image,caption,thumb) { // let's add some image effects for demonstration purposes
// fade in the image & caption
......@@ -106,8 +110,9 @@ include('include/header.php');
)
}
});
});
});
//$('ul.gallery > li:first > img').click();
</script>
<?php
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment