rev 13078 - in branches/kde4.2/packages/kdebindings/debian: . patches
Modestas Vainius
modax-guest at alioth.debian.org
Wed Dec 31 07:45:16 UTC 2008
Author: modax-guest
Date: 2008-12-31 07:45:15 +0000 (Wed, 31 Dec 2008)
New Revision: 13078
Added:
branches/kde4.2/packages/kdebindings/debian/libkhtml2.0-cil.install
branches/kde4.2/packages/kdebindings/debian/libnepomuk2.2-cil.install
branches/kde4.2/packages/kdebindings/debian/libplasma2.0-cil.install
branches/kde4.2/packages/kdebindings/debian/libqtscript2.2-cil.install
branches/kde4.2/packages/kdebindings/debian/libqtuitools2.2-cil.install
branches/kde4.2/packages/kdebindings/debian/libqtwebkit2.2-cil.install
branches/kde4.2/packages/kdebindings/debian/libqyoto4.4-cil.install
branches/kde4.2/packages/kdebindings/debian/libsoprano2.0-cil.install
branches/kde4.2/packages/kdebindings/debian/patches/10_fix_kimono_dllimports.diff
branches/kde4.2/packages/kdebindings/debian/pyversions
Removed:
branches/kde4.2/packages/kdebindings/debian/libqt-dotnet4.4-cil.install
branches/kde4.2/packages/kdebindings/debian/patches/97_fix_target_link_libraries.diff
Modified:
branches/kde4.2/packages/kdebindings/debian/changelog
branches/kde4.2/packages/kdebindings/debian/compat
branches/kde4.2/packages/kdebindings/debian/control
branches/kde4.2/packages/kdebindings/debian/libkimono4.1-cil.install
branches/kde4.2/packages/kdebindings/debian/patches/series
branches/kde4.2/packages/kdebindings/debian/rules
Log:
- 99_enable_okular_plasma.diff - remove, not needed.
* Limit Mono dh helpers to Mono packages only.
* Require debhelper << 7.1 until mono dh helpers are ported.
* Add 10_fix_kimono_dllimports.diff patch to fix misnamed libkimono
DllImports.
* Add myself to Uploaders.
* Do not build python 2.4 bindings anymore.
* Switch to debhelper v7 for more flexible install file handling:
- get rid of manual mono specific installs in debian/rules. Use install
files instead;
- no longer pass --sourcedir=debian/tmp to dh_install.
* Implement autodiscovery of mono L_PATHS and generally try to hardcode as
less mono paths as possible.
* Get rid of useless cdbs include and build dependency.
* Use simplier approach for debian/rules binary-* target handling.
* Run dh_installdirs in install-pre target to make mono helpers more silent.
Modified: branches/kde4.2/packages/kdebindings/debian/changelog
===================================================================
--- branches/kde4.2/packages/kdebindings/debian/changelog 2008-12-30 21:20:17 UTC (rev 13077)
+++ branches/kde4.2/packages/kdebindings/debian/changelog 2008-12-31 07:45:15 UTC (rev 13078)
@@ -1,4 +1,4 @@
-kdebindings (4:4.1.86+svn902532-0r1) UNRELEASED; urgency=low
+kdebindings (4:4.1.86+svn903598-0r1) UNRELEASED; urgency=low
* New upstream development snapshot.
@@ -11,7 +11,7 @@
changes;
- 03_csharp_dont_use_qyotoshared_directly.diff - fix offsets;
- 97_fix_target_link_libraries.diff - remove, merged upstream;
- - 99_enable_okular_plasma.diff - disable for now.
+ - 99_enable_okular_plasma.diff - remove, not needed.
* Build depend on libplasma-dev to build plasma bindings.
* Bump KDE build depends to 4.1.85.
* Remove explicit cmake from build depends.
@@ -32,7 +32,21 @@
respectively.
* Update install files.
* Bump soprano build depend to 2.1.64+svn.
- * Add 97_fix_target_link_libraries.diff patch.
+ * Limit Mono dh helpers to Mono packages only.
+ * Require debhelper << 7.1 until mono dh helpers are ported.
+ * Add 10_fix_kimono_dllimports.diff patch to fix misnamed libkimono
+ DllImports.
+ * Add myself to Uploaders.
+ * Do not build python 2.4 bindings anymore.
+ * Switch to debhelper v7 for more flexible install file handling:
+ - get rid of manual mono specific installs in debian/rules. Use install
+ files instead;
+ - no longer pass --sourcedir=debian/tmp to dh_install.
+ * Implement autodiscovery of mono L_PATHS and generally try to hardcode as
+ less mono paths as possible.
+ * Get rid of useless cdbs include and build dependency.
+ * Use simplier approach for debian/rules binary-* target handling.
+ * Run dh_installdirs in install-pre target to make mono helpers more silent.
!! DISCLAIMER !! Changes below are sort of "not really sure what I was doing".
@@ -53,7 +67,7 @@
* Change mono build-dep to mono-devel (>= 2.0.1) for mono 2.0 transition
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Sun, 21 Dec 2008 12:21:53 +0200
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Wed, 31 Dec 2008 04:09:13 +0200
kdebindings (4:4.1.3-2) experimental; urgency=low
Modified: branches/kde4.2/packages/kdebindings/debian/compat
===================================================================
--- branches/kde4.2/packages/kdebindings/debian/compat 2008-12-30 21:20:17 UTC (rev 13077)
+++ branches/kde4.2/packages/kdebindings/debian/compat 2008-12-31 07:45:15 UTC (rev 13078)
@@ -1 +1 @@
-5
+7
Modified: branches/kde4.2/packages/kdebindings/debian/control
===================================================================
--- branches/kde4.2/packages/kdebindings/debian/control 2008-12-30 21:20:17 UTC (rev 13077)
+++ branches/kde4.2/packages/kdebindings/debian/control 2008-12-31 07:45:15 UTC (rev 13078)
@@ -2,15 +2,16 @@
Section: kde
Priority: optional
Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
-Build-Depends: debhelper (>= 6.0.7~), quilt,
+Build-Depends: debhelper (>= 7), quilt,
kdelibs5-dev (>= 4:4.1.85), libplasma-dev (>= 4:4.1.85), libphonon-dev (>= 4:4.2.80), kdebase-workspace-dev (>= 4:4.1.85),
libsoprano-dev (>= 2.1.64+svn),
- python, python-all-dev, sip4 (>= 4.7.8), python-sip4-dev (>= 4.7.8), python-qt4-dev (>= 4.4.4),
- ruby1.8-dev, ruby1.8 , python-support (>= 0.6), cdbs,
+ python, python-all-dev, sip4 (>= 4.7.8), python-sip4-dev (>= 4.7.8), python-qt4 (>= 4.4.4), python-qt4-dev (>= 4.4.4),
+ ruby1.8-dev, ruby1.8, python-support (>= 0.6),
mono-devel (>= 2.0.1) [i386 kfreebsd-i386 powerpc amd64 kfreebsd-amd64 ia64 arm armeb armel sparc s390],
cli-common-dev (>= 0.5.4) [i386 kfreebsd-i386 powerpc amd64 kfreebsd-amd64 ia64 arm armeb armel sparc s390],
okular-dev (>= 4:4.1.81)
-Uploaders: Vincent Fourmond <fourmond at debian.org>, Torsten Marek <shlomme at debian.org>, Sune Vuorela <debian at pusling.com>, David Palacio <dpalacio at uninorte.edu.co>
+Build-Conflicts: debhelper (>= 7.1)
+Uploaders: Vincent Fourmond <fourmond at debian.org>, Torsten Marek <shlomme at debian.org>, Sune Vuorela <debian at pusling.com>, David Palacio <dpalacio at uninorte.edu.co>, Modestas Vainius <modestas at vainius.eu>
Standards-Version: 3.8.0
Homepage: http://www.kde.org
Vcs-Svn: svn://svn.debian.org/svn/pkg-kde/branches/kde4/packages/kdebindings
@@ -228,7 +229,7 @@
Package: qyoto-dev
Section: libdevel
-Depends: ${shlibs:Depends}, libqyoto4.4-cil (= ${binary:Version}), ${cli:Depends}
+Depends: ${shlibs:Depends}, libqyoto4.4-cil (= ${binary:Version})
Architecture: i386 kfreebsd-i386 powerpc amd64 kfreebsd-amd64 ia64 arm armeb armel sparc s390 lpia
Description: development tools for Qt CLI bindings
This package provides csuic and other tools to help building
Added: branches/kde4.2/packages/kdebindings/debian/libkhtml2.0-cil.install
===================================================================
--- branches/kde4.2/packages/kdebindings/debian/libkhtml2.0-cil.install (rev 0)
+++ branches/kde4.2/packages/kdebindings/debian/libkhtml2.0-cil.install 2008-12-31 07:45:15 UTC (rev 13078)
@@ -0,0 +1,3 @@
+debian/csharp/khtml-dll.dll.config usr/lib/cli/kdebindings-2.0/
+usr/lib/libkhtml-sharp.so usr/lib/cli/kdebindings-2.0/
+usr/lib/mono/gac/khtml-dll/*/khtml-dll.dll usr/lib/cli/kdebindings-2.0/
Modified: branches/kde4.2/packages/kdebindings/debian/libkimono4.1-cil.install
===================================================================
--- branches/kde4.2/packages/kdebindings/debian/libkimono4.1-cil.install 2008-12-30 21:20:17 UTC (rev 13077)
+++ branches/kde4.2/packages/kdebindings/debian/libkimono4.1-cil.install 2008-12-31 07:45:15 UTC (rev 13078)
@@ -1 +1,5 @@
+debian/csharp/kde-dotnet.dll.config usr/lib/cli/kdebindings-4.1/
+usr/lib/libkimono.so usr/lib/cli/kdebindings-4.1/
+usr/lib/mono/gac/kde-dotnet/*/kde-dotnet.dll usr/lib/cli/kdebindings-4.1/
+
usr/lib/kde4/kimonopluginfactory.so
Added: branches/kde4.2/packages/kdebindings/debian/libnepomuk2.2-cil.install
===================================================================
--- branches/kde4.2/packages/kdebindings/debian/libnepomuk2.2-cil.install (rev 0)
+++ branches/kde4.2/packages/kdebindings/debian/libnepomuk2.2-cil.install 2008-12-31 07:45:15 UTC (rev 13078)
@@ -0,0 +1,3 @@
+debian/csharp/nepomuk-dll.dll.config usr/lib/cli/kdebindings-2.2/
+usr/lib/libnepomuk-sharp.so usr/lib/cli/kdebindings-2.2/
+usr/lib/mono/gac/nepomuk-dll/*/nepomuk-dll.dll usr/lib/cli/kdebindings-2.2/
Added: branches/kde4.2/packages/kdebindings/debian/libplasma2.0-cil.install
===================================================================
--- branches/kde4.2/packages/kdebindings/debian/libplasma2.0-cil.install (rev 0)
+++ branches/kde4.2/packages/kdebindings/debian/libplasma2.0-cil.install 2008-12-31 07:45:15 UTC (rev 13078)
@@ -0,0 +1,3 @@
+debian/csharp/plasma-dll.dll.config usr/lib/cli/kdebindings-2.0/
+usr/lib/libplasma-sharp.so usr/lib/cli/kdebindings-2.0/
+usr/lib/mono/gac/plasma-dll/*/plasma-dll.dll usr/lib/cli/kdebindings-2.0/
Deleted: branches/kde4.2/packages/kdebindings/debian/libqt-dotnet4.4-cil.install
Added: branches/kde4.2/packages/kdebindings/debian/libqtscript2.2-cil.install
===================================================================
--- branches/kde4.2/packages/kdebindings/debian/libqtscript2.2-cil.install (rev 0)
+++ branches/kde4.2/packages/kdebindings/debian/libqtscript2.2-cil.install 2008-12-31 07:45:15 UTC (rev 13078)
@@ -0,0 +1,3 @@
+debian/csharp/qtscript.dll.config usr/lib/cli/kdebindings-2.2/
+usr/lib/libqtscript-sharp.so usr/lib/cli/kdebindings-2.2/
+usr/lib/mono/gac/qtscript/*/qtscript.dll usr/lib/cli/kdebindings-2.2/
Added: branches/kde4.2/packages/kdebindings/debian/libqtuitools2.2-cil.install
===================================================================
--- branches/kde4.2/packages/kdebindings/debian/libqtuitools2.2-cil.install (rev 0)
+++ branches/kde4.2/packages/kdebindings/debian/libqtuitools2.2-cil.install 2008-12-31 07:45:15 UTC (rev 13078)
@@ -0,0 +1,3 @@
+debian/csharp/qtuitools.dll.config usr/lib/cli/kdebindings-2.2/
+usr/lib/libqtuitools-sharp.so usr/lib/cli/kdebindings-2.2/
+usr/lib/mono/gac/qtuitools/*/qtuitools.dll usr/lib/cli/kdebindings-2.2/
Added: branches/kde4.2/packages/kdebindings/debian/libqtwebkit2.2-cil.install
===================================================================
--- branches/kde4.2/packages/kdebindings/debian/libqtwebkit2.2-cil.install (rev 0)
+++ branches/kde4.2/packages/kdebindings/debian/libqtwebkit2.2-cil.install 2008-12-31 07:45:15 UTC (rev 13078)
@@ -0,0 +1,3 @@
+debian/csharp/qtwebkit.dll.config usr/lib/cli/kdebindings-2.2/
+usr/lib/libqtwebkit-sharp.so usr/lib/cli/kdebindings-2.2/
+usr/lib/mono/gac/qtwebkit/*/qtwebkit.dll usr/lib/cli/kdebindings-2.2/
Added: branches/kde4.2/packages/kdebindings/debian/libqyoto4.4-cil.install
===================================================================
--- branches/kde4.2/packages/kdebindings/debian/libqyoto4.4-cil.install (rev 0)
+++ branches/kde4.2/packages/kdebindings/debian/libqyoto4.4-cil.install 2008-12-31 07:45:15 UTC (rev 13078)
@@ -0,0 +1,3 @@
+debian/csharp/qt-dotnet.dll.config usr/lib/cli/kdebindings-4.4/
+usr/lib/libqyoto.so usr/lib/cli/kdebindings-4.4/
+usr/lib/mono/gac/qt-dotnet/*/qt-dotnet.dll usr/lib/cli/kdebindings-4.4/
Added: branches/kde4.2/packages/kdebindings/debian/libsoprano2.0-cil.install
===================================================================
--- branches/kde4.2/packages/kdebindings/debian/libsoprano2.0-cil.install (rev 0)
+++ branches/kde4.2/packages/kdebindings/debian/libsoprano2.0-cil.install 2008-12-31 07:45:15 UTC (rev 13078)
@@ -0,0 +1,3 @@
+debian/csharp/soprano.dll.config usr/lib/cli/kdebindings-2.0/
+usr/lib/libsoprano-sharp.so usr/lib/cli/kdebindings-2.0/
+usr/lib/mono/gac/soprano/*/soprano.dll usr/lib/cli/kdebindings-2.0/
Added: branches/kde4.2/packages/kdebindings/debian/patches/10_fix_kimono_dllimports.diff
===================================================================
--- branches/kde4.2/packages/kdebindings/debian/patches/10_fix_kimono_dllimports.diff (rev 0)
+++ branches/kde4.2/packages/kdebindings/debian/patches/10_fix_kimono_dllimports.diff 2008-12-31 07:45:15 UTC (rev 13078)
@@ -0,0 +1,22 @@
+Kimono external library should be imported as libkimono
+
+--- a/csharp/kimono/kde/KUrlExtras.cs
++++ b/csharp/kimono/kde/KUrlExtras.cs
+@@ -13,13 +13,13 @@
+ public class List : List<KUrl> {
+ delegate bool GetNextDictionaryEntryFn(ref IntPtr key, ref IntPtr value);
+
+- [DllImport("kimono", CharSet=CharSet.Ansi)]
++ [DllImport("libkimono", CharSet=CharSet.Ansi)]
+ static extern void KUrlListPopulateMimeData(SmokeMarshallers.NoArgs getNextItem, IntPtr mimeData, GetNextDictionaryEntryFn getNextDictionaryEntry, uint flags);
+- [DllImport("kimono", CharSet=CharSet.Ansi)]
++ [DllImport("libkimono", CharSet=CharSet.Ansi)]
+ static extern void KUrlListMimeDataTypes(SmokeMarshallers.FromIntPtr fn);
+- [DllImport("kimono", CharSet=CharSet.Ansi)]
++ [DllImport("libkimono", CharSet=CharSet.Ansi)]
+ static extern bool KUrlListCanDecode(IntPtr mimeData);
+- [DllImport("kimono", CharSet=CharSet.Ansi)]
++ [DllImport("libkimono", CharSet=CharSet.Ansi)]
+ static extern void KUrlListFromMimeData(SmokeMarshallers.FromIntPtr addfn, IntPtr mimeData, GetNextDictionaryEntryFn getNextDictionaryEntry);
+
+ public List() {}
Deleted: branches/kde4.2/packages/kdebindings/debian/patches/97_fix_target_link_libraries.diff
Modified: branches/kde4.2/packages/kdebindings/debian/patches/series
===================================================================
--- branches/kde4.2/packages/kdebindings/debian/patches/series 2008-12-30 21:20:17 UTC (rev 13077)
+++ branches/kde4.2/packages/kdebindings/debian/patches/series 2008-12-31 07:45:15 UTC (rev 13078)
@@ -7,4 +7,4 @@
07_fix_kpythonpluginfactory_build.diff
08_csharp_plasma_examples.diff
09_build_ruby_nepomuk.diff
-#97_fix_target_link_libraries.diff
+10_fix_kimono_dllimports.diff
Added: branches/kde4.2/packages/kdebindings/debian/pyversions
===================================================================
--- branches/kde4.2/packages/kdebindings/debian/pyversions (rev 0)
+++ branches/kde4.2/packages/kdebindings/debian/pyversions 2008-12-31 07:45:15 UTC (rev 13078)
@@ -0,0 +1 @@
+2.5-
Modified: branches/kde4.2/packages/kdebindings/debian/rules
===================================================================
--- branches/kde4.2/packages/kdebindings/debian/rules 2008-12-30 21:20:17 UTC (rev 13077)
+++ branches/kde4.2/packages/kdebindings/debian/rules 2008-12-31 07:45:15 UTC (rev 13078)
@@ -1,10 +1,14 @@
#! /usr/bin/make -f
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 lpia ia64 arm armeb armel sparc s390"
+ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH)
+MONOARCHS := "i386 kfreebsd-i386 powerpc amd64 kfreebsd-amd64 lpia ia64 arm armeb armel sparc s390"
+MONOPACKAGES := $(shell dh_listpackages | grep '\-cil$$') plasma-scriptengine-kimono
+DH_MONOPACKAGES := $(patsubst %,-p%,$(MONOPACKAGES))
+DH_NO_MONOPACKAGES := $(patsubst %,-N%,$(MONOPACKAGES))
+MONO_L_PATHS = $(shell find $(patsubst %,debian/%,$(MONOPACKAGES)) -path '*/usr/lib/cli/*' -name '*.dll' -type f -printf '%h:')
+
export MONO_DISABLE_SHM = 1
MONOHOME=$(CURDIR)/debian/monohome
export MONO_SHARED_DIR = $(MONOHOME)
@@ -80,7 +84,7 @@
##
pydefault := $(shell pyversions --default)
-pyversions := $(shell pyversions --supported --version)
+pyversions := $(shell pysupport-parseversions debian/pyversions)
cmake_flags += -DPYTHON_EXECUTABLE=/usr/bin/$(pydefault)
##
@@ -129,6 +133,8 @@
install-pre:
dh_testdir
dh_testroot
+ dh_prep
+ dh_installdirs
$(patsubst %,install-python-%,$(pyversions)): install-pre
$(MAKE) -C $(objdir)/python/pykde4-$(subst install-python-,,$@) install DESTDIR=$(CURDIR)/debian/tmp; \
@@ -141,74 +147,30 @@
install -D -m 755 debian/tmp/usr/share/kde4/apps/pykde4/pykdeuic4.py \
debian/python-kde4-dev/usr/bin/pykdeuic4
-monospecific: install-generic install-pre
- #khtml
- install -d debian/libkhtml2.0-cil/usr/lib/cli/kdebindings-2.0
- install -D -m 644 $(DEST_USR_LIB)/mono/2.0/khtml-dll.dll debian/libkhtml2.0-cil/usr/lib/cli/kdebindings-2.0/
- install -D -m 644 $(DEST_USR_LIB)/libkhtml-sharp.so debian/libkhtml2.0-cil/usr/lib/cli/kdebindings-2.0/
- install -D -m 644 $(CURDIR)/debian/csharp/khtml-dll.dll.config debian/libkhtml2.0-cil/usr/lib/cli/kdebindings-2.0/
- #qyoto
- install -d debian/libqyoto4.4-cil/usr/lib/cli/kdebindings-4.4
- install -D -m 644 $(DEST_USR_LIB)/mono/2.0/qt-dotnet.dll debian/libqyoto4.4-cil/usr/lib/cli/kdebindings-4.4/
- install -D -m 644 $(DEST_USR_LIB)/libqyoto.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/
- #kimono
- install -d debian/libkimono4.1-cil/usr/lib/cli/kdebindings-4.1
- install -D -m 644 $(DEST_USR_LIB)/mono/2.0/kde-dotnet.dll debian/libkimono4.1-cil/usr/lib/cli/kdebindings-4.1/
- install -D -m 644 $(DEST_USR_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/
- #nepomuk
- install -d debian/libnepomuk2.2-cil/usr/lib/cli/kdebindings-2.2
- install -D -m 644 $(DEST_USR_LIB)/mono/2.0/nepomuk-dll.dll debian/libnepomuk2.2-cil/usr/lib/cli/kdebindings-2.2
- install -D -m 644 $(DEST_USR_LIB)/libnepomuk-sharp.so debian/libnepomuk2.2-cil/usr/lib/cli/kdebindings-2.2
- install -D -m 644 $(CURDIR)/debian/csharp/nepomuk-dll.dll.config debian/libnepomuk2.2-cil/usr/lib/cli/kdebindings-2.2
- # plasma
- install -d debian/libplasma2.0-cil/usr/lib/cli/kdebindings-2.0
- install -D -m 644 $(DEST_USR_LIB)/mono/2.0/plasma-dll.dll debian/libplasma2.0-cil/usr/lib/cli/kdebindings-2.0
- install -D -m 644 $(DEST_USR_LIB)/libplasma-sharp.so debian/libplasma2.0-cil/usr/lib/cli/kdebindings-2.0
- install -D -m 644 $(CURDIR)/debian/csharp/plasma-dll.dll.config debian/libplasma2.0-cil/usr/lib/cli/kdebindings-2.0
- #qtscript
- install -d debian/libqtscript2.2-cil/usr/lib/cli/kdebindings-2.2
- install -D -m 644 $(DEST_USR_LIB)/mono/2.0/qtscript.dll debian/libqtscript2.2-cil/usr/lib/cli/kdebindings-2.2
- install -D -m 644 $(DEST_USR_LIB)/libqtscript-sharp.so debian/libqtscript2.2-cil/usr/lib/cli/kdebindings-2.2
- install -D -m 644 $(CURDIR)/debian/csharp/qtscript.dll.config debian/libqtscript2.2-cil/usr/lib/cli/kdebindings-2.2
- #soprano
- install -d debian/libsoprano2.0-cil/usr/lib/cli/kdebindings-2.0
- install -D -m 644 $(DEST_USR_LIB)/mono/2.0/soprano.dll debian/libsoprano2.0-cil/usr/lib/cli/kdebindings-2.0
- install -D -m 644 $(DEST_USR_LIB)/libsoprano-sharp.so debian/libsoprano2.0-cil/usr/lib/cli/kdebindings-2.0
- install -D -m 644 $(CURDIR)/debian/csharp/soprano.dll.config debian/libsoprano2.0-cil/usr/lib/cli/kdebindings-2.0
- #qtuitools
- install -d debian/libqtuitools2.2-cil/usr/lib/cli/kdebindings-2.2
- install -D -m 644 $(DEST_USR_LIB)/mono/2.0/qtuitools.dll debian/libqtuitools2.2-cil/usr/lib/cli/kdebindings-2.2
- install -D -m 644 $(DEST_USR_LIB)/libqtuitools-sharp.so debian/libqtuitools2.2-cil/usr/lib/cli/kdebindings-2.2
- install -D -m 644 $(CURDIR)/debian/csharp/qtuitools.dll.config debian/libqtuitools2.2-cil/usr/lib/cli/kdebindings-2.2
- #qtwebkit
- install -d debian/libqtwebkit2.2-cil/usr/lib/cli/kdebindings-2.2
- install -D -m 644 $(DEST_USR_LIB)/mono/2.0/qtwebkit.dll debian/libqtwebkit2.2-cil/usr/lib/cli/kdebindings-2.2
- install -D -m 644 $(DEST_USR_LIB)/libqtwebkit-sharp.so debian/libqtwebkit2.2-cil/usr/lib/cli/kdebindings-2.2
- install -D -m 644 $(CURDIR)/debian/csharp/qtwebkit.dll.config debian/libqtwebkit2.2-cil/usr/lib/cli/kdebindings-2.2
- #end manual installs
- #setting MONOPATH is a hack to hack around a bug in dh_mkaeclilibs. Reported as #498868
- MONO_PATH=$(CURDIR)/debian/libqyoto4.4-cil/usr/lib/cli/kdebindings-4.4/ dh_makeclilibs -V
- dh_installcligac
- dh_clideps -l debian/libqyoto4.4-cil/usr/lib/cli/kdebindings-4.4/:debian/libkimono4.1-cil/usr/lib/cli/kdebindings-4.1/:debian/libkhtml2.0-cil/usr/lib/cli/kdebindings-2.0/
- dh_clistrip
+# Separate target (from monospecific) is needed for $(MONO_L_PATHS)
+# to work properly
+install-mono: install-generic install-pre
+ dh_install $(DH_MONOPACKAGES)
-
+monospecific: DH_OPTIONS=
+monospecific: install-mono
+ #setting MONOPATH is a hack to hack around a bug in dh_makeclilibs. Reported as #498868
+ MONO_PATH=$(CURDIR)/debian/libqyoto4.4-cil/usr/lib/cli/kdebindings-4.4/ dh_makeclilibs -V $(DH_MONOPACKAGES)
+ dh_installcligac $(DH_MONOPACKAGES)
+ dh_makeshlibs -V $(DH_MONOPACKAGES)
+ dh_clideps -l$(MONO_L_PATHS) $(DH_MONOPACKAGES)
+ dh_clistrip $(DH_MONOPACKAGES)
##
binary: binary-arch binary-indep
-binary-arch: build install
- dh_install -s --sourcedir=debian/tmp
- $(MAKE) -f debian/rules DH_OPTIONS=-s binary-common
+binary-arch: export DH_OPTIONS=-s
+binary-indep: export DH_OPTIONS=-i
-binary-indep: build install
- dh_install -i --sourcedir=debian/tmp
- $(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
-
-binary-common:
+binary-indep binary-arch: build install
+ # Building $@. DH_OPTIONS=$(DH_OPTIONS)
+ dh_install $(DH_NO_MONOPACKAGES)
dh_testdir
dh_testroot
dh_lintian
@@ -228,7 +190,6 @@
dh_md5sums
dh_builddeb
-
##
.PHONY: build clean install binary binary-arch binary-indep binary-common
More information about the pkg-kde-commits
mailing list