[Pkg-utopia-commits] r828 - packages/unstable/avahi/debian

Sjoerd Simons sjoerd at costa.debian.org
Wed May 10 09:06:13 UTC 2006 

Author: sjoerd
Date: 2006-05-10 09:06:13 +0000 (Wed, 10 May 2006)
New Revision: 828

Removed:
   packages/unstable/avahi/debian/libavahi1.0-cil.install
   packages/unstable/avahi/debian/libavahi1.0-cil.installcligac
   packages/unstable/avahi/debian/monodoc-avahi-manual.install
   packages/unstable/avahi/debian/monodoc-avahi-manual.postinst
Modified:
   packages/unstable/avahi/debian/control
   packages/unstable/avahi/debian/rules
Log:
Throw out the mono bindings packaging

Modified: packages/unstable/avahi/debian/control
===================================================================
--- packages/unstable/avahi/debian/control	2006-05-10 09:03:28 UTC (rev 827)
+++ packages/unstable/avahi/debian/control	2006-05-10 09:06:13 UTC (rev 828)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Ross Burton <ross at debian.org>
 Uploaders: Sjoerd Simons <sjoerd at debian.org>, Sebastian Dröge <slomo at ubuntu.com>
-Build-Depends: debhelper (>= 4.2.28), cdbs, libcap-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64 !netbsd-i386], libgdbm-dev, libglib2.0-dev (>= 2.4), libgtk2.0-dev (>= 2.4), libglade2-dev, libexpat-dev, libdaemon-dev, libdbus-1-dev (>= 0.60), python2.4 (>= 2.4), python2.4-gdbm, python2.4-dbus, python2.4-gtk2, libqt3-mt-dev, libqt4-dev, xmltoman, mono-mcs (>= 1.0) [i386 amd64 ] | c-sharp-compiler [i386 amd64 ], cli-common-dev (>= 0.4.0)[ i386 amd64 ], mono-gac [i386 amd64 ], monodoc-base (>= 1.1.9) [i386 amd64]
+Build-Depends: debhelper (>= 4.2.28), cdbs, libcap-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64 !netbsd-i386], libgdbm-dev, libglib2.0-dev (>= 2.4), libgtk2.0-dev (>= 2.4), libglade2-dev, libexpat-dev, libdaemon-dev, libdbus-1-dev (>= 0.60), python2.4 (>= 2.4), python2.4-gdbm, python2.4-dbus, python2.4-gtk2, libqt3-mt-dev, libqt4-dev, xmltoman
 Standards-Version: 3.6.2
 
 Package: avahi-daemon
@@ -275,34 +275,6 @@
  This package contains the development headers for the interface
  to integrate the Avahi libraries  into a QT4 main loop application.
 
