rev 11888 - branches/kde4/packages/kdebindings/debian

Sune Vuorela pusling-guest at alioth.debian.org
Sat Aug 9 12:14:47 UTC 2008


Author: pusling-guest
Date: 2008-08-09 12:14:46 +0000 (Sat, 09 Aug 2008)
New Revision: 11888

Added:
   branches/kde4/packages/kdebindings/debian/libkhtml2.0-cil.installcligac
   branches/kde4/packages/kdebindings/debian/libkimono4.1-cil.installcligac
   branches/kde4/packages/kdebindings/debian/libqyoto4.4-cil.installcligac
Modified:
   branches/kde4/packages/kdebindings/debian/control
   branches/kde4/packages/kdebindings/debian/rules
Log:
adapting mono stuff to mono policy

Modified: branches/kde4/packages/kdebindings/debian/control
===================================================================
--- branches/kde4/packages/kdebindings/debian/control	2008-08-09 12:13:15 UTC (rev 11887)
+++ branches/kde4/packages/kdebindings/debian/control	2008-08-09 12:14:46 UTC (rev 11888)
@@ -5,7 +5,11 @@
 Build-Depends: debhelper (>= 5), cmake (>= 2.4.5), quilt,
  kdelibs5-dev (>> 4:4.0), libphonon-dev, libqt4-opengl-dev,
  python, python-all-dev, sip4, python-sip4-dev, python-qt4-dev,
- ruby1.8-dev,ruby1.8 , mono-gac, mono-gmcs, libmono-dev, cdbs, cli-common-dev,
+ ruby1.8-dev,ruby1.8 , 
+ mono-gac [i386 kfreebsd-i386 powerpc amd64 kfreebsd-amd64 ia64 arm armeb armel sparc s390],
+ mono-gmcs [i386 kfreebsd-i386 powerpc amd64 kfreebsd-amd64 ia64 arm armeb armel sparc s390], libmono-dev [i386 kfreebsd-i386 powerpc amd64 kfreebsd-amd64 ia64 arm armeb armel sparc s390],
+ cdbs, 
+ cli-common-dev [i386 kfreebsd-i386 powerpc amd64 kfreebsd-amd64 ia64 arm armeb armel sparc s390],
  okular-dev, kdebase-workspace-dev
 Uploaders: Vincent Fourmond <fourmond at debian.org>, Torsten Marek <shlomme at debian.org>, Adeodato Simó <dato at net.com.org.es>
 XS-Python-Version: >= 2.4
@@ -148,39 +152,27 @@
  This package contains documentation for PyKDE4, and some example code
  showing how to use it.
 
-Package: kimono
+Package: libqyoto4.4-cil
 Section: libs
-Depends: libkhtml2.0-cil, libkde-dotnet4.1-cil
-Architecture: any
-Description: kde4 bindings for c-sharp, metapackage
-
-Package: qyoto
-Section: libs
-Depends: libqt-dotnet4.4-cil
-Architecture: any
-Description: qt4 bindings for c-sharp, metapackage
-
-Package: libqt-dotnet4.4-cil
-Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${cli:Depends}
-Architecture: any
+Architecture: i386 kfreebsd-i386 powerpc amd64 kfreebsd-amd64 ia64 arm armeb armel sparc s390
 Description: qt4 bindings for csharp
 
 Package: qyoto-dev
 Section: libdevel
 Depends: ${shlibs:Depends}, libqt-dotnet4.4-cil (= ${binary:Version}), ${cli:Depends}
-Architecture: any
+Architecture: i386 kfreebsd-i386 powerpc amd64 kfreebsd-amd64 ia64 arm armeb armel sparc s390
 Description: development files for qt4 bindings for csharp
 
-Package: libkde-dotnet4.1-cil
+Package: libkimono4.1-cil
 Section: libs
 Depends: libqt-dotnet4.4-cil (= ${binary:Version}), ${cli:Depends}
-Architecture: any 
+Architecture: i386 kfreebsd-i386 powerpc amd64 kfreebsd-amd64 ia64 arm armeb armel sparc s390
 Description: kde4 bindings for c-sharp
 
 Package: libkhtml2.0-cil
 Section: libs
