[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

pkg-kde: commit - rev 110 - trunk/packages/kdebindings/debian



Author: domi-guest
Date: 2004-04-16 06:55:22 -0600 (Fri, 16 Apr 2004)
New Revision: 110

Added:
   trunk/packages/kdebindings/debian/compat
Modified:
   trunk/packages/kdebindings/debian/changelog
   trunk/packages/kdebindings/debian/rules
Log:
debian/dirs: removed, no longer necessary.
debian/compat, debian/rules: Replaced DH_COMPAT envvar with the
	debian/compat file.
debian/rules: cosmetic improvements, removed cruft.
debian/rules: fixed the version number of the qtjava and koala jar
	files.  The rules file now gets it automatically from the
	changelog, so I can't forget to change it again.



Modified: trunk/packages/kdebindings/debian/changelog
===================================================================
--- trunk/packages/kdebindings/debian/changelog	2004-04-16 04:17:07 UTC (rev 109)
+++ trunk/packages/kdebindings/debian/changelog	2004-04-16 12:55:22 UTC (rev 110)
@@ -1,8 +1,14 @@
-kdebindings (4:3.2.3-1); urgency=low
+kdebindings (4:3.2.2-3) unstable; urgency=low
 
-  * debian/dirs: remove, no longer necessary.
+  * debian/dirs: removed, no longer necessary.
+  * debian/compat, debian/rules: Replaced DH_COMPAT envvar with the
+    debian/compat file.
+  * debian/rules: cosmetic improvements, removed cruft.
+  * debian/rules: fixed the version number of the qtjava and koala jar
+    files.  The rules file now gets it automatically from the changelog,
+    so I can't forget to change it again.
 
- --
+ -- Dominique Devriese <devriese@kde.org>  Tue, 13 Apr 2004 14:45:19 +0200
 
 kdebindings (4:3.2.2-2) unstable; urgency=low
 

Added: trunk/packages/kdebindings/debian/compat
===================================================================
--- trunk/packages/kdebindings/debian/compat	2004-04-16 04:17:07 UTC (rev 109)
+++ trunk/packages/kdebindings/debian/compat	2004-04-16 12:55:22 UTC (rev 110)
@@ -0,0 +1 @@
+4

Modified: trunk/packages/kdebindings/debian/rules
===================================================================
--- trunk/packages/kdebindings/debian/rules	2004-04-16 04:17:07 UTC (rev 109)
+++ trunk/packages/kdebindings/debian/rules	2004-04-16 12:55:22 UTC (rev 110)
@@ -1,39 +1,43 @@
 #!/usr/bin/make -f
+# debian/rules file for the kdebindings Debian source package.
 # Made with the aid of debmake, by Christoph Lameter,
 # based on the sample debian/rules file for GNU hello by Ian Jackson.
+
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-# This is the debhelper compatibility version to use.
-export DH_COMPAT=4
-
 # This has to be exported to make some magic below work.
 export DH_OPTIONS
 
-KDEBINDINGS_VERSION=3.2.1
-
 # These are used for cross-compiling and for saving the configure script
 # from having to guess our platform (since we know it already)
 DEB_HOST_GNU_TYPE       ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE      ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
-objdir = $(CURDIR)/obj-$(DEB_BUILD_GNU_TYPE)
+CFLAGS = -Wall -g
 
-tmp = $(shell pwd)/debian/tmp
-archlib=`$(PERL) -MConfig -e 'print $$Config{installarchlib}'`
-perlconfig=INSTALLDIRS=vendor
-
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+       CFLAGS += -O0
+else
+       CFLAGS += -O2
+endif
 ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
 	INSTALL_PROGRAM += -s
 endif
 
+# I'd like to move to builddir!=srcdir when I can get upstream to build with it.
+#objdir = $(CURDIR)/obj-$(DEB_BUILD_GNU_TYPE)
+upstream_version=`head -1 debian/changelog | sed -e "s#.*:\([^-]*\).*#\1#"`
+
 ifndef PERL
 PERL=/usr/bin/perl
 endif
 
+# DCOPPerl is disabled.
+#tmp = $(shell pwd)/debian/tmp
+#archlib=`$(PERL) -MConfig -e 'print $$Config{installarchlib}'`
+#perlconfig=INSTALLDIRS=vendor
 
-
-
 -include debian/debiandirs
 
 debian/debiandirs: admin/debianrules
@@ -68,23 +72,40 @@
 		$(MAKE) -f admin/Makefile.common ;\
 	fi
 
+	# ensure configure is executable
+	chmod +x configure
+
 	# make build directory
+	# mkdir $(objdir)
 
 	# run configure with build tree $(objdir)
-	AWK=gawk \
-	./configure $(configkde) --with-java=/usr --with-pythondir=/usr/lib/python2.3/site-packages DO_NOT_COMPILE='dcopperl kalyptus kdeobjc korundum qtobjc qtruby qtsharp xparts'
+	# ( not yet in a different build tree)
+	# cd $(objdir) && \
+	# ../configure \
+	# --enable-final
+	./configure \
+	$(configkde) \
+	--with-java=/usr \
+	--with-pythondir=/usr/lib/python2.3/site-packages \
+	DO_NOT_COMPILE='dcopperl kalyptus kdeobjc korundum qtobjc qtruby qtsharp xparts'
+
 	touch configure-stamp
 
 build: build-stamp
 build-stamp: configure-stamp
 	dh_testdir
 
-	$(MAKE)  
-#	$(MAKE) -C dcoppython  
+	# cd $(objdir) &&
+	$(MAKE)
+
+	# build dcopjava even though it's disabled upstream.
+	# cd $(objdir) &&
 	$(MAKE) -C dcopjava 
+
 #dcopperl is disabled
 #	cd dcopperl && $(PERL) Makefile.PL $(perlconfig) ; 
 #	$(MAKE) -C dcopperl
+
 	touch build-stamp
 
 debian-clean:
@@ -125,8 +146,6 @@
 		$(MAKE) -C dcopjava distclean; \
 	fi
 
-	rm -f config.log
-
 	dh_clean
 
 
@@ -135,26 +154,22 @@
 	dh_testdir
 	dh_testroot
 	dh_clean -k
-	dh_installdirs
+	dh_installdirs -s
 
-	# Install lintian overrides.
-	#$(INSTALL_LINTIAN_OVERRIDES)
-
 	# Main install.
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
-#	$(MAKE) -C dcoppython install DESTDIR=$(CURDIR)/debian/tmp
 	$(MAKE) -C dcopjava install DESTDIR=$(CURDIR)/debian/tmp
+#DCOPPerl is disabled.
 #	$(MAKE) -C dcopperl pure_install PREFIX=$(CURDIR)/debian/tmp/usr
-#	$(MAKE) -C kalyptus 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-$(KDEBINDINGS_VERSION).jar org/ )
-	ln -s dcopjava-$(KDEBINDINGS_VERSION).jar debian/tmp/usr/share/java/dcopjava.jar
-	mv debian/tmp/usr/lib/java/qtjava.jar debian/tmp/usr/share/java/qtjava-$(KDEBINDINGS_VERSION).jar
-	ln -s qtjava-$(KDEBINDINGS_VERSION).jar debian/tmp/usr/share/java/qtjava.jar
-	mv debian/tmp/usr/lib/java/koala.jar debian/tmp/usr/share/java/koala-$(KDEBINDINGS_VERSION).jar
-	ln -s koala-$(KDEBINDINGS_VERSION).jar debian/tmp/usr/share/java/koala.jar
+	(cd debian/tmp/usr/lib/java ; jar cvf ../../share/java/dcopjava-$(upstream_version).jar org/ )
+	ln -s dcopjava-$(upstream_version).jar debian/tmp/usr/share/java/dcopjava.jar
+	mv debian/tmp/usr/lib/java/qtjava.jar debian/tmp/usr/share/java/qtjava-$(upstream_version).jar
+	ln -s qtjava-$(upstream_version).jar debian/tmp/usr/share/java/qtjava.jar
+	mv debian/tmp/usr/lib/java/koala.jar debian/tmp/usr/share/java/koala-$(upstream_version).jar
+	ln -s koala-$(upstream_version).jar debian/tmp/usr/share/java/koala.jar
 
 	dh_install --list-missing
 
@@ -173,20 +188,24 @@
 	dh_installmenu
 #	dh_installlogrotate
 #	dh_installemacsen
+#	dh_installpam
+#	dh_installmime
+#	dh_installinit
 #	dh_installcron
 #	dh_installinfo
 	dh_installman
+	dh_link
 	dh_strip
-	dh_link
-	dh_compress -X.docbook -X.css -X-license -X.dcl -X.bz2
+	dh_compress -X.bz2 -X.css -X.dcl -X.docbook -X-license -X.tag
 	dh_fixperms 
 # hack: dh_makeshlibs insists on adding ldconfig calls to postinst and
 # postrm even if no libs are in ldconfig'able directories.
+	dh_perl
+	dh_python
 	dh_makeshlibs -V -Nlibkde3-jni
 	dh_makeshlibs -n -V -plibkde3-jni
 	dh_installdeb
-	dh_perl
-	dh_shlibdeps -ldebian/libdcopc1/usr/lib:debian/libqtc1/usr/lib:debian/libkdec1/usr/lib:debian/libkjsembed1/usr/lib:debian/libkdexparts1/usr/lib:debian/qtjava/usr/lib:debian/kdejava/usr/lib
+	dh_shlibdeps
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb



Reply to: