[Pkg-voip-commits] r1885 - in ekiga/branches/sarge/debian: . patches

[Kilian Krause]

Author: kilian
Date: 2006-06-15 11:45:44 +0000 (Thu, 15 Jun 2006)
New Revision: 1885

Added:
   ekiga/branches/sarge/debian/patches/gnome-doc-utils.dpatch
Modified:
   ekiga/branches/sarge/debian/changelog
   ekiga/branches/sarge/debian/patches/00list
   ekiga/branches/sarge/debian/rules
Log:
fix sarge backport.


Modified: ekiga/branches/sarge/debian/changelog
===================================================================
--- ekiga/branches/sarge/debian/changelog	2006-06-15 11:09:53 UTC (rev 1884)
+++ ekiga/branches/sarge/debian/changelog	2006-06-15 11:45:44 UTC (rev 1885)
@@ -1,7 +1,13 @@
+ekiga (2.0.2-2) UNRELEASED; urgency=low
+
+  * Sarge backport. Removed avahi-support. Provide gnomemeeting to satisfy
+    gnome depends. Downgrade gnome-doc-utils required version to 0.1.3.
+  * Fix configure target to use proper stamp config.status
+
+ -- Kilian Krause <kilian at debian.org>  Thu, 15 Jun 2006 13:38:56 +0200
+
 ekiga (2.0.2-1) unstable; urgency=low
 
-  * Sarge backport. Removed avahi-support. Provide gnomemeeting to satisfy
-    gnome depends.
   [ Kilian Krause ]
   * New upstream release.
   * Swap Maintainer and Uploader with Jose.

Modified: ekiga/branches/sarge/debian/patches/00list
===================================================================
--- ekiga/branches/sarge/debian/patches/00list	2006-06-15 11:09:53 UTC (rev 1884)
+++ ekiga/branches/sarge/debian/patches/00list	2006-06-15 11:45:44 UTC (rev 1885)
@@ -1,2 +1,3 @@
 #10_relibtoolize
 #recvers
+gnome-doc-utils

Added: ekiga/branches/sarge/debian/patches/gnome-doc-utils.dpatch
===================================================================
--- ekiga/branches/sarge/debian/patches/gnome-doc-utils.dpatch	2006-06-15 11:09:53 UTC (rev 1884)
+++ ekiga/branches/sarge/debian/patches/gnome-doc-utils.dpatch	2006-06-15 11:45:44 UTC (rev 1885)
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## gnome-doc-utils.dpatch by  <kilian at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix gnome-doc-utils check for Sarge version.
+
+ at DPATCH@
+diff -urNad ekiga-2.0.2/configure /tmp/dpep.G2aJTL/ekiga-2.0.2/configure
+--- ekiga-2.0.2/configure	2006-05-30 17:58:32.000000000 +0000
++++ /tmp/dpep.G2aJTL/ekiga-2.0.2/configure	2006-06-15 11:34:00.000000000 +0000
+@@ -2313,7 +2313,7 @@
+ fi
+ 
+ if test "x$PACKAGE" != "xgnome-doc-utils"; then
+-  GDU_REQUIRED_VERSION=0.3.2
++  GDU_REQUIRED_VERSION=0.1.3
+   if test -n ""; then
+     GDU_REQUIRED_VERSION=
+   fi


Property changes on: ekiga/branches/sarge/debian/patches/gnome-doc-utils.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Modified: ekiga/branches/sarge/debian/rules
===================================================================
--- ekiga/branches/sarge/debian/rules	2006-06-15 11:09:53 UTC (rev 1884)
+++ ekiga/branches/sarge/debian/rules	2006-06-15 11:45:44 UTC (rev 1885)
@@ -41,7 +41,7 @@
 
 include /usr/share/dpatch/dpatch.make
 
-configure-stamp: patch-stamp
+config.status: patch-stamp
 	dh_testdir
 	CXXFLAGS="$(CXXFLAGS)" CFLAGS="$(CFLAGS)" ./configure $(confflags) --prefix=/usr \
 				--mandir=\$${prefix}/share/man \
@@ -50,11 +50,10 @@
 				--sysconfdir=/etc \
 				--disable-install-schemas \
 				--disable-avahi --disable-scrollkeeper
-	touch configure-stamp
 
 build: build-stamp
 
-build-stamp:  configure-stamp
+build-stamp: config.status
 	dh_testdir
 	$(MAKE)
 	touch build-stamp