rev 12842 - in branches/kde4.2/packages/kdebindings/debian: . csharp
Modestas Vainius
modax-guest at alioth.debian.org
Fri Dec 5 09:39:45 UTC 2008
Author: modax-guest
Date: 2008-12-05 09:39:44 +0000 (Fri, 05 Dec 2008)
New Revision: 12842
Modified:
branches/kde4.2/packages/kdebindings/debian/changelog
branches/kde4.2/packages/kdebindings/debian/control
branches/kde4.2/packages/kdebindings/debian/csharp/kde-dotnet.dll.config
branches/kde4.2/packages/kdebindings/debian/csharp/khtml.dll.config
branches/kde4.2/packages/kdebindings/debian/csharp/nepomuk.dll.config
branches/kde4.2/packages/kdebindings/debian/csharp/qtscript.dll.config
branches/kde4.2/packages/kdebindings/debian/csharp/qtuitools.dll.config
branches/kde4.2/packages/kdebindings/debian/csharp/qtwebkit.dll.config
branches/kde4.2/packages/kdebindings/debian/csharp/soprano.dll.config
branches/kde4.2/packages/kdebindings/debian/rules
Log:
Sync kdebindings
Modified: branches/kde4.2/packages/kdebindings/debian/changelog
===================================================================
--- branches/kde4.2/packages/kdebindings/debian/changelog 2008-12-05 09:06:08 UTC (rev 12841)
+++ branches/kde4.2/packages/kdebindings/debian/changelog 2008-12-05 09:39:44 UTC (rev 12842)
@@ -1,4 +1,4 @@
-kdebindings (4:4.1.3-2) UNRELEASED experimental; urgency=low
+kdebindings (4:4.1.3-2) experimental; urgency=low
[ Vincent Fourmond ]
* Moving libqt4-ruby{,1.8} to section interpreters where they
@@ -15,8 +15,14 @@
of smoke is not really a soname, so we can't expect dpkg-shlibs
to prevent incorrect linking (thanks Sune !)
- -- Vincent Fourmond <fourmond at debian.org> Thu, 13 Nov 2008 20:05:26 +0100
+ [ Sune Vuorela ]
+ * Merge in changes from ubuntu, mostly typofixes in important files. Shame
+ on me. Thanks Riddell.
+ * Better handling of packages just built on some archs. hopefully fixes the
+ build failure on non-mono archs.
+ -- Sune Vuorela <debian at pusling.com> Sun, 30 Nov 2008 23:41:36 +0100
+
kdebindings (4:4.1.3-1) experimental; urgency=low
* First upload of the kde4 kdebindings
Modified: branches/kde4.2/packages/kdebindings/debian/control
===================================================================
--- branches/kde4.2/packages/kdebindings/debian/control 2008-12-05 09:06:08 UTC (rev 12841)
+++ branches/kde4.2/packages/kdebindings/debian/control 2008-12-05 09:39:44 UTC (rev 12842)
@@ -274,8 +274,8 @@
Depends: libqyoto4.4-cil (= ${binary:Version}), ${cli:Depends}, ${shlibs:Depends}
Architecture: i386 kfreebsd-i386 powerpc amd64 kfreebsd-amd64 ia64 arm armeb armel sparc s390 lpia
Description: Qt4 bindings for CLI, QtScript edition
- This package provides the QtSCript assemply that allows
- CLI based software to use the Qtscript library.
+ This package provides the QtScript assemply that allows
+ CLI based software to use the QtScript library.
.
This is part of KDE Bindings module
@@ -312,6 +312,6 @@
Depends: ${shlibs:Depends}
Architecture: i386 kfreebsd-i386 powerpc amd64 kfreebsd-amd64 ia64 arm armeb armel sparc s390 lpia
Description: shared library for Qt4 CLI bindings
- This package provides the shared library for qyoto - the Qt4 CLI bindings
+ This package provides the shared library for Qyoto - the Qt4 CLI bindings
.
This is part of KDE Bindings module
Modified: branches/kde4.2/packages/kdebindings/debian/csharp/kde-dotnet.dll.config
===================================================================
--- branches/kde4.2/packages/kdebindings/debian/csharp/kde-dotnet.dll.config 2008-12-05 09:06:08 UTC (rev 12841)
+++ branches/kde4.2/packages/kdebindings/debian/csharp/kde-dotnet.dll.config 2008-12-05 09:39:44 UTC (rev 12842)
@@ -1,3 +1,3 @@
<configuration>
-<dllmap dll="libkimino" target="/usr/lib/cli/kdebindings-4.1/libkimino.so"/>
+<dllmap dll="libkimono" target="/usr/lib/cli/kdebindings-4.1/libkimono.so"/>
</configuration>
Modified: branches/kde4.2/packages/kdebindings/debian/csharp/khtml.dll.config
===================================================================
--- branches/kde4.2/packages/kdebindings/debian/csharp/khtml.dll.config 2008-12-05 09:06:08 UTC (rev 12841)
+++ branches/kde4.2/packages/kdebindings/debian/csharp/khtml.dll.config 2008-12-05 09:39:44 UTC (rev 12842)
@@ -1,3 +1,3 @@
<configuration>
-<dllmap dll="libkhtml-sharp" target="/usr/lib/cil/kdebindings-2.0/libkhtml-sharp.so" />
+<dllmap dll="libkhtml-sharp" target="/usr/lib/cli/kdebindings-2.0/libkhtml-sharp.so" />
</configuration>
Modified: branches/kde4.2/packages/kdebindings/debian/csharp/nepomuk.dll.config
===================================================================
--- branches/kde4.2/packages/kdebindings/debian/csharp/nepomuk.dll.config 2008-12-05 09:06:08 UTC (rev 12841)
+++ branches/kde4.2/packages/kdebindings/debian/csharp/nepomuk.dll.config 2008-12-05 09:39:44 UTC (rev 12842)
@@ -1,3 +1,3 @@
<configuration>
-<dllmap dll="libnepomuk-sharp" target="/usr/lib/cil/kdebindings-2.2/libnepomuk-sharp.so" />
+<dllmap dll="libnepomuk-sharp" target="/usr/lib/cli/kdebindings-2.2/libnepomuk-sharp.so" />
</configuration>
Modified: branches/kde4.2/packages/kdebindings/debian/csharp/qtscript.dll.config
===================================================================
--- branches/kde4.2/packages/kdebindings/debian/csharp/qtscript.dll.config 2008-12-05 09:06:08 UTC (rev 12841)
+++ branches/kde4.2/packages/kdebindings/debian/csharp/qtscript.dll.config 2008-12-05 09:39:44 UTC (rev 12842)
@@ -1,3 +1,3 @@
<configuration>
-<dllmap dll="libqtscript-sharp" target="/usr/lib/cil/kdebindings-2.2/libqtscript-sharp.so" />
+<dllmap dll="libqtscript-sharp" target="/usr/lib/cli/kdebindings-2.2/libqtscript-sharp.so" />
</configuration>
Modified: branches/kde4.2/packages/kdebindings/debian/csharp/qtuitools.dll.config
===================================================================
--- branches/kde4.2/packages/kdebindings/debian/csharp/qtuitools.dll.config 2008-12-05 09:06:08 UTC (rev 12841)
+++ branches/kde4.2/packages/kdebindings/debian/csharp/qtuitools.dll.config 2008-12-05 09:39:44 UTC (rev 12842)
@@ -1,3 +1,3 @@
<configuration>
-<dllmap dll="libqtuitools-sharp" target="/usr/lib/cil/kdebindings-2.2/libqtuitools-sharp.so" />
+<dllmap dll="libqtuitools-sharp" target="/usr/lib/cli/kdebindings-2.2/libqtuitools-sharp.so" />
</configuration>
Modified: branches/kde4.2/packages/kdebindings/debian/csharp/qtwebkit.dll.config
===================================================================
--- branches/kde4.2/packages/kdebindings/debian/csharp/qtwebkit.dll.config 2008-12-05 09:06:08 UTC (rev 12841)
+++ branches/kde4.2/packages/kdebindings/debian/csharp/qtwebkit.dll.config 2008-12-05 09:39:44 UTC (rev 12842)
@@ -1,3 +1,3 @@
<configuration>
-<dllmap dll="libqtwebkit-sharp" target="/usr/lib/cil/kdebindings-2.2/libqtwebkit-sharp.so" />
+<dllmap dll="libqtwebkit-sharp" target="/usr/lib/cli/kdebindings-2.2/libqtwebkit-sharp.so" />
</configuration>
Modified: branches/kde4.2/packages/kdebindings/debian/csharp/soprano.dll.config
===================================================================
--- branches/kde4.2/packages/kdebindings/debian/csharp/soprano.dll.config 2008-12-05 09:06:08 UTC (rev 12841)
+++ branches/kde4.2/packages/kdebindings/debian/csharp/soprano.dll.config 2008-12-05 09:39:44 UTC (rev 12842)
@@ -1,3 +1,3 @@
<configuration>
-<dllmap dll="libsoprano-sharp" target="/usr/lib/cil/kdebindings-2.0/libsoprano-sharp.so" />
+<dllmap dll="libsoprano-sharp" target="/usr/lib/cli/kdebindings-2.0/libsoprano-sharp.so" />
</configuration>
Modified: branches/kde4.2/packages/kdebindings/debian/rules
===================================================================
--- branches/kde4.2/packages/kdebindings/debian/rules 2008-12-05 09:06:08 UTC (rev 12841)
+++ branches/kde4.2/packages/kdebindings/debian/rules 2008-12-05 09:39:44 UTC (rev 12842)
@@ -132,12 +132,15 @@
$(patsubst %,install-python-%,$(pyversions)): install-pre
$(MAKE) -C $(objdir)/python/pykde4-$(subst install-python-,,$@) install DESTDIR=$(CURDIR)/debian/tmp; \
-install-generic:
+install-generic: $(patsubst %,install-python-%,$(pyversions))
$(MAKE) -C $(objdir) install DESTDIR=$(CURDIR)/debian/tmp
-install: dh_install $(MONOTARGET)
+install: $(MONOTARGET) install-generic
+ rmdir debian/tmp/usr/share/doc/kde4/HTML/en/pykde4/creative\ commons_files/
+ install -D -m 755 debian/tmp/usr/share/kde4/apps/pykde4/pykdeuic4.py \
+ debian/python-kde4-dev/usr/bin/pykdeuic4
-monospecific:
+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 debian/libkhtml2.0-cil/usr/lib/cli/kdebindings-2.0/
@@ -177,7 +180,7 @@
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/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
@@ -185,21 +188,18 @@
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
-dh_install: $(patsubst %,install-python-%,$(pyversions)) install-generic
- rmdir debian/tmp/usr/share/doc/kde4/HTML/en/pykde4/creative\ commons_files/
- dh_install --sourcedir=debian/tmp
- install -D -m 755 debian/tmp/usr/share/kde4/apps/pykde4/pykdeuic4.py \
- debian/python-kde4-dev/usr/bin/pykdeuic4
##
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-indep: build install
+ dh_install -i --sourcedir=debian/tmp
$(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
binary-common:
More information about the pkg-kde-commits
mailing list