-Depends: libqt-dotnet4.4-cil (= ${binary:Version}), libkde-dotnet4.1-cil (= ${binary:Version}), ${cli:Depends}
-Architecture: any
+Depends: libqt-dotnet4.4-cil (= ${binary:Version}), libkimono4.1-cil (= ${binary:Version}), ${cli:Depends}
+Architecture: i386 kfreebsd-i386 powerpc amd64 kfreebsd-amd64 ia64 arm armeb armel sparc s390
 Description: kde4 bindings for c-sharp, khtml edition
 

Added: branches/kde4/packages/kdebindings/debian/libkhtml2.0-cil.installcligac
===================================================================
--- branches/kde4/packages/kdebindings/debian/libkhtml2.0-cil.installcligac	                        (rev 0)
+++ branches/kde4/packages/kdebindings/debian/libkhtml2.0-cil.installcligac	2008-08-09 12:14:46 UTC (rev 11888)
@@ -0,0 +1 @@
+/usr/lib/cli/kdebindings-2.0/khtml.dll

Added: branches/kde4/packages/kdebindings/debian/libkimono4.1-cil.installcligac
===================================================================
--- branches/kde4/packages/kdebindings/debian/libkimono4.1-cil.installcligac	                        (rev 0)
+++ branches/kde4/packages/kdebindings/debian/libkimono4.1-cil.installcligac	2008-08-09 12:14:46 UTC (rev 11888)
@@ -0,0 +1 @@
+/usr/lib/cli/kdebindings-4.1/kde-dotnet.dll

Added: branches/kde4/packages/kdebindings/debian/libqyoto4.4-cil.installcligac
===================================================================
--- branches/kde4/packages/kdebindings/debian/libqyoto4.4-cil.installcligac	                        (rev 0)
+++ branches/kde4/packages/kdebindings/debian/libqyoto4.4-cil.installcligac	2008-08-09 12:14:46 UTC (rev 11888)
@@ -0,0 +1 @@
+/usr/lib/cli/kdebindings-4.4/qt-dotnet.dll

Modified: branches/kde4/packages/kdebindings/debian/rules
===================================================================
--- branches/kde4/packages/kdebindings/debian/rules	2008-08-09 12:13:15 UTC (rev 11887)
+++ branches/kde4/packages/kdebindings/debian/rules	2008-08-09 12:14:46 UTC (rev 11888)
@@ -3,7 +3,19 @@
 include /usr/share/quilt/quilt.make
 include /usr/share/cdbs/1/rules/utils.mk
 
+ARCH=$(shell dpkg-architecture -qDEB_HOST_ARCH)
+MONOARCHS= "i386 kfreebsd-i386 powerpc amd64 kfreebsd-amd64 ia64 arm armeb armel sparc s390"
 
+ifneq (,$(findstring $(ARCH),$(MONOARCHS)))
+MONOFLAGS=-DENABLE_KHTML_SHARP=ON 
+MONOTARGET=monospecific
+else
+MONO=OFF
+MONOFLAGS=-DENABLE_QYOTO=off
+
+endif
+
+
 ##
 
 cmake_flags := \
@@ -33,11 +45,11 @@
 cmake_flags += \
 	-DENABLE_PYKDE4=OFF\
 	-DENABLE_SOPRANO_SMOKE=ON \
-	-DENABLE_KHTML_SHARP=ON \
     -DENABLE_NEPOMUK_SMOKE=ON \
     -DENABLE_NEPOMUK_RUBY=ON \
 	-DCUSTOM_RUBY_SITE_LIB_DIR=/usr/lib/ruby/1.8/ \
-	-DCUSTOM_RUBY_SITE_ARCH_DIR=/usr/lib/ruby/1.8/$(RUBY_SITEARCH)
+	-DCUSTOM_RUBY_SITE_ARCH_DIR=/usr/lib/ruby/1.8/$(RUBY_SITEARCH) \
+	$(MONOFLAGS)
 
 ##
 
@@ -78,7 +90,7 @@
 
 ##
 $(patsubst %,build-stamp-python-%,$(pyversions)): $(patsubst %,$(objdir)/python/pykde4-%/Makefile,$(pyversions))
