[Pkg-kde-commits] rev 2044 - branches/kde-3.4.0/packages/kdebindings/debian

[Adeodato Simó]

Author: adeodato
Date: 2005-10-19 21:37:49 +0000 (Wed, 19 Oct 2005)
New Revision: 2044

Modified:
   branches/kde-3.4.0/packages/kdebindings/debian/changelog
   branches/kde-3.4.0/packages/kdebindings/debian/rules
Log:
CDBSized bindings debian/rules, first draft.



Modified: branches/kde-3.4.0/packages/kdebindings/debian/changelog
===================================================================
--- branches/kde-3.4.0/packages/kdebindings/debian/changelog	2005-10-19 21:37:05 UTC (rev 2043)
+++ branches/kde-3.4.0/packages/kdebindings/debian/changelog	2005-10-19 21:37:49 UTC (rev 2044)
@@ -7,6 +7,8 @@
 
   * Install python-dcop examples. (Closes: #303654)
 
+  * CDBSized debian/rules, to match the rest of KDE packages.
+
   * Removed some not needed build-dependencies (binutils-dev, sharutils, perl,
     libglib1.2-dev).
 

Modified: branches/kde-3.4.0/packages/kdebindings/debian/rules
===================================================================
--- branches/kde-3.4.0/packages/kdebindings/debian/rules	2005-10-19 21:37:05 UTC (rev 2043)
+++ branches/kde-3.4.0/packages/kdebindings/debian/rules	2005-10-19 21:37:49 UTC (rev 2044)
@@ -1,23 +1,36 @@
-#!/usr/bin/make -f
+#! /usr/bin/make -f
 
-WITH_JAVA := --with-java=/usr
-CONFIGURE_FLAGS = $(WITH_JAVA) \
-		  --with-pythondir=/usr/lib/python2.3/site-packages \
-		  DO_NOT_COMPILE='dcopperl kalyptus qtsharp xparts python'
+include /usr/share/cdbs/1/rules/debhelper.mk
+include debian/cdbs/debian-qt-kde.mk
+include debian/cdbs/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/utils.mk
 
-DH_COMPRESS_ARGS   = -X.java -X.ui -X.js -X.rb -X.map -X.wav
-DH_SHLIBDEPS_ARGS  = -ldebian/libqt3-jni/usr/lib:debian/libsmokeqt1/usr/lib:debian/libsmokekde1/usr/lib:debian/libkjsembed1/usr/lib
-DH_MAKESHLIBS_ARGS = -V -Nlibkde3-jni -Nlibqt0-ruby1.8 -Nlibkorundum0-ruby1.8 ; \
-		     dh_makeshlibs -n -V -plibkde3-jni -plibqt0-ruby1.8 -plibkorundum0-ruby1.8
+WITH_JAVA = --with-java=/usr
 
-include debian/mipsen.mk
-include debian/common/vars.mk
-include debian/common/rules.mk
+# include debian/mipsen-java.mk
+# include debian/mipsen-xgot.mk
 
-build::
+DEB_CONFIGURE_EXTRA_FLAGS = $(WITH_JAVA) \
+			    --with-pythondir=/usr/lib/python2.3/site-packages \
+		  	    DO_NOT_COMPILE='dcopperl kalyptus qtsharp xparts python'
+
+DEB_COMPRESS_EXCLUDE += -X.java -X.ui -X.js -X.rb -X.map -X.wav
+
+# These are not all the packages with libraries, but only those that
+# need to be in DEB_SHLIBDEPS_INCLUDE...
+PACKAGES_WITH_LIBS = libqt3-jni libsmokeqt1 libsmokekde1 libkjsembed1
+
+# These packages do not ship files in /usr/lib so need not call ldconfig.
+DEB_DH_MAKESHLIBS_ARGS_libkde3-jni          = -n
+DEB_DH_MAKESHLIBS_ARGS_libqt0-ruby1.8       = -n
+DEB_DH_MAKESHLIBS_ARGS_libkorundum0-ruby1.8 = -n
+
+#------------------------------------------
+
+common-build-arch::
 	# build dcopjava even though it's disabled upstream.
 ifndef WITHOUT_JAVA
-	cd $(objdir) && \
+	cd $(DEB_BUILDDIR) && \
 	$(MAKE) -C dcopjava 
 endif
 
@@ -30,12 +43,10 @@
 
 upstream_version=$(shell head -1 $(CURDIR)/debian/changelog | sed -e "s,.*:\([^-]*\).*,\1,")
 
-make-install::
+common-install-arch::
 ifndef WITHOUT_JAVA
-	cd $(objdir) && \
+	cd $(DEB_BUILDDIR) && \
 	$(MAKE) -C dcopjava install DESTDIR=$(CURDIR)/debian/tmp
-	# DCOPPerl is disabled.
-	# $(MAKE) -C dcopperl pure_install PREFIX=$(CURDIR)/debian/tmp/usr
 
 	# Fix up the Java packages so they conform to policy
 	mkdir -p debian/tmp/usr/share/java
@@ -51,9 +62,9 @@
 endif
 
 	# Provide a Makefile for the example
-	cp $(objdir)/kjsembed/docs/embedding/simple-embed/Makefile kjsembed/docs/embedding/simple-embed
+	cp $(DEB_BUILDDIR)/kjsembed/docs/embedding/simple-embed/Makefile kjsembed/docs/embedding/simple-embed
 
-install::
+binary-install::
 	for p in $(PACKAGES_WITH_USD_SYMLINK); do \
 	  rm -f debian/$$p/usr/share/doc/$$p/{copyright,changelog.Debian}; \
 	done