r17156 - in /desktop/experimental/ekiga/debian: ./ patches/
dedu-guest at users.alioth.debian.org
dedu-guest at users.alioth.debian.org
Sat Sep 27 09:24:58 UTC 2008
Author: dedu-guest
Date: Sat Sep 27 09:24:57 2008
New Revision: 17156
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=17156
Log:
* New version. (Closes: #500089).
* Discover new interfaces. (Closes: #488199).
* Compile with dbus support. (Closes: #467212).
* Numeric keypad inserts digits at correct position. (Closes: #440159).
* Use libnotify upon call. (Closes: #412604).
Added:
desktop/experimental/ekiga/debian/ekiga.menu (with props)
desktop/experimental/ekiga/debian/patches/windowclosing.dpatch
Removed:
desktop/experimental/ekiga/debian/ekiga.docs
desktop/experimental/ekiga/debian/ekiga.manpages
desktop/experimental/ekiga/debian/patches/10_relibtoolize.dpatch
desktop/experimental/ekiga/debian/patches/gnome-free-gdu.dpatch
desktop/experimental/ekiga/debian/patches/lib64.dpatch
desktop/experimental/ekiga/debian/patches/recvers.dpatch
Modified:
desktop/experimental/ekiga/debian/README.Debian
desktop/experimental/ekiga/debian/changelog
desktop/experimental/ekiga/debian/control
desktop/experimental/ekiga/debian/copyright
desktop/experimental/ekiga/debian/ekiga.xpm
desktop/experimental/ekiga/debian/patches/00list
desktop/experimental/ekiga/debian/rules
Modified: desktop/experimental/ekiga/debian/README.Debian
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/ekiga/debian/README.Debian?rev=17156&op=diff
==============================================================================
--- desktop/experimental/ekiga/debian/README.Debian (original)
+++ desktop/experimental/ekiga/debian/README.Debian Sat Sep 27 09:24:57 2008
@@ -1,22 +1,3 @@
-Ekiga and OSS
-==========================
+See http://www.ekiga.org for help.
- Though Ekiga is supposed to work with OSS, it has a lot of issues
- because of the faulty drivers OSS has. The only place that it's recommended
- the use of OSS over ALSA is if you own a SBLive! card.
-
- If not, we encourage you to install ALSA support. For that, you need to
- install 'alsa-base', 'alsa-oss' and, if you have a 2.4 kernel,
- the 'alsa-modules-$kernelversion' that matches with your kernel.
- You need also to make sure that 'libpt-plugins-alsa' package is
- installed in your system.
-
- Beware that installing ALSA is not a trivial task, and you need to know
- a bit how your kernel modules are loaded. Please, read alsa-base package
- documentation after installing it to know how to enable ALSA in your system.
- If you are using GNOME, you will probably want to install also 'libesd-alsa0'
- and 'gstreamer0.8-alsa' packages, and enable 'alsasink' in gstreamer
- configuration (Apps->Desktop Preferences->Advanced->Multimedia System Selector'
-
-Jose Carlos Garcia Sogo <jsogo at debian.org>
-
+You can also refer to irc.gimp.net channel #ekiga for support.
Modified: desktop/experimental/ekiga/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/ekiga/debian/changelog?rev=17156&op=diff
==============================================================================
--- desktop/experimental/ekiga/debian/changelog (original)
+++ desktop/experimental/ekiga/debian/changelog Sat Sep 27 09:24:57 2008
@@ -1,3 +1,13 @@
+ekiga (3.0.0-1) experimental; urgency=low
+
+ * New version. (Closes: #500089).
+ * Discover new interfaces. (Closes: #488199).
+ * Compile with dbus support. (Closes: #467212).
+ * Numeric keypad inserts digits at correct position. (Closes: #440159).
+ * Use libnotify upon call. (Closes: #412604).
+
+ -- Eugen Dedu <Eugen.Dedu at pu-pm.univ-fcomte.fr> Sat, 27 Sep 2008 10:00:00 +0200
+
ekiga (2.0.12-1+nmu1) unstable; urgency=low
* Non-maintainer upload.
Modified: desktop/experimental/ekiga/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/ekiga/debian/control?rev=17156&op=diff
==============================================================================
--- desktop/experimental/ekiga/debian/control (original)
+++ desktop/experimental/ekiga/debian/control Sat Sep 27 09:24:57 2008
@@ -2,16 +2,17 @@
Section: gnome
Priority: optional
Maintainer: Kilian Krause <kilian at debian.org>
-Uploaders: Jose Carlos Garcia Sogo <jsogo at debian.org>, Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Josselin Mouette <joss at debian.org>, Loic Minier <lool at dooz.org>
+Uploaders: Jose Carlos Garcia Sogo <jsogo at debian.org>, Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Josselin Mouette <joss at debian.org>, Loic Minier <lool at dooz.org>, Eugen Dedu <Eugen.Dedu at pu-pm.univ-fcomte.fr>
Build-Depends: debhelper (>= 5),
+ libsasl2-dev,
gettext,
libgnome2-dev,
libldap2-dev,
- libpt-dev (>= 1.10.10~),
- libopal-dev (>= 2.2.11~),
+ libpt2.4.1-dev,
+ libopal3.4.1-dev,
libgconf2-dev,
libgnomeui-dev,
- libsdl1.2-dev,
+ libxv-dev,
dpatch,
autotools-dev,
gnome-pkg-tools,
@@ -22,17 +23,26 @@
gnome-doc-utils,
libavahi-client-dev (>= 0.6.0),
libavahi-glib-dev (>= 0.6.0),
+ libsigc++-2.0-dev,
+ libgtk2.0-dev (>= 2.12),
+ libdbus-glib-1-dev,
+ gnome-common,
+ libnotify-dev,
libebook1.2-dev,
- gnome-common,
- automake1.9,
+ automake,
autoconf
Standards-Version: 3.8.0
+Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/desktop/experimental/ekiga
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/ekiga/
+Homepage: http://www.ekiga.org
Package: ekiga
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends},
- evolution-data-server
+ evolution-data-server,
+ libpt2.4.1-plugins-alsa | libpt2.4.1-plugins-oss,
+ libpt2.4.1-plugins-v4l2 | libpt2.4.1-plugins-v4l | libpt2.4.1-plugins-avc | libpt2.4.1-plugins-dc
Recommends: yelp
Suggests: siproxd,
gnugk,
@@ -48,13 +58,15 @@
that allows you to make audio and video calls to remote users with H.323
hardware or software (such as Microsoft Netmeeting) as well as SIP endpoints.
.
- It supports all modern videoconferencing features, such as registering
- to an LDAP directory, gatekeeper support, making multi-user conference
- calls using an external MCU, using modern Quicknet telephony cards,
- and making PC-To-Phone calls.
+ It supports all modern videoconferencing features, such as contact roster,
+ presence status, high-quality audio and video codecs, various video
+ resolutions, registering to an LDAP directory, gatekeeper support,
+ making multi-user conference calls using an external MCU, using modern
+ Quicknet telephony cards, and making PC-To-Phone calls.
Package: ekiga-dbg
Priority: extra
+Section: devel
Architecture: any
Depends: ekiga (= ${binary:Version})
Suggests: libc6-dbg
@@ -62,11 +74,6 @@
H.323 and SIP compatible videoconferencing and VoIP/IP-Telephony application
that allows you to make audio and video calls to remote users with H.323
hardware or software (such as Microsoft Netmeeting) as well as SIP endpoints.
- .
- It supports all modern videoconferencing features, such as registering
- to an LDAP directory, gatekeeper support, making multi-user conference
- calls using an external MCU, using modern Quicknet telephony cards,
- and making PC-To-Phone calls.
.
This package contains the debugging symbols for Ekiga.
Modified: desktop/experimental/ekiga/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/ekiga/debian/copyright?rev=17156&op=diff
==============================================================================
--- desktop/experimental/ekiga/debian/copyright (original)
+++ desktop/experimental/ekiga/debian/copyright Sat Sep 27 09:24:57 2008
@@ -1,5 +1,7 @@
This package was debianized by Sander Smeenk <ssmeenk at debian.org> on
-Fri, 24 Jan 2003 19:27:09 +0100
+Fri, 24 Jan 2003 19:27:09 +0100. Since then, it was enhanced by
+Kilian Krause <kk at verfaction.de>. Finally, it was enhanced by Eugen
+Dedu <Eugen.Dedu at pu-pm.univ-fcomte.fr>, who actually maintains it.
It was downloaded from http://www.ekiga.org/
@@ -14,10 +16,11 @@
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
+ (at your option) any later version, which are available in
+ /usr/share/common-licenses on Debian systems.
An exemption is provided by upstream to allow linking this program with
- OPAL and PWLib libraries, both covered by a MPL license.
+ OPAL and PTLib libraries, both covered by a MPL license.
Additionally the following parts are covered by LGPL:
lib/about, lib/druid, lib/gui/gmtray
@@ -27,8 +30,8 @@
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
- You should have received a copy of both the GNU General Public License
- and GNU Library General Public License with the Debian GNU/Linux distribution
- in directory /usr/share/common-licenses; if not, write to the Free
- Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
- MA 02110-1301, USA.
+ You should have received a copy of both the GNU General Public
+ License and GNU Library General Public License with the Debian
+ GNU/Linux distribution in directory /usr/share/common-licenses; if
+ not, write to the Free Software Foundation, Inc., 51 Franklin St,
+ Fifth Floor, Boston, MA 02110-1301, USA.
Added: desktop/experimental/ekiga/debian/ekiga.menu
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/ekiga/debian/ekiga.menu?rev=17156&op=file
==============================================================================
--- desktop/experimental/ekiga/debian/ekiga.menu (added)
+++ desktop/experimental/ekiga/debian/ekiga.menu Sat Sep 27 09:24:57 2008
@@ -1,0 +1,8 @@
+?package(ekiga): \
+ needs="X11" \
+ section="Applications/Network/Communication" \
+ title="Ekiga" \
+ longtitle="Ekiga: Free Your Speech" \
+ description="The Ekiga Voice Over IP Suite" \
+ command="/usr/bin/ekiga" \
+ icon="/usr/share/pixmaps/ekiga.xpm"
Propchange: desktop/experimental/ekiga/debian/ekiga.menu
------------------------------------------------------------------------------
svn:mergeinfo =
Modified: desktop/experimental/ekiga/debian/ekiga.xpm
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/ekiga/debian/ekiga.xpm?rev=17156&op=diff
==============================================================================
--- desktop/experimental/ekiga/debian/ekiga.xpm (original)
+++ desktop/experimental/ekiga/debian/ekiga.xpm Sat Sep 27 09:24:57 2008
@@ -1,204 +1,216 @@
/* XPM */
static char *ekiga[] = {
/* columns rows colors chars-per-pixel */
-"32 32 166 2",
-" c #C8E736D500E5",
-". c #CB6D3D3300E6",
-"X c #CDD043EA016A",
-"o c #CFA049A001EA",
-"O c #D14445380008",
-"+ c #D26C4CE400E9",
-"@ c #D8C44EEC0000",
-"# c #D4CF53EA01AD",
-"$ c #DA8255230014",
-"% c #D69D5AF80174",
-"& c #D97F5D6C010F",
-"* c #D2A25B0D0CA2",
-"= c #D7E45E0A12F9",
-"- c #D73E63770132",
-"; c #DB9963BF0132",
-": c #DCBB6BEA01CC",
-"> c #D49562160C35",
-", c #DD91721500FA",
-"< c #DE4C7BF90028",
-"1 c #DF8E740509AF",
-"2 c #D50B678C11F8",
-"3 c #D9E1641E11F5",
-"4 c #D6936B811189",
-"5 c #DB356C3D136C",
-"6 c #DD9173DF125E",
-"7 c #DEDC79021747",
-"8 c #E22465630018",
-"9 c #E2556AB1006B",
-"0 c #E25773EC01C2",
-"q c #EA74752C0004",
-"w c #E4367BE302A4",
-"e c #ED347CFB0031",
-"r c #E1EF7B120A7D",
-"t c #DA8D68E3228D",
-"y c #DB166AF92851",
-"u c #DD3379E0246F",
-"i c #E02081CC003C",
-"p c #DF088A141F02",
-"a c #E68B840D02C9",
-"s c #ECF384FC013F",
-"d c #E5738C350065",
-"f c #EA9B8C230385",
-"g c #E4DF85A70B87",
-"h c #E66989BD0D3F",
-"j c #E8B48CAB08EB",
-"k c #F2C98581000C",
-"l c #F2C88B8C00D5",
-"z c #ED2594C90391",
-"x c #ED9F9C380318",
-"c c #F29594410233",
-"v c #F2DA9D9C0455",
-"b c #F21798C00D69",
-"n c #E6578EBA1593",
-"m c #E21E85411B5E",
-"M c #E61E95A11E72",
-"N c #E7D099B31F9A",
-"B c #E93D9E891BDE",
-"V c #EE6EA449010C",
-"C c #EE80AB290000",
-"Z c #ED3EA1860DFC",
-"A c #F36BA39B04EA",
-"S c #F568ABAC052E",
-"D c #F909AD9F04DC",
-"F c #F4F4A4630C52",
-"G c #F409ACCF092A",
-"H c #F640B1BA04E0",
-"J c #F915B52205E7",
-"K c #F47CBB8E0034",
-"L c #FAACBB200646",
-"P c #F695B3FA0ABA",
-"I c #F757B9D20C23",
-"U c #EAAAA3851E4B",
-"Y c #F751AE3F10EB",
-"T c #F2EBB12A0FCB",
-"R c #F3C3BC3515B6",
-"E c #F43FB039179C",
-"W c #DB6587722380",
-"Q c #DD1592A52CF5",
-"! c #DF27995B2C94",
-"~ c #E3828DEE2134",
-"^ c #E55D947923A0",
-"/ c #E50299E22DEE",
-"( c #E34E95CE33BE",
-") c #E5CF9EEA345B",
-"_ c #E291966739EA",
-"` c #E5279DCC38D6",
-"' c #EB87AA4122F5",
-"] c #E85AA4242C07",
-"[ c #E989A8AC2D32",
-"{ c #F438AE5920B0",
-"} c #E57DA46032B4",
-"| c #E50EAB283B66",
-" . c #EB04B57036BD",
-".. c #E4FFB9553C9D",
-"X. c #ECBBBE333C73",
-"o. c #F754C3C70037",
-"O. c #FD99C3FB0695",
-"+. c #FA11CA7700DE",
-"@. c #FD7AC45607E5",
-"#. c #FD26C8F40C93",
-"$. c #FC32D5110008",
-"%. c #FE9ADC810015",
-"&. c #F686C3BF16C3",
-"*. c #FB40C6410FAF",
-"=. c #FC5DCCD31173",
-"-. c #F441C9171EB6",
-";. c #FFF3E1FE0000",
-":. c #F3DBCDDE229C",
-">. c #F7E5C8192B32",
-",. c #F48FD5D523F3",
-"<. c #F943D1872643",
-"1. c #F450DB6B2725",
-"2. c #F250D6F22E12",
-"3. c #E693C2D63DFE",
-"4. c #EA5AC5733A8B",
-"5. c #F33DC0B73096",
-"6. c #F216E01A3A49",
-"7. c #E2B794EA409D",
-"8. c #E3938CC04FD1",
-"9. c #E8E6AF7F454B",
-"0. c #E9CEB367419D",
-"q. c #EBD4BC9E43A4",
-"w. c #E9A4B64547F2",
-"e. c #E9C2B7E350C3",
-"r. c #EB30BFA357D5",
-"t. c #EACAB55E6BF5",
-"y. c #E976A54F7291",
-"u. c #E9D7A7467D0B",
-"i. c #E6F0C22A4202",
-"p. c #EE9BC811418B",
-"a. c #EC23CEF647AB",
-"s. c #EC62C27C49CB",
-"d. c #EC5ACB3A4D44",
-"f. c #ED65D0B3473A",
-"g. c #EDF2D8324F3C",
-"h. c #ED85D9F84C44",
-"j. c #F713DF4E4350",
-"k. c #F469DEAC4AB3",
-"l. c #EC9BC39A5060",
-"z. c #EDC1CDB351F8",
-"x. c #EC66C6C65E2D",
-"c. c #EF73D2BA5687",
-"v. c #F068DE1051F6",
-"b. c #EF6AD5C05B0C",
-"n. c #F001DCB75889",
-"m. c #F395E0335403",
-"M. c #F356EE774AF1",
-"N. c #F10AF3025E65",
-"B. c #EC2DC63E66FC",
-"V. c #ED55CEAB6954",
-"C. c #EE80D38F629D",
-"Z. c #F018DC2F6677",
-"A. c #EF77D708695E",
-"S. c #EFD1DA6D780A",
-"D. c #F0C5DF7F7ACC",
-"F. c #F50CE2B36543",
-"G. c #F1CFE5E46C43",
-"H. c #F17DE7A8752E",
-"J. c #F211E9717A5A",
-"K. c #F386F63D738D",
-"L. c #F458F70A7B54",
-"P. c #F4D5FB4A7EE9",
-"I. c #F03DCA4296B0",
-"U. c #F534FDD683D0",
-"Y. c #F840E384D3AD",
-"T. c None",
+"32 32 178 2",
+" c #A04700",
+". c #A14800",
+"X c #CC4101",
+"o c #CF4802",
+"O c #CE4908",
+"+ c #D04601",
+"@ c #D14B02",
+"# c #C35901",
+"$ c #CE5D00",
+"% c #D45403",
+"& c #D05E01",
+"* c #DA5D04",
+"= c #D3570C",
+"- c #D16202",
+"; c #DC6305",
+": c #D56A07",
+"> c #DD6A03",
+", c #D66E0A",
+"< c #D7720C",
+"1 c #DA750C",
+"2 c #D97A0F",
+"3 c #DD6F11",
+"4 c #E06000",
+"5 c #E96700",
+"6 c #E36E01",
+"7 c #EC6F00",
+"8 c #E47402",
+"9 c #ED7600",
+"0 c #E67A04",
+"q c #EA7D05",
+"w c #E47608",
+"e c #E67C0A",
+"r c #E97D0A",
+"t c #F17700",
+"y c #F47900",
+"u c #D86B24",
+"i c #DB742C",
+"p c #DD7B2F",
+"a c #E58202",
+"s c #EB8207",
+"d c #EA8C02",
+"f c #E6860D",
+"g c #EB8409",
+"h c #ED890A",
+"j c #F28305",
+"k c #F18C0C",
+"l c #EC9601",
+"z c #EA900D",
+"x c #F09E04",
+"c c #F3940E",
+"v c #F29C0B",
+"b c #E78317",
+"n c #EB8C15",
+"m c #E6851E",
+"M c #EA8C1F",
+"N c #EE9014",
+"B c #EE9910",
+"V c #E6951B",
+"C c #EE931E",
+"Z c #EE9E1B",
+"A c #F59714",
+"S c #F69B11",
+"D c #F39619",
+"F c #F1A203",
+"G c #F4A10B",
+"H c #F8AE0C",
+"J c #F5B701",
+"K c #F5BC01",
+"L c #F6B008",
+"P c #F9B30B",
+"I c #FBBF08",
+"U c #F6A215",
+"Y c #F9A214",
+"T c #F7A519",
+"R c #F5AA1B",
+"E c #F9AB1C",
+"W c #F7B114",
+"Q c #EA8E23",
+"! c #EC9422",
+"~ c #EF9921",
+"^ c #EE9A2C",
+"/ c #F29825",
+"( c #F39D2C",
+") c #E08539",
+"_ c #E99332",
+"` c #EB9836",
+"' c #EA9B3D",
+"] c #EAA424",
+"[ c #EEA925",
+"{ c #EEA428",
+"} c #EDAD29",
+"| c #F7A225",
+" . c #F0AC26",
+".. c #F4A42C",
+"X. c #F9AB2C",
+"o. c #EFB02B",
+"O. c #FAB323",
+"+. c #FBB827",
+"@. c #F1B42D",
+"#. c #FAB129",
+"$. c #F5BC2C",
+"%. c #FABA2A",
+"&. c #EEA13B",
+"*. c #F7A432",
+"=. c #F7AB33",
+"-. c #F9AA37",
+";. c #F0A63A",
+":. c #F3AF3F",
+">. c #FBAD3B",
+",. c #F5B433",
+"<. c #FAB536",
+"1. c #F2BF35",
+"2. c #FAB932",
+"3. c #F9B63C",
+"4. c #FABC3E",
+"5. c #F7C400",
+"6. c #FACC01",
+"7. c #FCD401",
+"8. c #FEDD00",
+"9. c #FFE000",
+"0. c #FAC22D",
+"q. c #F4C235",
+"w. c #FBC633",
+"e. c #FAC834",
+"r. c #F6C23B",
+"t. c #FAC13C",
+"y. c #F6CB3B",
+"u. c #FACE3B",
+"i. c #F7D13F",
+"p. c #F9D03F",
+"a. c #EC9F41",
+"s. c #EDA242",
+"d. c #EDA348",
+"f. c #EFAB4C",
+"g. c #F1AC44",
+"h. c #F2B34E",
+"j. c #EBAB57",
+"k. c #EEB45F",
+"l. c #F1B151",
+"z. c #EFB964",
+"x. c #F7CD40",
+"c. c #FACD43",
+"v. c #FAC848",
+"b. c #FBD445",
+"n. c #F9DB44",
+"m. c #FBD848",
+"M. c #F7CA55",
+"N. c #FBD655",
+"B. c #FBE24A",
+"V. c #FEE556",
+"C. c #FEE85D",
+"Z. c #F6C363",
+"A. c #F4C86E",
+"S. c #F5C671",
+"D. c #F8D275",
+"F. c #FADD75",
+"G. c #FAD77C",
+"H. c #FBDC7D",
+"J. c #FDEB7A",
+"K. c #F6CF81",
+"L. c #F7D383",
+"P. c #FADC85",
+"I. c #F7D389",
+"U. c #FADF9A",
+"Y. c #FCE585",
+"T. c #FEEC87",
+"R. c #FCE58C",
+"E. c #FDEB8E",
+"W. c #FDEE95",
+"Q. c #FAE29E",
+"!. c #FDEB9C",
+"~. c #FDEDA7",
+"^. c #FDEEAC",
+"/. c #FEF2A2",
+"(. c #FEF2AD",
+"). c #FDF0B1",
+"_. c #FCF4C0",
+"`. c None",
/* pixels */
-"T.T.T.T.T.T.T.T.T.T.T.T.0 w w a a f f z T.T.T.T.T.T.T.T.T.T.T.T.",
-"T.T.T.T.T.T.T.T.T.: : , 0 w a f f f f z z x v T.T.T.T.T.T.T.T.T.",
-"T.T.T.T.T.T.T.T.; : 0 d V K +.+.V < a V z x A A T.T.T.T.T.T.T.T.",
-"T.T.T.T.T.T.& & : d K $.;.;.;.K < , C C < d V A S S T.T.T.T.T.T.",
-"T.T.T.T.T.% & , S %.;.;.;.;.$.d : x K < : , d H S S H T.T.T.T.T.",
-"T.T.T.T.# # , K ;.;.%.$.o.H z % - C d : , , , K +.H H J T.T.T.T.",
-"T.T.T.# # : K ;.%.o.x a w w ; . % , # % : , : x %.+.H J L T.T.T.",
-"T.T.T.+ & S ;.$.x 0 : , 0 w ; X ; & X o # - : d %.%.L J L L T.T.",
-"T.T.+ + d %.+.a ; : : r r w w ; : # X o o # % i $.%.o.J L L T.T.",
-"T.O + & o.+.w & ; : 1 q.] w w a a ; o o o + + - H L J J L L O.T.",
-"T.O + a $.d & ; ; : m G.q.w w a a a % o o + + - A S H J L L L T.",
-"T.O + V V & & ; ; ; ^ L.d.w w a a f : o o + + ; A S H J L D L T.",
-"O O # C , # & ; ; ; } P.c.w w a a f : o o + + : A S H J L S J @.",
-"O O ; d & _ ( ; ; : 0.G.b.g w a j f : o o + + , A S H J L A D @.",
-"O O ; : 5 D.D.7 ; 1 b.s.b.n w B g.U - o 2 4 # w S S H J L A S @.",
-"O O & & u S.V.` ; ~ Z.^ c.N h a.v.4.# # i.h.4 f S S P J J F A @.",
-"O O # = 7.B.( r.: ) l.r z.[ .p.' g.* 2 a.3.4.Z R :.,.,.&.{ Y O.",
-"O O + t I.t.5 x.m | 0.0 s.d.n.U j f.Q W ..> 4.6.2.-.&.1.M.F.>. at .",
-"O + + y Y.y.& e.9.w.} 0 q.K.X.a w p d.i.} + g T G S D I k.U.j.=.",
-"O + $ = u.8.& ( A.C.~ 0 M .g a 0 + | N.! # f A S S H P 5.m.<.#.",
-"T.+ ; # t 3 & 6 J.H.r 0 0 w w w % X * ! 4 : x A S S D v b E *.T.",
-"T.O 8 8 % % & ; ) / : : , w 0 - X X o o + a A A S S v l k S @.T.",
-"T.O $ q ; % & ; ; ; + . % & X X X X o o - z A A S v l k l J O.T.",
-"T.T.+ 9 e 9 & ; ; & . . - + . X X X o + w x A A v l k k A L T.T.",
-"T.T.T.# q k 0 ; ; # X ; X . X X X o % f x v c k k k c J T.T.T.",
-"T.T.T.+ & e k e 0 # o ; X . X X X o , z z l k k k l D L T.T.T.",
-"T.T.T.T.# ; e k k ; . + ; . . X X X ; s l k k k k l S J T.T.T.T.",
-"T.T.T.T.T.% ; q k q O $ 9 O X X O $ e k k k k k l A H T.T.T.T.T.",
-"T.T.T.T.T.T.& ; 0 e 8 & q @ @ $ 8 e k k k k l c A S T.T.T.T.T.T.",
-"T.T.T.T.T.T.T.T.; 9 q e e q q e k k k k l c v A T.T.T.T.T.T.T.T.",
-"T.T.T.T.T.T.T.T.T.: : 0 w e s s s s f f z x A T.T.T.T.T.T.T.T.T.",
-"T.T.T.T.T.T.T.T.T.T.T.T.0 w w a a f f z T.T.T.T.T.T.T.T.T.T.T.T."
+"`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.",
+"`.`.`.`.`.`.`.`.`.`.`.`.$ - $ $ $ $ - & `.`.`.`.`.`.`.`.`.`.`.`.",
+"`.`.`.`.`.`.`.`.`.`.$ 1 ] y.n.B.B.n.y.} 2 & `.`.`.`.`.`.`.`.`.`.",
+"`.`.`.`.`.`.`.`.& : q.n.$.Z B v v U R q.n.y.< & `.`.`.`.`.`.`.`.",
+"`.`.`.`.`.`.`.$ V n. .d J 7.9.8.K 5.8.6.L $.B.[ & `.`.`.`.`.`.`.",
+"`.`.`.`.`.`.: 1.i.z J 8.9.9.8.> X 0 9.5.7.7.W n.y.: `.`.`.`.`.`.",
+"`.`.`.`.`.$ 1. at .d 7.7.J F x a X @ K K o % 6.8.P e.y.- `.`.`.`.`.",
+"`.`.`.`.& V i.a 6.l 0 0 q s > X > h o X X a 9.9.P n.[ - `.`.`.`.",
+"`.`.`.`., n.f J 0 8 0 0 q s 0 X s e X X X * 8.9.I E B.1 `.`.`.`.",
+"`.`.`.$ q.[ l 0 8 8 0 g ;.s g q h ; X X X X G H S Y 0.u.& `.`.`.",
+"`.`.`.< n.8 d 8 8 8 0 h./.^ g g h g.) X X X k S S Y Y n.2 `.`.`.",
+"`.`.$ ] @.a ` a.8 8 0 P.R.g.g g h Y.R.X X X c U S Y Y e.o.$ `.`.",
+"`.`.$ q.n 0 U.^.e 8 ! !.h.Z.g g h W.D.i X @ S U E Y Y O.p.- `.`.",
+"`.`.$ x.e w ).K.s.Q !.g.^ G.g g N E.' k.X 3 S R O.E E %.b.- `.`.",
+"`.`.$ b.8 m Q.' L.f.Z.0 f !.g g C Y.= R.O f.N.2.u.e.w.O.m.& `.`.",
+"`.`.$ b.8 _ I.8 ~.S.l.0 q R.! Z.:.H.X z.j.F.v.C./.J.u.E b.& `.`.",
+"`.`.$ r.e m d.8 S.(.&.0 q D.G.P.W.A.X p T.M.%.V._.W.w.+.c.- `.`.",
+"`.`.$ ,.n 6 6 8 ` (.Q 0 q h./.~ ;.u X X k.,.+.T b.b.+.O.t.- `.`.",
+"`.`.$ ! ..6 6 8 8 e 0 0 q s n g ; X X X 6 c S S +.%.O.2.{ & `.`.",
+"`.`.`., 4.8 9 y t 8 0 ; o 8 0 % X X X X h c S T S E Y t.2 `.`.`.",
+"`.`.`.$ ..~ 9 y y t 0 o X s ; X X X X % c c S S S c #.<.& `.`.`.",
+"`.`.`.`.: 3.r y y y 9 X % s % X X X X w c c S S c U 4.1 `.`.`.`.",
+"`.`.`.`.& b =.9 y y y + @ s % X X X ; c c c S c c <.~ - `.`.`.`.",
+"`.`.`.`.`.$ ( / 9 y y 5 + t * X X * k c c c k c X.=.$ `.`.`.`.`.",
+"`.`.`.`.`.`.- ( *.r y y y y 7 4 6 j j j j j A -...: `.`.`.`.`.`.",
+"`.`.`.`.`.`.`.$ b -.C 9 y y y y y y y j k | >.C $ `.`.`.`.`.`.`.",
+"`.`.`.`.`.`.`.`.$ : ( -./ n g s g k D | -..., $ `.`.`.`.`.`.`.`.",
+"`.`.`.`.`.`.`.`.`.`.$ , M *.-.>.>.-.*.! < $ `.`.`.`.`.`.`.`.`.`.",
+"`.`.`.`.`.`.`.`.`.`.`.`.. # # $ $ # # `.`.`.`.`.`.`.`.`.`.`.`.",
+"`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.",
+"`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.",
+"`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`."
};
Modified: desktop/experimental/ekiga/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/ekiga/debian/patches/00list?rev=17156&op=diff
==============================================================================
--- desktop/experimental/ekiga/debian/patches/00list (original)
+++ desktop/experimental/ekiga/debian/patches/00list Sat Sep 27 09:24:57 2008
@@ -1,3 +1,1 @@
-#10_relibtoolize
-#recvers
-lib64
+windowclosing
Added: desktop/experimental/ekiga/debian/patches/windowclosing.dpatch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/ekiga/debian/patches/windowclosing.dpatch?rev=17156&op=file
==============================================================================
--- desktop/experimental/ekiga/debian/patches/windowclosing.dpatch (added)
+++ desktop/experimental/ekiga/debian/patches/windowclosing.dpatch Sat Sep 27 09:24:57 2008
@@ -1,0 +1,175 @@
+#! /bin/sh -e
+## windowclosing.dpatch by Eugen Dedu
+##
+## DP: Fix window closing, patch applied upstream right after 3.0.0
+## (so it must be removed after 3.0.0)
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
+
+if [ $# -ne 1 ]; then
+ echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+ exit 1
+fi
+
+case "$1" in
+ -patch) patch $patch_opts -p1 < $0;;
+ -unpatch) patch $patch_opts -p1 -R < $0;;
+ *)
+ echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+ exit 1;;
+esac
+
+exit 0
+ at DPATCH@
+--- ekiga-3.0.0/src/gui/main.cpp 2008-09-22 22:56:39.000000000 +0200
++++ ekiga-3.0.1/src/gui/main.cpp 2008-09-23 20:39:44.000000000 +0200
+@@ -2848,10 +2848,10 @@
+ statusicon = GTK_STATUS_ICON (GnomeMeeting::Process ()->GetStatusicon ());
+ mw = gm_mw_get_mw (GTK_WIDGET (main_window));
+
++ /* Hide in any case, but quit program when we don't have a status menu */
++ gtk_widget_hide (GTK_WIDGET (data));
+ if (!gtk_status_icon_is_embedded (GTK_STATUS_ICON (statusicon)))
+ quit_callback (NULL, data);
+- else
+- gtk_widget_hide (GTK_WIDGET (data));
+
+ return (TRUE);
+ }
+@@ -4039,6 +4039,7 @@
+
+ /* The Top-level window */
+ window = gm_window_new_with_key (USER_INTERFACE_KEY "main_window");
++ gm_window_set_hide_on_delete (GM_WINDOW (window), FALSE);
+ gtk_window_set_title (GTK_WINDOW (window),
+ _("Ekiga"));
+
+--- ekiga-3.0.0/lib/gui/gmwindow.h 2008-09-22 22:56:51.000000000 +0200
++++ ekiga-3.0.1/lib/gui/gmwindow.h 2008-09-23 20:22:44.000000000 +0200
+@@ -114,6 +114,18 @@
+ int *x,
+ int *y);
+
++/** Set if the GmWindow should hide on a delete-event or just relay the event
++ * @param window is the GmWindow
++ * @param hode_on_delete TRUE to just hide, FALSE to relay
++ */
++void gm_window_set_hide_on_delete (GmWindow *window,
++ gboolean hide_on_delete);
++
++/** Check if the GmWindow will hide or event-relay on a delete-event
++ * @param window is the GmWindow
++ */
++gboolean gm_window_get_hide_on_delete (GmWindow *window);
++
+ G_END_DECLS
+
+ #endif
+--- ekiga-3.0.0/lib/gui/gmwindow.c 2008-09-22 22:56:51.000000000 +0200
++++ ekiga-3.0.1/lib/gui/gmwindow.c 2008-09-23 20:25:53.000000000 +0200
+@@ -52,6 +52,7 @@
+ {
+ GtkAccelGroup *accel;
+ gboolean hide_on_esc;
++ gboolean hide_on_delete;
+ const gchar *key;
+ int x;
+ int y;
+@@ -59,7 +60,11 @@
+ int height;
+ };
+
+-enum { GM_WINDOW_KEY = 1, GM_HIDE_ON_ESC = 2 };
++enum {
++ GM_WINDOW_KEY = 1,
++ GM_HIDE_ON_ESC = 2,
++ GM_HIDE_ON_DELETE = 3
++};
+
+ static GObjectClass *parent_class = NULL;
+
+@@ -128,6 +133,10 @@
+ g_value_set_boolean (value, self->priv->hide_on_esc);
+ break;
+
++ case GM_HIDE_ON_DELETE:
++ g_value_set_boolean (value, self->priv->hide_on_delete);
++ break;
++
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (obj, prop_id, spec);
+ break;
+@@ -164,6 +173,10 @@
+ g_cclosure_new_swap (G_CALLBACK (gtk_widget_hide), (gpointer) self, NULL));
+ break;
+
++ case GM_HIDE_ON_DELETE:
++ self->priv->hide_on_delete = g_value_get_boolean (value);
++ break;
++
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (obj, prop_id, spec);
+ break;
+@@ -194,6 +207,10 @@
+ spec = g_param_spec_boolean ("hide_on_esc", "Hide on Escape", "Hide on Escape",
+ TRUE, (GParamFlags) G_PARAM_READWRITE);
+ g_object_class_install_property (gobject_class, GM_HIDE_ON_ESC, spec);
++
++ spec = g_param_spec_boolean ("hide_on_delete", "Hide on delete-event", "Hide on delete-event (or just relay the event)",
++ TRUE, (GParamFlags) G_PARAM_READWRITE);
++ g_object_class_install_property (gobject_class, GM_HIDE_ON_DELETE, spec);
+ }
+
+
+@@ -209,6 +226,7 @@
+ self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, GM_WINDOW_TYPE, GmWindowPrivate);
+ self->priv->key = g_strdup ("");
+ self->priv->hide_on_esc = TRUE;
++ self->priv->hide_on_delete = TRUE;
+
+ self->priv->accel = gtk_accel_group_new ();
+ gtk_window_add_accel_group (GTK_WINDOW (self), self->priv->accel);
+@@ -266,8 +284,16 @@
+ gm_window_delete_event (GtkWidget *w,
+ G_GNUC_UNUSED gpointer data)
+ {
+- gtk_widget_hide (w);
+- return FALSE;
++ GmWindow* self = NULL;
++
++ self = GM_WINDOW (w);
++
++ if (self->priv->hide_on_delete) {
++ gtk_widget_hide (w);
++ return TRUE;
++ } else {
++ return FALSE;
++ }
+ }
+
+
+@@ -451,3 +477,23 @@
+ g_free (size);
+ g_strfreev (couple);
+ }
++
++void
++gm_window_set_hide_on_delete (GmWindow *window,
++ gboolean hide_on_delete)
++{
++ g_return_if_fail (window != NULL);
++ g_return_if_fail (IS_GM_WINDOW (window));
++
++ g_object_set (GM_WINDOW (window), "hide_on_delete", hide_on_delete, NULL);
++}
++
++gboolean
++gm_window_get_hide_on_delete (GmWindow *window)
++{
++ g_return_val_if_fail (window != NULL, FALSE);
++ g_return_val_if_fail (IS_GM_WINDOW (window), FALSE);
++
++ return window->priv->hide_on_delete;
++}
++
Modified: desktop/experimental/ekiga/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/ekiga/debian/rules?rev=17156&op=diff
==============================================================================
--- desktop/experimental/ekiga/debian/rules (original)
+++ desktop/experimental/ekiga/debian/rules Sat Sep 27 09:24:57 2008
@@ -10,93 +10,119 @@
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-# FOR AUTOCONF 2.52 AND NEWER ONLY
ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
confflags += --build $(DEB_HOST_GNU_TYPE)
else
confflags += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
endif
-confflags_common := --prefix=/usr \
- --mandir=\$${prefix}/share/man \
- --infodir=\$${prefix}/share/info \
- --with-pwlib=/usr \
- --sysconfdir=/etc \
- --disable-install-schemas \
include /usr/share/dpatch/dpatch.make
-include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
+#include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
+
+#URL := http://www.ekiga.net/misc/ekiga-$(UPVERSION).tar.gz
CFLAGS = -Wall -g
CXXFLAGS = -Wall -g
# --as-needed is relatively risky and should be added with -z defs if possible
LDFLAGS += -Wl,-z,defs -Wl,--as-needed
-#URL := http://www.ekiga.net/misc/ekiga-$(UPVERSION).tar.gz
-
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
- CFLAGS += -O0
- CXXFLAGS += -O0
+ CFLAGS += -O0
+ CXXFLAGS += -O0
else
- CFLAGS += -O2
- CXXFLAGS += -O2
+ CFLAGS += -O2
+ CXXFLAGS += -O2
endif
-config.status:
+config.status: patch-stamp
dh_testdir
- sed -i -e 's#-Os#-O2#' configure
+ rm -f config.cache
+
+ #rm -rf build-gtkonly
+ #mkdir build-gtkonly
+ #cd build-gtkonly ; ./autogen.sh $(confflags) --prefix=/usr \
+ # --sysconfdir=/etc --disable-schemas-install --disable-scrollkeeper \
+ # --disable-gnome
+
CXXFLAGS="$(CXXFLAGS)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" \
- ./configure $(confflags) $(confflags_common) \
- --enable-avahi --disable-scrollkeeper
+ ./configure $(confflags) --prefix=/usr \
+ --sysconfdir=/etc --disable-schemas-install --disable-scrollkeeper
touch $@
build: build-stamp
build-stamp: config.status
dh_testdir
- $(MAKE) LDFLAGS=$(LDFLAGS)
+ $(MAKE) LDFLAGS="$(LDFLAGS)"
+ #$(MAKE) -C build-gtkonly
touch $@
-clean:: clean-patched unpatch
+clean: clean-patched unpatch
clean-patched:
dh_testdir
dh_testroot
+ rm -f build-stamp patch-stamp # for debhelper v6
+ rm -f debian/files*
+ rm -f xml-i18n-extract xml-i18n-merge xml-i18n-update
-if [ -f Makefile ];then \
$(MAKE) clean distclean;\
fi
- rm -f xml-i18n-extract xml-i18n-merge xml-i18n-update
- # Clean out what make distclean didn't clean out...
rm -rf po/.intltool-merge-cache
rm -rf intltool-extract intltool-merge intltool-update
rm -f pixmaps/inline_emoticons.h
rm -f pixmaps/inlines.h
rm -f build-stamp config.status
+ # Clean out what make distclean didn't clean out...
+ #rm -f ekiga*.desktop
+ #rm -f help/C/ekiga*-C.omf.out help/C/Makefile.in help/Makefile.in
+ #rm -f ekiga*.schemas
+ #rm -f intltool-extract intltool-extract.in
+ #rm -rf intltool-merge intltool-merge.in intltool-modules
+ #rm -f intltool-update intltool-update.in
+ #rm -rf lib/Makefile.in lib/widgets/Makefile.in lib/xdap/Makefile.in man/Makefile.in pixmaps/Makefile.in po/Makefile.in.in sounds/Makefile.in src/Makefile.in xdap_data/Makefile.in
+ #rm -f ltmain.sh
+ #rm -f missing mkinstalldirs
+ #rm -f pixmaps/inline_emoticons.h pixmaps/inlines.h
+ #rm -f po/*.gmo
+ #rm -f sounds/ekiga*.soundlist
+ #rm -f stamp-h.in
dh_clean
-install: install-indep install-arch
-install-indep: build-stamp
- # nothing to do here
- touch $@
-
-install-arch: build-stamp
+install: build
dh_testdir
dh_testroot
dh_clean -k
dh_installdirs
- GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 \
- $(MAKE) install DESTDIR=$(CURDIR)/debian/ekiga
- touch $@
-binary-common: build-stamp
+ #GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 \
+ $(MAKE) install DESTDIR=$(CURDIR)/debian/ekiga
+ #use the XPM pixmap
+ rm -rf debian/ekiga/usr/share/pixmaps/ekiga
+ #$(MAKE) -C build-gtkonly install DESTDIR=$(CURDIR)/debian/ekiga-gtkonly
+ #mkdir -p debian/ekiga/usr/share/bug/ekiga
+ #echo 'Send-To: Ekiga Snapshots Bugs <master at buildserver.net>' >$(CURDIR)/debian/ekiga/usr/share/bug/ekiga/control
+ #cp debian/bugs.script debian/ekiga/usr/share/bug/ekiga/script
+ #chmod 0755 debian/ekiga/usr/share/bug/ekiga/script
+ #cp debian/bugs.presubj debian/ekiga/usr/share/bug/ekiga/presubj
+
+binary-indep: build install
+
+binary-arch: build install
dh_testdir
dh_testroot
- dh_installdocs
+ #"", -gtkonly have docs in /usr/share/doc, while -dbg uses links
+ dh_installdocs -A -Nekiga-dbg
dh_install
dh_installmenu
- dh_installchangelogs ChangeLog
+ dh_installman -A -Nekiga-dbg man/ekiga.1 debian/ekiga-config-tool.1
+ dh_installchangelogs -Nekiga-dbg ChangeLog
+ mkdir -p debian/ekiga-dbg/usr/share/doc
+ ln -s ekiga debian/ekiga-dbg/usr/share/doc/ekiga-dbg
dh_scrollkeeper
dh_gconf
dh_link
+ dh_strip --dbg-package=ekiga-dbg
dh_compress
dh_fixperms
dh_installdeb
@@ -105,18 +131,12 @@
dh_md5sums
dh_builddeb
-# Build architecture independant packages using the common target.
-binary-indep: install-indep
- $(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
-
-# Build architecture dependant packages using the common target.
-binary-arch: install-arch
- dh_testdir
- dh_testroot
- # we need debhelper 5 for this!
- dh_strip --dbg-package=ekiga-dbg
- dh_installman -a
- $(MAKE) -f debian/rules DH_OPTIONS=-a binary-common
+get-orig-source:
+ @@dh_testdir
+ @@[ -d ../tarballs/. ]||mkdir -p ../tarballs
+ @@echo Downloading 3.0 ...
+ @@wget -N -nv -T10 -t3 -O ../tarballs/ekiga_3.0.0.orig.tar.gz http://ftp.gnome.org/pub/gnome/sources/ekiga/3.0/ekiga-3.0.0.tar.gz
+ @@echo Ready for packaging.
binary: binary-indep binary-arch
.PHONY: build clean clean-patched binary-indep binary-arch binary install patch
More information about the pkg-gnome-commits
mailing list