-	$(MAKE) -C $(objdir)/python/pykde4-$(subst build-stamp-python-,,$@)
+	$(MAKE) -j6 -C $(objdir)/python/pykde4-$(subst build-stamp-python-,,$@)
 	touch $@
 
 
@@ -113,22 +125,22 @@
 install-generic:
 	$(MAKE) -C $(objdir) install DESTDIR=$(CURDIR)/debian/tmp
 
-install: dh_install mono-is-a-piece-of-weirdo
+install: dh_install $(MONOTARGET)
 
-mono-is-a-piece-of-weirdo:
+monospecific:
 	install -d debian/libkhtml2.0-cil/usr/lib/cli/kdebindings-2.0
-	install -d debian/libkde-dotnet4.1-cil/usr/lib/cli/kdebindings-4.1
-	install -d debian/libqt-dotnet4.4-cil/usr/lib/cli/kdebindings-4.4
+	install -d debian/libkimono4.1-cil/usr/lib/cli/kdebindings-4.1
+	install -d debian/libqyoto4.4-cil/usr/lib/cli/kdebindings-4.4
 	install -D -m 644 $(objdir)/lib/khtml.dll debian/libkhtml2.0-cil/usr/lib/cli/kdebindings-2.0/
 	install -D -m 644 $(objdir)/lib/libkhtml-sharp.so debian/libkhtml2.0-cil/usr/lib/cli/kdebindings-2.0/
 	install -D -m 644 $(CURDIR)/debian/csharp/khtml.dll.config debian/libkhtml2.0-cil/usr/lib/cli/kdebindings-2.0/
-	install -D -m 644 $(objdir)/lib/kde-dotnet.dll debian/libkde-dotnet4.1-cil/usr/lib/cli/kdebindings-4.1/
-	install -D -m 644 $(objdir)/lib/libkimono.so debian/libkde-dotnet4.1-cil/usr/lib/cli/kdebindings-4.1/
-	install -D -m 644 $(CURDIR)/debian/csharp/kde-dotnet.dll.config debian/libkde-dotnet4.1-cil/usr/lib/cli/kdebindings-4.1/
-	install -D -m 644 $(objdir)/lib/qt-dotnet.dll debian/libqt-dotnet4.4-cil/usr/lib/cli/kdebindings-4.4/
-	install -D -m 644 $(objdir)/lib/libqyoto.so debian/libqt-dotnet4.4-cil/usr/lib/cli/kdebindings-4.4/
-	install -D -m 644 $(objdir)/lib/libqyotoshared.so debian/libqt-dotnet4.4-cil/usr/lib/cli/kdebindings-4.4/
-	install -D -m 644 $(CURDIR)/debian/csharp/qt-dotnet.dll.config debian/libkde-dotnet4.1-cil/usr/lib/cli/kdebindings-4.1/
+	install -D -m 644 $(objdir)/lib/kde-dotnet.dll debian/libkimono4.1-cil/usr/lib/cli/kdebindings-4.1/
+	install -D -m 644 $(objdir)/lib/libkimono.so debian/libkimono4.1-cil/usr/lib/cli/kdebindings-4.1/
+	install -D -m 644 $(CURDIR)/debian/csharp/kde-dotnet.dll.config debian/libkimono4.1-cil/usr/lib/cli/kdebindings-4.1/
+	install -D -m 644 $(objdir)/lib/qt-dotnet.dll debian/libqyoto4.4-cil/usr/lib/cli/kdebindings-4.4/
+	install -D -m 644 $(objdir)/lib/libqyoto.so debian/libqyoto4.4-cil/usr/lib/cli/kdebindings-4.4/
+	install -D -m 644 $(objdir)/lib/libqyotoshared.so debian/libqyoto4.4-cil/usr/lib/cli/kdebindings-4.4/
+	install -D -m 644 $(CURDIR)/debian/csharp/qt-dotnet.dll.config debian/libqyoto4.4-cil/usr/lib/cli/kdebindings-4.4/
 	dh_makeclilibs -V
 	dh_clideps
 	dh_installcligac




More information about the pkg-kde-commits mailing list