r13007 - in /desktop/unstable/ekiga/debian: control control.in rules

[kilian at users.alioth.debian.org]

Author: kilian
Date: Sat Oct  6 19:24:03 2007
New Revision: 13007

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=13007
Log:
fixup last commit. Unify namespace of packages and remove duplicate build-dep on intltool.

Modified:
    desktop/unstable/ekiga/debian/control
    desktop/unstable/ekiga/debian/control.in
    desktop/unstable/ekiga/debian/rules

Modified: desktop/unstable/ekiga/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/ekiga/debian/control?rev=13007&op=diff
==============================================================================
--- desktop/unstable/ekiga/debian/control (original)
+++ desktop/unstable/ekiga/debian/control Sat Oct  6 19:24:03 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, gnome-common, automake1.8, autoconf, intltool (>= 0.35.0)
+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
 Standards-Version: 3.7.2
 
 Package: ekiga

Modified: desktop/unstable/ekiga/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/ekiga/debian/control.in?rev=13007&op=diff
==============================================================================
--- desktop/unstable/ekiga/debian/control.in (original)
+++ desktop/unstable/ekiga/debian/control.in Sat Oct  6 19:24:03 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, gnome-common, automake1.8, autoconf, intltool (>= 0.35.0)
+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
 Standards-Version: 3.7.2
 
 Package: ekiga

Modified: desktop/unstable/ekiga/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/ekiga/debian/rules?rev=13007&op=diff
==============================================================================
--- desktop/unstable/ekiga/debian/rules (original)
+++ desktop/unstable/ekiga/debian/rules Sat Oct  6 19:24:03 2007
@@ -88,13 +88,14 @@
 	CXXFLAGS="$(CXXFLAGS)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" \
 	./configure $(confflags) $(confflags_common) \
 		--enable-avahi --disable-scrollkeeper
+	touch $@
 
 build: build-stamp
 build-stamp: config.status
 	dh_testdir
 	$(MAKE) -C build-gtkonly
 	$(MAKE)
-	touch build-stamp
+	touch $@
 
 clean:: unpatch
 	dh_testdir
@@ -124,9 +125,8 @@
 	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
+	-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
 
 binary-common: build-stamp
 	dh_testdir