-Package: monodoc-avahi-manual
-Architecture: all
-Depends: monodoc-manual
-Description: compiled XML documentation for the CLI bindings of avahi
- The MonoDoc Project is the documentation framework of the Mono project which
- provides detailed API documentation for all Mono components and the Mono CLI
- implementation.
- .
- This packages contains the compiled XML documentation for
- the CLI bindings of Avahi for MonoDoc.
-
-Package: libavahi1.0-cil
-Section: libs
-Architecture: all
-Depends: ${cli:Depends}, libavahi-client3, libavahi-glib1
-Conflicts: libavahi-cil
-Replaces: libavahi-cil
-Provides: libavahi-cil
-Description: CLI bindings for Avahi
- Avahi is a fully LGPL framework for Multicast DNS Service Discovery.
- It allows programs to publish and discover services and hosts
- running on a local network with no specific configuration.  For
- example you can plug into a network and instantly find printers to
- print to, files to look at and people to talk to.
- .
- This package contains the CLI bindings to Avahi, allowing you to use Avahi from
- Mono languages (e.g. C# and Boo).
-
 Package: libavahi-compat-howl0
 Section: libs
 Architecture: any

Deleted: packages/unstable/avahi/debian/libavahi1.0-cil.install
===================================================================
--- packages/unstable/avahi/debian/libavahi1.0-cil.install	2006-05-10 09:03:28 UTC (rev 827)
+++ packages/unstable/avahi/debian/libavahi1.0-cil.install	2006-05-10 09:06:13 UTC (rev 828)
@@ -1,2 +0,0 @@
-debian/tmp/usr/lib/cli/avahi-sharp-1.0/*
-debian/tmp/usr/lib/pkgconfig/avahi-sharp.pc

Deleted: packages/unstable/avahi/debian/libavahi1.0-cil.installcligac
===================================================================
--- packages/unstable/avahi/debian/libavahi1.0-cil.installcligac	2006-05-10 09:03:28 UTC (rev 827)
+++ packages/unstable/avahi/debian/libavahi1.0-cil.installcligac	2006-05-10 09:06:13 UTC (rev 828)
@@ -1 +0,0 @@
-/usr/lib/cli/avahi-sharp-1.0/avahi-sharp.dll

Deleted: packages/unstable/avahi/debian/monodoc-avahi-manual.install
===================================================================
--- packages/unstable/avahi/debian/monodoc-avahi-manual.install	2006-05-10 09:03:28 UTC (rev 827)
+++ packages/unstable/avahi/debian/monodoc-avahi-manual.install	2006-05-10 09:06:13 UTC (rev 828)
@@ -1 +0,0 @@
-debian/tmp/usr/lib/monodoc/sources /usr/lib/monodoc

Deleted: packages/unstable/avahi/debian/monodoc-avahi-manual.postinst
===================================================================
--- packages/unstable/avahi/debian/monodoc-avahi-manual.postinst	2006-05-10 09:03:28 UTC (rev 827)
+++ packages/unstable/avahi/debian/monodoc-avahi-manual.postinst	2006-05-10 09:06:13 UTC (rev 828)
@@ -1,10 +0,0 @@
-#!/bin/sh
-set -e
-
-if [ -x /usr/lib/monodoc/browser.exe ]; then
-        echo "generating monodoc search index..."
-        monodoc --make-index > /dev/null
-fi
-
-#DEBHELPER#
-

Modified: packages/unstable/avahi/debian/rules
===================================================================
--- packages/unstable/avahi/debian/rules	2006-05-10 09:03:28 UTC (rev 827)
+++ packages/unstable/avahi/debian/rules	2006-05-10 09:06:13 UTC (rev 828)
@@ -1,17 +1,5 @@
 #! /usr/bin/make -f 
 
-# Filter out the mono packages on architectures that don't support it
-#
-include /usr/share/cdbs/1/rules/buildvars.mk
-ifeq (,$(filter $(DEB_BUILD_ARCH), amd64 i386))
-  DEB_INDEP_PACKAGES := \
-    $(filter-out libavahi1.0-cil,$(DEB_INDEP_PACKAGES))
-  DEB_INDEP_PACKAGES := \
-    $(filter-out monodoc-avahi-manual,$(DEB_INDEP_PACKAGES))
-  DEB_INDEP_REGULAR_PACKAGES := $(DEB_INDEP_PACKAGES)
-  MONO_FLAGS=--disable-mono --disable-monodoc
-endif
-
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
@@ -25,7 +13,7 @@
 LDFLAGS += -Wl,-z,defs -Wl,-O1
 
 DEB_CONFIGURE_EXTRA_FLAGS += --enable-compat-libdns_sd --enable-compat-howl \
-                            $(MONO_FLAGS)
+                            --disable-mono --disable-monodoc
 
 
 DEB_INSTALL_DOCS_ALL += docs/README docs/NEWS
@@ -34,23 +22,6 @@
                          debian/libavahi-core4/usr/lib \
                          debian/libavahi-client3/usr/lib
 
-export MONO_SHARED_DIR=$(CURDIR)
-
-install/libavahi1.0-cil::
-	# copy files to the location required by the CLI policy
-	mkdir -p debian/tmp/usr/lib/cli/avahi-sharp-1.0
-	cp avahi-sharp/avahi-sharp.dll debian/tmp/usr/lib/cli/avahi-sharp-1.0
-	cp avahi-sharp/avahi-sharp.dll.config debian/tmp/usr/lib/cli/avahi-sharp-1.0
-	cp avahi-sharp/avahi-sharp.dll.mdb debian/tmp/usr/lib/cli/avahi-sharp-1.0
-
-binary-install/libavahi1.0-cil::
-	dh_installcligac
-
-binary-predeb/libavahi1.0-cil::
-	-find debian/libavahi1.0-cil -type f -name "*.dll" -or -name "*.mdb" -or -name "*.cs" -or -name "*.config" | xargs chmod -x
-	dh_makeclilibs -m0.6.5
-	dh_clideps -d
-
 binary-install/avahi-discover::
 	dh_python -p$(cdbs_curpkg)
 	rm -f debian/tmp/usr/lib/python*/site-packages/avahi/*.py[co]
@@ -61,6 +32,3 @@
 
 binary-fixup/avahi-daemon binary-fixup/avahi-dnsconfd::
 	chmod +x debian/$(cdbs_curpkg)/etc/dbus-1/event.d/*
-
-clean::
-	rm -rf $(MONO_SHARED_DIR)/.wapi

More information about the Pkg-utopia-commits mailing list