[Pkg-utopia-commits] r489 - in packages/unstable/avahi/debian: . patches

Sjoerd Simons sjoerd at costa.debian.org
Tue Jan 17 08:26:45 UTC 2006


Author: sjoerd
Date: 2006-01-17 08:26:45 +0000 (Tue, 17 Jan 2006)
New Revision: 489

Added:
   packages/unstable/avahi/debian/patches/02_stdlib_NULL.patch
   packages/unstable/avahi/debian/patches/03_reduce_qt3lib_depends.patch
Removed:
   packages/unstable/avahi/debian/patches/02_avahi-sharp-mono1.1.13.patch
Modified:
   packages/unstable/avahi/debian/changelog
   packages/unstable/avahi/debian/control
Log:
  * New upstream release
  * Make python2.4-avahi depend on python2.4-glade (Closes: #348284)
  * debian/patches/02_avahi-sharp-mono1.1.13.patch 
    + Removed. Fixed upstream
  * debian/patches/02_stdlib_NULL.patch
    + Added. To use NULL on GNU/kFreeBSD <stdlib.h> needs to be included
    (Thanks Aurelien Jarno) (Closes: #348405)
  * debian/patches/03_reduce_qt3lib_depends.patch
    + Added. Change avahi-qt3.pc to have qt3-mt in Requires.private instead of
    Requires (Thanks Isaac Clerencia) (Closes: #347710)



Modified: packages/unstable/avahi/debian/changelog
===================================================================
--- packages/unstable/avahi/debian/changelog	2006-01-16 20:20:44 UTC (rev 488)
+++ packages/unstable/avahi/debian/changelog	2006-01-17 08:26:45 UTC (rev 489)
@@ -1,3 +1,18 @@
+avahi (0.6.4-1) unstable; urgency=low
+
+  * New upstream release
+  * Make python2.4-avahi depend on python2.4-glade (Closes: #348284)
+  * debian/patches/02_avahi-sharp-mono1.1.13.patch 
+    + Removed. Fixed upstream
+  * debian/patches/02_stdlib_NULL.patch
+    + Added. To use NULL on GNU/kFreeBSD <stdlib.h> needs to be included
+    (Thanks Aurelien Jarno) (Closes: #348405)
+  * debian/patches/03_reduce_qt3lib_depends.patch
+    + Added. Change avahi-qt3.pc to have qt3-mt in Requires.private instead of
+    Requires (Thanks Isaac Clerencia) (Closes: #347710)
+
+ -- Sjoerd Simons <sjoerd at debian.org>  Tue, 17 Jan 2006 09:16:28 +0100
+
 avahi (0.6.3-3) unstable; urgency=low
 
   * debian/patches/02_avahi-sharp-mono1.1.13.patch 

Modified: packages/unstable/avahi/debian/control
===================================================================
--- packages/unstable/avahi/debian/control	2006-01-16 20:20:44 UTC (rev 488)
+++ packages/unstable/avahi/debian/control	2006-01-17 08:26:45 UTC (rev 489)
@@ -45,7 +45,7 @@
 Section: python
 Architecture: all
 Replaces: avahi-utils (<< 0.4)
-Depends: ${python:Depends}, python2.4-gdbm, libavahi-common-data
+Depends: ${python:Depends}, python2.4-gdbm, python2.4-glade2, libavahi-common-data
 Description: Python utility package for Avahi
  Avahi is a fully LGPL framework for Multicast DNS Service Discovery.
  It allows programs to publish and discover services and hosts

Deleted: packages/unstable/avahi/debian/patches/02_avahi-sharp-mono1.1.13.patch
===================================================================
--- packages/unstable/avahi/debian/patches/02_avahi-sharp-mono1.1.13.patch	2006-01-16 20:20:44 UTC (rev 488)
+++ packages/unstable/avahi/debian/patches/02_avahi-sharp-mono1.1.13.patch	2006-01-17 08:26:45 UTC (rev 489)
@@ -1,45 +0,0 @@
---- avahi-sharp/Client.cs	(.../tags/release-0.6.3/avahi-sharp)	(revision 1073)
-+++ avahi-sharp/Client.cs	(.../trunk/avahi-sharp)	(revision 1073)
-@@ -25,7 +25,10 @@
- using System.Collections;
- using System.Runtime.InteropServices;
- using Mono.Unix;
-+using Mono.Unix.Native;
- 
-+using Stdlib = Mono.Unix.Native.Stdlib;
-+
- namespace Avahi
- {
-     internal enum ResolverEvent {
-@@ -86,7 +89,8 @@
-     public enum LookupFlags {
-         None = 0,
-         UseWideArea = 1,
--        UseMulticast = 4,
-+        UseMulticast = 2,
-+	NoTxt = 4,
-         NoAddress = 8
-     }
- 
---- avahi-sharp/avahi-sharp-docs.source	(.../tags/release-0.6.3/avahi-sharp)	(revision 1073)
-+++ avahi-sharp/avahi-sharp-docs.source	(.../trunk/avahi-sharp)	(revision 1073)
-@@ -1,4 +1,4 @@
- <?xml version="1.0"?>
- <monodoc>
--  <source provider="ecma" basefile="avahi-sharp-docs" path="various"/>
-+  <source provider="ecma" basefile="avahi-sharp-docs" path="various" title="Avahi" />
- </monodoc>
-Index: Utility.cs
-===================================================================
---- avahi-sharp/Utility.cs	(.../tags/release-0.6.3/avahi-sharp)	(revision 1073)
-+++ avahi-sharp/Utility.cs	(.../trunk/avahi-sharp)	(revision 1073)
-@@ -24,7 +24,9 @@
- using System.Text;
- using System.Runtime.InteropServices;
- using Mono.Unix;
-+using Mono.Unix.Native;
- 
-+using Stdlib = Mono.Unix.Native.Stdlib;
- 
- namespace Avahi
- {

Added: packages/unstable/avahi/debian/patches/02_stdlib_NULL.patch
===================================================================
--- packages/unstable/avahi/debian/patches/02_stdlib_NULL.patch	2006-01-16 20:20:44 UTC (rev 488)
+++ packages/unstable/avahi/debian/patches/02_stdlib_NULL.patch	2006-01-17 08:26:45 UTC (rev 489)
@@ -0,0 +1,88 @@
+--- avahi-core/response-sched.c
++++ avahi-core/response-sched.c
+@@ -23,6 +23,8 @@
+ #include <config.h>
+ #endif
+ 
++#include <stdlib.h>
++
+ #include <avahi-common/timeval.h>
+ #include <avahi-common/malloc.h>
+ 
+--- avahi-core/querier.c
++++ avahi-core/querier.c
+@@ -23,6 +23,8 @@
+ #include <config.h>
+ #endif
+ 
++#include <stdlib.h>
++
+ #include <avahi-common/timeval.h>
+ #include <avahi-common/malloc.h>
+ #include <avahi-common/error.h>
+--- avahi-core/resolve-address.c
++++ avahi-core/resolve-address.c
+@@ -23,6 +23,8 @@
+ #include <config.h>
+ #endif
+ 
++#include <stdlib.h>
++
+ #include <avahi-common/timeval.h>
+ #include <avahi-common/malloc.h>
+ #include <avahi-common/error.h>
+--- avahi-core/browse-domain.c
++++ avahi-core/browse-domain.c
+@@ -23,6 +23,8 @@
+ #include <config.h>
+ #endif
+ 
++#include <stdlib.h>
++
+ #include <avahi-common/domain.h>
+ #include <avahi-common/malloc.h>
+ #include <avahi-common/error.h>
+--- avahi-core/probe-sched.c
++++ avahi-core/probe-sched.c
+@@ -23,6 +23,8 @@
+ #include <config.h>
+ #endif
+ 
++#include <stdlib.h>
++
+ #include <avahi-common/domain.h>
+ #include <avahi-common/timeval.h>
+ #include <avahi-common/malloc.h>
+--- avahi-core/multicast-lookup.c
++++ avahi-core/multicast-lookup.c
+@@ -23,6 +23,8 @@
+ #include <config.h>
+ #endif
+ 
++#include <stdlib.h>
++
+ #include <avahi-common/malloc.h>
+ #include <avahi-common/timeval.h>
+ 
+--- avahi-core/query-sched.c
++++ avahi-core/query-sched.c
+@@ -23,6 +23,8 @@
+ #include <config.h>
+ #endif
+ 
++#include <stdlib.h>
++
+ #include <avahi-common/timeval.h>
+ #include <avahi-common/malloc.h>
+ 
+--- avahi-core/announce.c
++++ avahi-core/announce.c
+@@ -23,6 +23,8 @@
+ #include <config.h>
+ #endif
+ 
++#include <stdlib.h>
++
+ #include <avahi-common/timeval.h>
+ #include <avahi-common/malloc.h>
+ 

Added: packages/unstable/avahi/debian/patches/03_reduce_qt3lib_depends.patch
===================================================================
--- packages/unstable/avahi/debian/patches/03_reduce_qt3lib_depends.patch	2006-01-16 20:20:44 UTC (rev 488)
+++ packages/unstable/avahi/debian/patches/03_reduce_qt3lib_depends.patch	2006-01-17 08:26:45 UTC (rev 489)
@@ -0,0 +1,10 @@
+--- avahi-qt3.pc.in	2005-11-24 18:01:10.000000000 +0100
++++ avahi-qt3.pc.in.0	2006-01-17 09:25:16.000000000 +0100
+@@ -6,6 +6,6 @@
+ Name: avahi-qt3
+ Description: Avahi Multicast DNS Responder (QT3 Support)
+ Version: @PACKAGE_VERSION@
+-Requires: qt-mt >= 3.0.0
++Requires.private: qt-mt >= 3.0.0
+ Libs: -L${libdir} -lavahi-qt3
+ Cflags: -D_REENTRANT -I${includedir}




More information about the Pkg-utopia-commits mailing list