Menu
▾
▴
[Cdk-commits] CVS: cdk/packages/debian/cdk Makefile,1.8,1.9 changelog,1.12,1.13 control,1.11,1.12 rules,1.3,1.4 dirs,1.3,NONE postinst,1.1,NONE prerm,1.1,NONE
|
From: Egon W. <eg...@us...> - 2004-04-20 16:12:46
|
Update of /cvsroot/cdk/cdk/packages/debian/cdk In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29041 Modified Files: Makefile changelog control rules Removed Files: dirs postinst prerm Log Message: Step towards better debian packages: split binary up into two packages Index: Makefile =================================================================== RCS file: /cvsroot/cdk/cdk/packages/debian/cdk/Makefile,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- Makefile 21 Jan 2004 14:38:49 -0000 1.8 +++ Makefile 20 Apr 2004 16:12:35 -0000 1.9 @@ -10,7 +10,7 @@ VERSION=`cat ${PACKGDIR}/VERSION` -DEBIANFILES=changelog control copyright dirs postinst Makefile prerm rules +DEBIANFILES=changelog control copyright postinst Makefile prerm rules cdk.install libcdk-java.install cdk.dirs libcdk-java.dirs JAVA_HOME=/usr/lib/j2se/1.4 @@ -36,12 +36,15 @@ cp -R patches /tmp/cdk-${VERSION}/debian/. find /tmp/cdk-${VERSION} -name "CVS" | xargs rm -R @echo " ... removing files provided by other Debian packages" - rm /tmp/cdk-${VERSION}/jar/xerces-2.5.0.jar + rm /tmp/cdk-${VERSION}/jar/xerces-2.6.2.jar + rm /tmp/cdk-${VERSION}/jar/xmlApis-2.6.2.jar rm /tmp/cdk-${VERSION}/jar/junit.jar @echo " ... removing unneeded files" @echo " ... adapt Makefiles for debian needs" - cd /tmp/cdk-${VERSION}/jar; cat Makefile.am | grep -v xerces-2.5.0.jar | grep -v junit.jar > Makefile.am2 && mv Makefile.am2 Makefile.am - cd /tmp/cdk-${VERSION}/jar; cat Makefile.am | perl -n -e "s/xerces-2.5.0.jar//; print;" > Makefile.am2 && mv Makefile.am2 Makefile.am + cd /tmp/cdk-${VERSION}/jar; cat Makefile.am | grep -v xerces-2.6.2.jar | grep -v junit.jar > Makefile.am2 && mv Makefile.am2 Makefile.am + cd /tmp/cdk-${VERSION}/jar; cat Makefile.am | grep -v xmlApis-2.6.2.jar | grep -v junit.jar > Makefile.am2 && mv Makefile.am2 Makefile.am + cd /tmp/cdk-${VERSION}/jar; cat Makefile.am | perl -n -e "s/xerces-2.6.2.jar//; print;" > Makefile.am2 && mv Makefile.am2 Makefile.am + cd /tmp/cdk-${VERSION}/jar; cat Makefile.am | perl -n -e "s/xmlApis-2.6.2.jar//; print;" > Makefile.am2 && mv Makefile.am2 Makefile.am cd /tmp/cdk-${VERSION}/jar; cat Makefile.am | perl -n -e "s/junit.jar//; print;" > Makefile.am2 && mv Makefile.am2 Makefile.am cd /tmp/cdk-${VERSION}; cat Makefile.am | perl -n -e "s#ant#ant -Dbuild.compiler=gcj#; print;" > Makefile.am2 && mv Makefile.am2 Makefile.am @echo " ... adapt build.xml for debian needs" Index: changelog =================================================================== RCS file: /cvsroot/cdk/cdk/packages/debian/cdk/changelog,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- changelog 3 Feb 2004 11:08:37 -0000 1.12 +++ changelog 20 Apr 2004 16:12:35 -0000 1.13 @@ -1,3 +1,17 @@ +cdk (20040420cvs-2) unstable; urgency=low + + * Now conform Standards Version 3.6.1 (control) + * Split up package into two binary packages: libcdk-java and cdk + * Now depends on debhelper (rules) + + -- E.L. Willighagen (Egon) <eg...@sc...> Tue, 20 Apr 2004 13:27:00 +0100 + +cdk (20040420cvs-1) unstable; urgency=low + + * New release based on CVS + + -- E.L. Willighagen (Egon) <eg...@sc...> Tue, 20 Apr 2004 11:36:00 +0100 + cdk (20040202-1) unstable; urgency=low * New upstream release Index: control =================================================================== RCS file: /cvsroot/cdk/cdk/packages/debian/cdk/control,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- control 3 Feb 2004 11:08:47 -0000 1.11 +++ control 20 Apr 2004 16:12:35 -0000 1.12 @@ -1,15 +1,27 @@ Source: cdk -Build-Depends: gcj (>=3.3.2), junit, ant (>= 1.5), gjdoc, jikes, xsltproc, libxerces2-java, libbatik-java, libgnujaxp-java, liblog4j1.2-java, libpgjava, libmysql-java +Build-Depends: debhelper, gcj (>=3.3.2), junit, ant (>= 1.5), gjdoc, jikes, xsltproc, libxerces2-java (>= 2.6.1), libbatik-java, libgnujaxp-java, liblog4j1.2-java, libpgjava, libmysql-java Section: contrib/science Priority: optional Maintainer: Egon Willighagen <eg...@sc...> -Standards-Version: 3.5.9 +Standards-Version: 3.6.1 -Package: cdk +Package: libcdk-java Architecture: all +Suggests: cdk, jchempaint, jmol +Conflicts: cdk (<= 20040420cvs-1) +Replaces: cdk (<= 20040420cvs-1) Depends: kaffe | gij | java-virtual-machine | java2-runtime, libxerces2-java, libbatik-java, libgnujaxp-java, liblog4j1.2-java, libpgjava, libmysql-java Description: The Chemistry Development Kit (CDK) The CDK is a library of Java classes used in computational and information chemistry and in bioinformatics. It includes renderers, file IO, SMILES generation/parsing, maximal common substructure algorithms, fingerprinting and much, much more. + +Package: cdk +Architecture: all +Depends: libcdk-java +Description: Shell wrappers for the CDK + The CDK is a library of Java classes used in computational and + information chemistry and in bioinformatics. It includes renderers, + file IO, SMILES generation/parsing, maximal common substructure + algorithms, fingerprinting and much, much more. Index: rules =================================================================== RCS file: /cvsroot/cdk/cdk/packages/debian/cdk/rules,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- rules 21 Jan 2004 14:38:49 -0000 1.3 +++ rules 20 Apr 2004 16:12:35 -0000 1.4 @@ -1,50 +1,115 @@ #!/usr/bin/make -f -# Made with the aid of debmake, by Christoph Lameter, -# based on the sample debian/rules file for GNU hello by Ian Jackson. - -package=cdk +# -*- makefile -*- +# Sample debian/rules that uses debhelper. +# GNU copyright 1997 to 1999 by Joey Hess. +# + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +# This has to be exported to make some magic below work. +export DH_OPTIONS + +CFLAGS = -Wall -g + +INSTALL_PACKAGES = install-libcdk-java install-cdk +BINARY_PACKAGES = binary-libcdk-java binary-cdk + +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS += -O0 +else + CFLAGS += -O2 +endif +ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) + INSTALL_PROGRAM += -s +endif + +configure: configure-stamp +configure-stamp: + dh_testdir + touch configure-stamp build: - $(checkdir) - $(MAKE) -f Makefile - touch build + ./configure --prefix=/usr + $(MAKE) -f Makefile install DESTDIR=$(CURDIR)/debian/tmp + +build-%: build-%-stamp + # nothing to be done + +build-%-stamp: configure-stamp + touch $@ clean: - $(checkdir) - -rm -R -f build - ./configure --prefix=/usr - -$(MAKE) -f Makefile clean - -rm -f `find . -name "*~"` - -rm -rf debian/tmp debian/files* core debian/substvars - -binary-indep: checkroot build - $(checkdir) -# There are no architecture-independent files to be uploaded -# generated by this package. If there were any they would be -# made here. - -binary-arch: checkroot build - $(checkdir) - -rm -rf debian/tmp - install -d debian/tmp - cd debian/tmp && install -d `cat ../dirs` - $(MAKE) -f Makefile install DESTDIR=`pwd`/debian/tmp -# Must have debmake installed for this to work. Otherwise please copy -# /usr/bin/debstd into the debian directory and change debstd to debian/debstd - debstd - dpkg-gencontrol -isp - chown -R root.root debian/tmp - chmod -R go=rX debian/tmp - dpkg --build debian/tmp .. - -define checkdir - test -f debian/rules -endef - -binary: binary-indep binary-arch - -checkroot: - $(checkdir) - test root = "`whoami`" + dh_testdir + dh_testroot + rm -f *-stamp + -$(MAKE) clean + + dh_clean + +install: $(INSTALL_PACKAGES) + +install-libcdk-java: + dh_testdir + dh_testroot + dh_clean -k -plibcdk-java + dh_installdirs -plibcdk-java + + $(MAKE) -f Makefile install DESTDIR=$(CURDIR)/debian/tmp + rm -f debian/tmp/usr/bin/* + rm -f debian/tmp/usr/share/man/man1/* + + #dh_install -plibcdk-java + +install-cdk: + dh_testdir + dh_testroot + dh_clean -k -pcdk + dh_installdirs -pcdk + + $(MAKE) -f Makefile install DESTDIR=$(CURDIR)/debian/tmp + rm -f debian/tmp/usr/share/java/* + rm -f debian/tmp/usr/share/cdk/lib/* + rm -f debian/tmp/usr/share/doc/cdk/javadoc.tar.gz + + #dh_install -pcdk + +# Must not depend on anything. This is to be called by +# binary-arch/binary-indep +# in another 'make' thread. +binary-common: + dh_testdir + dh_testroot + dh_installchangelogs + dh_installdocs + dh_installexamples +# dh_installmenu +# dh_installdebconf +# dh_installlogrotate +# dh_installemacsen +# dh_installpam +# dh_installmime +# dh_installinit +# dh_installcron +# dh_installinfo + dh_installman + dh_link + dh_strip + dh_compress + dh_fixperms +# dh_perl +# dh_python + dh_makeshlibs + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb +# Build architecture independant packages using the common target. + +binary-%: build-% install-% + $(MAKE) -f debian/rules DH_OPTIONS=-p$* binary-common + +binary: $(BINARY_PACKAGES) -.PHONY: binary binary-arch binary-indep clean checkroot +.PHONY: build clean binary install configure --- dirs DELETED --- --- postinst DELETED --- --- prerm DELETED --- |