r13006 - in /desktop/unstable/ekiga/debian: changelog control control.in ekiga-gtkonly.manpages ekiga.manpages patches/00list patches/gmconf.dpatch patches/gnome-free-gdu.dpatch rules
kilian at users.alioth.debian.org
kilian at users.alioth.debian.org
Sat Oct 6 19:03:43 UTC 2007
Author: kilian
Date: Sat Oct 6 19:03:42 2007
New Revision: 13006
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=13006
Log:
* Add debug package.
* Add GNOME-free GTK-only variant (Closes: #399326)
Added:
desktop/unstable/ekiga/debian/ekiga-gtkonly.manpages
desktop/unstable/ekiga/debian/ekiga.manpages
desktop/unstable/ekiga/debian/patches/gmconf.dpatch
desktop/unstable/ekiga/debian/patches/gnome-free-gdu.dpatch (with props)
Modified:
desktop/unstable/ekiga/debian/changelog
desktop/unstable/ekiga/debian/control
desktop/unstable/ekiga/debian/control.in
desktop/unstable/ekiga/debian/patches/00list
desktop/unstable/ekiga/debian/rules
Modified: desktop/unstable/ekiga/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/ekiga/debian/changelog?rev=13006&op=diff
==============================================================================
--- desktop/unstable/ekiga/debian/changelog (original)
+++ desktop/unstable/ekiga/debian/changelog Sat Oct 6 19:03:42 2007
@@ -1,8 +1,10 @@
ekiga (2.0.11-2) UNRELEASED; urgency=low
* NOT RELEASED YET
-
- -- Kilian Krause <kilian at debian.org> Sat, 22 Sep 2007 17:48:54 +0200
+ * Add debug package.
+ * Add GNOME-free GTK-only variant (Closes: #399326)
+
+ -- Kilian Krause <kilian at debian.org> Sat, 06 Oct 2007 18:35:55 +0200
ekiga (2.0.11-1) unstable; urgency=low
Modified: desktop/unstable/ekiga/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/ekiga/debian/control?rev=13006&op=diff
==============================================================================
--- desktop/unstable/ekiga/debian/control (original)
+++ desktop/unstable/ekiga/debian/control Sat Oct 6 19:03:42 2007
@@ -3,7 +3,7 @@
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>, Loic Minier <lool at dooz.org>
-Build-Depends: debhelper (>= 5), gettext, libgnome2-dev, libldap2-dev, libpt-dev (>= 1.10.10~), libopal-dev (>= 2.2.11~), libgconf2-dev, libgnomeui-dev, libsdl1.2-dev, dpatch, autotools-dev, gnome-pkg-tools, scrollkeeper, automake1.7, intltool, libxml-parser-perl, evolution-data-server-dev, gnome-doc-utils, libavahi-client-dev (>= 0.6.0), libavahi-glib-dev (>= 0.6.0), libebook1.2-dev
+Build-Depends: debhelper (>= 5), gettext, libgnome2-dev, libldap2-dev, libpt-dev (>= 1.10.10~), libopal-dev (>= 2.2.11~), libgconf2-dev, libgnomeui-dev, libsdl1.2-dev, dpatch, autotools-dev, gnome-pkg-tools, scrollkeeper, automake1.7, intltool, libxml-parser-perl, evolution-data-server-dev, gnome-doc-utils, libavahi-client-dev (>= 0.6.0), libavahi-glib-dev (>= 0.6.0), libebook1.2-dev, gnome-common, automake1.8, autoconf, intltool (>= 0.35.0)
Standards-Version: 3.7.2
Package: ekiga
@@ -11,8 +11,8 @@
Depends: ${shlibs:Depends}, ${misc:Depends}, evolution-data-server
Recommends: yelp
Suggests: siproxd, gnugk, mediaproxy, ser, openser, rtpproxy, asterisk, yate, callweaver
-Description: H.323 and SIP compatible VOIP client
- H.323 and SIP compatible videoconferencing and VOIP/IP-Telephony application
+Description: H.323 and SIP compatible VoIP client
+ 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.
.
@@ -21,6 +21,40 @@
calls using an external MCU, using modern Quicknet telephony cards,
and making PC-To-Phone calls.
+Package: ekiga-gtkonly
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Suggests: yelp, siproxd, gnugk, mediaproxy, ser, openser, rtpproxy, asterisk, yate, callweaver
+Description: H.323 and SIP compatible VoIP client - GTK-only (GNOME-free) version
+ 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 GTK-standalone version that is not intended to
+ integrate into a desktop environment like GNOME. It's the pure client based on
+ GTK.
+
+Package: ekiga-dbg
+Architecture: any
+Depends: ekiga (= ${binary:Version})|ekiga-gtkonly (= ${binary:Version})
+Suggests: libc6-dbg
+Description: H.323 and SIP compatible VoIP client - debug symbols
+ 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.
+
Package: gnomemeeting
Architecture: all
Depends: ekiga, zenity
Modified: desktop/unstable/ekiga/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/ekiga/debian/control.in?rev=13006&op=diff
==============================================================================
--- desktop/unstable/ekiga/debian/control.in (original)
+++ desktop/unstable/ekiga/debian/control.in Sat Oct 6 19:03:42 2007
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Kilian Krause <kilian at debian.org>
Uploaders: Jose Carlos Garcia Sogo <jsogo at debian.org>, @GNOME_TEAM@
-Build-Depends: debhelper (>= 5), gettext, libgnome2-dev, libldap2-dev, libpt-dev (>= 1.10.10~), libopal-dev (>= 2.2.11~), libgconf2-dev, libgnomeui-dev, libsdl1.2-dev, dpatch, autotools-dev, gnome-pkg-tools, scrollkeeper, automake1.7, intltool, libxml-parser-perl, evolution-data-server-dev, gnome-doc-utils, libavahi-client-dev (>= 0.6.0), libavahi-glib-dev (>= 0.6.0), libebook1.2-dev
+Build-Depends: debhelper (>= 5), gettext, libgnome2-dev, libldap2-dev, libpt-dev (>= 1.10.10~), libopal-dev (>= 2.2.11~), libgconf2-dev, libgnomeui-dev, libsdl1.2-dev, dpatch, autotools-dev, gnome-pkg-tools, scrollkeeper, automake1.7, intltool, libxml-parser-perl, evolution-data-server-dev, gnome-doc-utils, libavahi-client-dev (>= 0.6.0), libavahi-glib-dev (>= 0.6.0), libebook1.2-dev, gnome-common, automake1.8, autoconf, intltool (>= 0.35.0)
Standards-Version: 3.7.2
Package: ekiga
@@ -11,8 +11,8 @@
Depends: ${shlibs:Depends}, ${misc:Depends}, evolution-data-server
Recommends: yelp
Suggests: siproxd, gnugk, mediaproxy, ser, openser, rtpproxy, asterisk, yate, callweaver
-Description: H.323 and SIP compatible VOIP client
- H.323 and SIP compatible videoconferencing and VOIP/IP-Telephony application
+Description: H.323 and SIP compatible VoIP client
+ 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.
.
@@ -21,6 +21,40 @@
calls using an external MCU, using modern Quicknet telephony cards,
and making PC-To-Phone calls.
+Package: ekiga-gtkonly
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Suggests: yelp, siproxd, gnugk, mediaproxy, ser, openser, rtpproxy, asterisk, yate, callweaver
+Description: H.323 and SIP compatible VoIP client - GTK-only (GNOME-free) version
+ 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 GTK-standalone version that is not intended to
+ integrate into a desktop environment like GNOME. It's the pure client based on
+ GTK.
+
+Package: ekiga-dbg
+Architecture: any
+Depends: ekiga (= ${binary:Version})|ekiga-gtkonly (= ${binary:Version})
+Suggests: libc6-dbg
+Description: H.323 and SIP compatible VoIP client - debug symbols
+ 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.
+
Package: gnomemeeting
Architecture: all
Depends: ekiga, zenity
Added: desktop/unstable/ekiga/debian/ekiga-gtkonly.manpages
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/ekiga/debian/ekiga-gtkonly.manpages?rev=13006&op=file
==============================================================================
--- desktop/unstable/ekiga/debian/ekiga-gtkonly.manpages (added)
+++ desktop/unstable/ekiga/debian/ekiga-gtkonly.manpages Sat Oct 6 19:03:42 2007
@@ -1,0 +1,2 @@
+build-gtkonly/man/ekiga-gtkonly.1
+build-gtkonly/man/ekiga-gtkonly-config-tool.1
Added: desktop/unstable/ekiga/debian/ekiga.manpages
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/ekiga/debian/ekiga.manpages?rev=13006&op=file
==============================================================================
--- desktop/unstable/ekiga/debian/ekiga.manpages (added)
+++ desktop/unstable/ekiga/debian/ekiga.manpages Sat Oct 6 19:03:42 2007
@@ -1,0 +1,2 @@
+man/ekiga.1
+debian/ekiga-config-tool.1
Modified: desktop/unstable/ekiga/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/ekiga/debian/patches/00list?rev=13006&op=diff
==============================================================================
--- desktop/unstable/ekiga/debian/patches/00list (original)
+++ desktop/unstable/ekiga/debian/patches/00list Sat Oct 6 19:03:42 2007
@@ -1,3 +1,4 @@
#10_relibtoolize
#recvers
lib64
+gmconf
Added: desktop/unstable/ekiga/debian/patches/gmconf.dpatch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/ekiga/debian/patches/gmconf.dpatch?rev=13006&op=file
==============================================================================
--- desktop/unstable/ekiga/debian/patches/gmconf.dpatch (added)
+++ desktop/unstable/ekiga/debian/patches/gmconf.dpatch Sat Oct 6 19:03:42 2007
@@ -1,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## gmconf.dpatch by Kilian Krause <kilian at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Backport compilation fix from gnome-2-20 branch
+
+ at DPATCH@
+diff -urNad ekiga-2.0.11~/lib/gmconf/gmconf-glib.c ekiga-2.0.11/lib/gmconf/gmconf-glib.c
+--- ekiga-2.0.11~/lib/gmconf/gmconf-glib.c 2007-09-18 09:00:21.000000000 +0000
++++ ekiga-2.0.11/lib/gmconf/gmconf-glib.c 2007-10-06 18:34:01.000000000 +0000
+@@ -1473,7 +1473,7 @@
+ }
+
+ gboolean
+-gm_conf_is_key_writable (gchar *key)
++gm_conf_is_key_writable (const gchar *key)
+ {
+ g_return_val_if_fail (key != NULL, FALSE);
+
Added: desktop/unstable/ekiga/debian/patches/gnome-free-gdu.dpatch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/ekiga/debian/patches/gnome-free-gdu.dpatch?rev=13006&op=file
==============================================================================
--- desktop/unstable/ekiga/debian/patches/gnome-free-gdu.dpatch (added)
+++ desktop/unstable/ekiga/debian/patches/gnome-free-gdu.dpatch Sat Oct 6 19:03:42 2007
@@ -1,0 +1,41 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## gnome-free-gdu.dpatch by Kilian Krause <kilian at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: backport from trunk to make gnome-autogen.sh happy
+
+ at DPATCH@
+diff -urNad ekiga-2.0.11~/configure.in ekiga-2.0.11/configure.in
+--- ekiga-2.0.11~/configure.in 2007-09-18 09:38:25.000000000 +0000
++++ ekiga-2.0.11/configure.in 2007-10-06 18:11:37.000000000 +0000
+@@ -219,6 +219,30 @@
+ libname="lib"
+ ;;
+ esac
++dnl ###############################
++dnl Gnome-Doc-Utils
++dnl ###############################
++GDU="disabled"
++if test "x${gm_platform}" != "xmingw" ; then
++ AC_ARG_ENABLE(gdu, [ --disable-gdu Disable GNOME-Doc-Utils support],,enable_gdu=yes)
++
++ if test "x$enable_gdu" = "xyes"; then
++GNOME_DOC_INIT
++ AC_PATH_PROG(SK_CONFIG,scrollkeeper-config,no)
++ if test "x$SK_CONFIG" = "xno"; then
++ AC_MSG_ERROR(Couldn't find scrollkeeper-config. Please install the scrollkeeper package: http://scrollkeeper.sourceforge.net)
++ fi
++ GDU="enabled"
++ else
++ ENABLE_SK_TRUE="#"
++ ENABLE_SK_FALSE=""
++ fi
++else
++ ENABLE_SK_TRUE="#"
++ ENABLE_SK_FALSE=""
++fi
++
++AM_CONDITIONAL(HAVE_GNOME_DOC_UTILS, test "x${enable_gdu}" = "xyes")
+
+
+ dnl ###########################################################################
Propchange: desktop/unstable/ekiga/debian/patches/gnome-free-gdu.dpatch
------------------------------------------------------------------------------
svn:executable = *
Modified: desktop/unstable/ekiga/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/ekiga/debian/rules?rev=13006&op=diff
==============================================================================
--- desktop/unstable/ekiga/debian/rules (original)
+++ desktop/unstable/ekiga/debian/rules Sat Oct 6 19:03:42 2007
@@ -16,6 +16,12 @@
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
@@ -36,24 +42,57 @@
CXXFLAGS += -O2
endif
-config.status: patch-stamp
+build-gtkonly: patch-stamp
dh_testdir
- CXXFLAGS="$(CXXFLAGS)" \
- CFLAGS="$(CFLAGS)" \
- LDFLAGS="$(LDFLAGS)" \
- ./configure $(confflags) --prefix=/usr \
- --mandir=\$${prefix}/share/man \
- --infodir=\$${prefix}/share/info \
- --with-pwlib=/usr \
- --sysconfdir=/etc \
- --disable-install-schemas \
- --enable-avahi \
- --disable-scrollkeeper
+ rm -rf $@
+ mkdir -p $@
+ tar cf - --exclude ./debian --exclude $@ . | (cd $@; tar xf -)
+ # do the gtkonly suffix preparations
+ mv $@/ekiga.desktop.in.in $@/ekiga-gtkonly.desktop.in.in
+ mv $@/ekiga.schemas.in.in $@/ekiga-gtkonly.schemas.in.in
+ mv $@/src/components/ekiga.server $@/src/components/ekiga-gtkonly.server
+ for size in 16 22 32 48 72;do \
+ if [ -f $@/pixmaps/$${size}x$${size}/apps/ekiga.png ];then \
+ mv $@/pixmaps/$${size}x$${size}/apps/ekiga.png $@/pixmaps/$${size}x$${size}/apps/ekiga-gtkonly.png; \
+ fi \
+ done
+ mv $@/pixmaps/ekiga.png $@/pixmaps/ekiga-gtkonly.png
+ mv $@/pixmaps/ekiga-logo.png $@/pixmaps/ekiga-gtkonly-logo.png
+ mv $@/help/C/ekiga.xml $@/help/C/ekiga-gtkonly.xml
+ mv $@/help/fr/ekiga.xml $@/help/fr/ekiga-gtkonly.xml
+ mv $@/man/ekiga.1 $@/man/ekiga-gtkonly.1
+ ###mv $@/ekiga.service.in $@/ekiga-gtkonly.service.in
+ ###mv $@/pixmaps/ekiga-splash.png $@/pixmaps/ekiga-gtkonly-splash.png
+ ###mv $@/help/C/ekiga-C.omf $@/help/C/ekiga-gtkonly-C.omf
+ ###mv $@/help/fr/ekiga-fr.omf $@/help/fr/ekiga-gtkonly-fr.omf
+ cd build-gtkonly;patch -p1 <../debian/patches/gnome-free-gdu.dpatch
+ mv $@/configure.in $@/configure.ac
+ sed -i -e '/^AC_INIT/s#ekiga#ekiga-gtkonly#' $@/configure.ac
+ sed -i -e 's#-Os#-O2#' $@/configure.ac
+ cp debian/ekiga-config-tool.1 $@/man/ekiga-gtkonly-config-tool.1
+ touch $@
+
+config.status: build-gtkonly
+ dh_testdir
+
+ # now configure both...
+ # --program-suffix=-gtkonly
+ cd build-gtkonly; CXXFLAGS="$(CXXFLAGS)" \
+ CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" \
+ DIE=0 REQUIRED_AUTOMAKE_VERSION=1.8 PKG_NAME="ekiga" \
+ ACLOCAL_FLAGS="-I /usr/share/aclocal" GNOME_DATADIR=/usr/share USE_GNOME2_MACROS=1 \
+ /usr/bin/gnome-autogen.sh $(confflags) $(confflags_common) \
+ --disable-gnome --disable-gdu --disable-avahi --disable-scrollkeeper
+ # and the regular one, too
+ sed -i -e 's#-Os#-O2#' configure.in
+ CXXFLAGS="$(CXXFLAGS)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" \
+ ./configure $(confflags) $(confflags_common) \
+ --enable-avahi --disable-scrollkeeper
build: build-stamp
-
build-stamp: config.status
dh_testdir
+ $(MAKE) -C build-gtkonly
$(MAKE)
touch build-stamp
@@ -63,6 +102,7 @@
-if [ -f Makefile ];then \
$(MAKE) clean distclean;\
fi
+ rm -rf build-gtkonly
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
@@ -83,7 +123,10 @@
dh_installdirs
GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 \
$(MAKE) install DESTDIR=$(CURDIR)/debian/ekiga
-
+ $(MAKE) -C build-gtkonly install DESTDIR=$(CURDIR)/debian/ekiga-gtkonly
+ mv $(CURDIR)/debian/ekiga-gtkonly/usr/bin/ekiga $(CURDIR)/debian/ekiga-gtkonly/usr/bin/ekiga-gtkonly
+ # for now we can't tear apart the namespaces. --programm-suffix is only coming in Ekiga 3.0
+ ln -s ekiga-gtkonly $(CURDIR)/debian/ekiga-gtkonly/usr/bin/ekiga
binary-common: build-stamp
dh_testdir
@@ -111,8 +154,9 @@
binary-arch: install-arch
dh_testdir
dh_testroot
- dh_strip
- dh_installman -a man/ekiga.1 debian/ekiga-config-tool.1
+ # we need debhelper 5 for this!
+ dh_strip --dbg-package=ekiga-dbg
+ dh_installman -a
$(MAKE) -f debian/rules DH_OPTIONS=-a binary-common
binary: binary-indep binary-arch
More information about the pkg-gnome-commits
mailing list