r16814 - in /desktop/unstable/ekiga/debian: changelog control control.in ekiga-gtkonly.manpages rules
joss at users.alioth.debian.org
joss at users.alioth.debian.org
Wed Aug 27 22:19:30 UTC 2008
Author: joss
Date: Wed Aug 27 22:19:30 2008
New Revision: 16814
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=16814
Log:
* Non-maintainer upload.
* Remove the ekiga-gtkonly package, which is broken beyond repair in the 2.x
series. (Closes: #456401)
Removed:
desktop/unstable/ekiga/debian/ekiga-gtkonly.manpages
Modified:
desktop/unstable/ekiga/debian/changelog
desktop/unstable/ekiga/debian/control
desktop/unstable/ekiga/debian/control.in
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=16814&op=diff
==============================================================================
--- desktop/unstable/ekiga/debian/changelog (original)
+++ desktop/unstable/ekiga/debian/changelog Wed Aug 27 22:19:30 2008
@@ -1,3 +1,11 @@
+ekiga (2.0.12-1+nmu1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Remove the ekiga-gtkonly package, which is broken beyond repair in the 2.x
+ series. (Closes: #456401)
+
+ -- Philipp Kern <pkern at debian.org> Sat, 09 Aug 2008 12:14:23 -0300
+
ekiga (2.0.12-1) unstable; urgency=low
[ Kilian Krause ]
Modified: desktop/unstable/ekiga/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/ekiga/debian/control?rev=16814&op=diff
==============================================================================
--- desktop/unstable/ekiga/debian/control (original)
+++ desktop/unstable/ekiga/debian/control Wed Aug 27 22:19:30 2008
@@ -53,38 +53,10 @@
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
Priority: extra
Architecture: any
-Depends: ekiga (= ${binary:Version}) | ekiga-gtkonly (= ${binary:Version})
+Depends: ekiga (= ${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
Modified: desktop/unstable/ekiga/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/ekiga/debian/control.in?rev=16814&op=diff
==============================================================================
--- desktop/unstable/ekiga/debian/control.in (original)
+++ desktop/unstable/ekiga/debian/control.in Wed Aug 27 22:19:30 2008
@@ -53,38 +53,10 @@
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
Priority: extra
Architecture: any
-Depends: ekiga (= ${binary:Version}) | ekiga-gtkonly (= ${binary:Version})
+Depends: ekiga (= ${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
Modified: desktop/unstable/ekiga/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/ekiga/debian/rules?rev=16814&op=diff
==============================================================================
--- desktop/unstable/ekiga/debian/rules (original)
+++ desktop/unstable/ekiga/debian/rules Wed Aug 27 22:19:30 2008
@@ -42,47 +42,8 @@
CXXFLAGS += -O2
endif
-gtkonly-stamp: patch-stamp
+config.status:
dh_testdir
- rm -rf build-gtkonly
- mkdir -p build-gtkonly
- tar cf - --exclude ./debian --exclude build-gtkonly . | (cd build-gtkonly; tar xf -)
- # do the gtkonly suffix preparations
- mv build-gtkonly/ekiga.desktop.in.in build-gtkonly/ekiga-gtkonly.desktop.in.in
- mv build-gtkonly/ekiga.schemas.in.in build-gtkonly/ekiga-gtkonly.schemas.in.in
- mv build-gtkonly/src/components/ekiga.server build-gtkonly/src/components/ekiga-gtkonly.server
- for size in 16 22 32 48 72;do \
- if [ -f build-gtkonly/pixmaps/$${size}x$${size}/apps/ekiga.png ];then \
- mv build-gtkonly/pixmaps/$${size}x$${size}/apps/ekiga.png build-gtkonly/pixmaps/$${size}x$${size}/apps/ekiga-gtkonly.png; \
- fi \
- done
- mv build-gtkonly/pixmaps/ekiga.png build-gtkonly/pixmaps/ekiga-gtkonly.png
- mv build-gtkonly/pixmaps/ekiga-logo.png build-gtkonly/pixmaps/ekiga-gtkonly-logo.png
- mv build-gtkonly/help/C/ekiga.xml build-gtkonly/help/C/ekiga-gtkonly.xml
- mv build-gtkonly/help/fr/ekiga.xml build-gtkonly/help/fr/ekiga-gtkonly.xml
- mv build-gtkonly/man/ekiga.1 build-gtkonly/man/ekiga-gtkonly.1
- ###mv build-gtkonly/ekiga.service.in build-gtkonly/ekiga-gtkonly.service.in
- ###mv build-gtkonly/pixmaps/ekiga-splash.png build-gtkonly/pixmaps/ekiga-gtkonly-splash.png
- ###mv build-gtkonly/help/C/ekiga-C.omf build-gtkonly/help/C/ekiga-gtkonly-C.omf
- ###mv build-gtkonly/help/fr/ekiga-fr.omf build-gtkonly/help/fr/ekiga-gtkonly-fr.omf
- cd build-gtkonly;patch -p1 <../debian/patches/gnome-free-gdu.dpatch
- mv build-gtkonly/configure.in build-gtkonly/configure.ac
- sed -i -e '/^AC_INIT/s#ekiga#ekiga-gtkonly#' build-gtkonly/configure.ac
- sed -i -e 's#-Os#-O2#' build-gtkonly/configure.ac
- cp debian/ekiga-config-tool.1 build-gtkonly/man/ekiga-gtkonly-config-tool.1
- touch $@
-
-config.status: gtkonly-stamp
- 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-maintainer-mode --disable-gnome --disable-gdu --disable-avahi --disable-scrollkeeper
- # and the regular one, too
sed -i -e 's#-Os#-O2#' configure
CXXFLAGS="$(CXXFLAGS)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" \
./configure $(confflags) $(confflags_common) \
@@ -93,7 +54,6 @@
build-stamp: config.status
dh_testdir
- $(MAKE) -C build-gtkonly LDFLAGS=$(LDFLAGS)
$(MAKE) LDFLAGS=$(LDFLAGS)
touch $@
@@ -104,7 +64,6 @@
-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
@@ -126,9 +85,6 @@
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
- -mv $(CURDIR)/debian/ekiga-gtkonly/usr/bin/ekiga-config-tool $(CURDIR)/debian/ekiga-gtkonly/usr/bin/ekiga-gtkonly-config-tool
touch $@
binary-common: build-stamp
More information about the pkg-gnome-commits
mailing list