[Pkg-kde-commits] rev 2060 -
branches/kde-3.4.0/packages/kdebindings/debian
Adeodato Simó
adeodato at costa.debian.org
Thu Oct 20 01:56:48 UTC 2005
Author: adeodato
Date: 2005-10-20 01:56:47 +0000 (Thu, 20 Oct 2005)
New Revision: 2060
Modified:
branches/kde-3.4.0/packages/kdebindings/debian/rules
Log:
Uhm, dcopjava needs to happen in -indep. This will probably break thinks
if build-arch is called, but buildds don't do that.
Modified: branches/kde-3.4.0/packages/kdebindings/debian/rules
===================================================================
--- branches/kde-3.4.0/packages/kdebindings/debian/rules 2005-10-20 01:44:44 UTC (rev 2059)
+++ branches/kde-3.4.0/packages/kdebindings/debian/rules 2005-10-20 01:56:47 UTC (rev 2060)
@@ -24,25 +24,24 @@
DEB_DH_MAKESHLIBS_ARGS_libqt0-ruby1.8 = -n
DEB_DH_MAKESHLIBS_ARGS_libkorundum0-ruby1.8 = -n
-#------------------------------------------
+###
-common-build-arch::
+clean::
+ rm -f kjsembed/docs/embedding/simple-embed/Makefile
+
+common-build-indep::
+ifndef WITHOUT_JAVA
# build dcopjava even though it's disabled upstream.
-ifndef WITHOUT_JAVA
cd $(DEB_BUILDDIR) && \
$(MAKE) -C dcopjava
+ cd $(DEB_BUILDDIR) && \
+ $(MAKE) -C dcopjava install DESTDIR=$(CURDIR)/debian/tmp
endif
-clean::
- rm -f kjsembed/docs/embedding/simple-embed/Makefile
-
upstream_version=$(shell head -1 $(CURDIR)/debian/changelog | sed -e "s,.*:\([^-]*\).*,\1,")
-common-install-arch::
+common-install-indep::
ifndef WITHOUT_JAVA
- cd $(DEB_BUILDDIR) && \
- $(MAKE) -C dcopjava install DESTDIR=$(CURDIR)/debian/tmp
-
# Fix up the Java packages so they conform to policy
mkdir -p debian/tmp/usr/share/java
(cd debian/tmp/usr/lib/java ; jar cvf ../../share/java/dcopjava-$(upstream_version).jar org/ )
@@ -56,6 +55,7 @@
ln -s koala-$(upstream_version).jar debian/tmp/usr/share/java/koala.jar
endif
+common-install-arch::
# Provide a Makefile for the example
cp $(DEB_BUILDDIR)/kjsembed/docs/embedding/simple-embed/Makefile kjsembed/docs/embedding/simple-embed
More information about the pkg-kde-commits
mailing list