This is an automated email from the git hooks/post-receive script. apo-guest pushed a commit to branch master in repository cup.
commit 3f55cb4c59bfd8d54d702fefd4aedd804d66df96 Author: Torsten Werner <[email protected]> Date: Thu Oct 16 21:14:35 2008 +0000 Switch to cdbs. --- debian/Makefile | 10 ---------- debian/changelog | 3 ++- debian/control | 6 ++++-- debian/cup.links | 2 +- debian/manifest | 2 -- debian/patches/build.diff | 13 +++++++++++++ debian/patches/series | 1 + debian/rules | 45 +++++++-------------------------------------- 8 files changed, 28 insertions(+), 54 deletions(-) diff --git a/debian/Makefile b/debian/Makefile deleted file mode 100644 index d6acc91..0000000 --- a/debian/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -export JAVA_HOME=/usr/lib/jvm/default-java - -cup.jar: - mkdir -p classes - ${JAVA_HOME}/bin/javac -d classes java_cup/*.java java_cup/*/*.java - ${JAVA_HOME}/bin/jar mcvf debian/manifest cup.jar -C classes java_cup - -clean: - rm -fr cup.jar classes/* - diff --git a/debian/changelog b/debian/changelog index 70de09b..086b259 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,8 +6,9 @@ cup (0.11a+20060608-1) UNRELEASED; urgency=low [ Torsten Werner ] * new upstream version (Closes: #497588) * Add target get-orig-source to debian/rules. + * Switch to cdbs. - -- Torsten Werner <[email protected]> Thu, 16 Oct 2008 22:52:36 +0200 + -- Torsten Werner <[email protected]> Thu, 16 Oct 2008 23:13:56 +0200 cup (0.10k-7) unstable; urgency=low diff --git a/debian/control b/debian/control index 0cad895..b3941cf 100644 --- a/debian/control +++ b/debian/control @@ -2,8 +2,10 @@ Source: cup Section: devel Priority: optional Maintainer: Debian Java Maintainers <[email protected]> -Uploaders: Arnaud Vandyck <[email protected]>, Michael Koch <[email protected]> -Build-Depends: debhelper (>= 4.2.30), default-jdk +Uploaders: Arnaud Vandyck <[email protected]>, Michael Koch <[email protected]>, + Torsten Werner <[email protected]> +Build-Depends: cdbs, debhelper (>= 4.2.30), default-jdk, cup (>= 0.11a), + jflex, quilt Standards-Version: 3.7.3 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/cup Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/cup diff --git a/debian/cup.links b/debian/cup.links index 2fc0a89..fedd8d4 100644 --- a/debian/cup.links +++ b/debian/cup.links @@ -1 +1 @@ -usr/share/java/cup-0.10k.jar usr/share/java/cup.jar +/usr/share/java/cup-0.11a.jar /usr/share/java/cup.jar diff --git a/debian/manifest b/debian/manifest deleted file mode 100644 index e865579..0000000 --- a/debian/manifest +++ /dev/null @@ -1,2 +0,0 @@ -Manifest-Version: 1.0 -Main-Class: java_cup/Main diff --git a/debian/patches/build.diff b/debian/patches/build.diff new file mode 100644 index 0000000..8137dea --- /dev/null +++ b/debian/patches/build.diff @@ -0,0 +1,13 @@ +Index: cup-0.11a+20060608/build.xml +=================================================================== +--- cup-0.11a+20060608.orig/build.xml 2008-10-16 23:00:40.000000000 +0200 ++++ cup-0.11a+20060608/build.xml 2008-10-16 23:00:51.000000000 +0200 +@@ -53,7 +53,7 @@ + + <target name="compile" depends="jflex"> + <copy todir="${java}"><fileset dir="${src}"></fileset></copy> +- <javac srcdir="${java}" destdir="${classes}" verbose="off" listfiles="off" debug="on" source="1.2" target="1.2"> ++ <javac srcdir="${java}" destdir="${classes}" verbose="off" listfiles="off" debug="on" source="1.3" target="1.3"> + <classpath refid="libraries"/> + </javac> + </target> diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..c614a3c --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +build.diff diff --git a/debian/rules b/debian/rules index 80fe03b..0a2d4b8 100755 --- a/debian/rules +++ b/debian/rules @@ -1,45 +1,14 @@ #!/usr/bin/make -f -LIBRARY=cup -VERSION=0.10k +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/ant.mk +include /usr/share/cdbs/1/rules/patchsys-quilt.mk -build: - dh_testdir - make -f debian/Makefile - touch build +JAVA_HOME := /usr/lib/jvm/default-java +DEB_JARS := cup JFlex -install: - dh_testdir - dh_clean - dh_installdirs usr/share/java usr/bin - install -m644 ${LIBRARY}.jar debian/cup/usr/share/java/${LIBRARY}-${VERSION}.jar - install -m755 debian/cup.sh debian/cup/usr/bin/cup - -clean: - dh_testdir - dh_testroot - dh_clean - make -f debian/Makefile clean - rm -f build - -binary-indep: build install - dh_testdir - dh_testroot - dh_installdocs manual.html cup_logo.gif - dh_installchangelogs CHANGELOG - dh_installman debian/cup.1 - dh_link - dh_fixperms - dh_compress - dh_installdeb - dh_gencontrol - dh_md5sums - dh_builddeb - -binary-arch: - -binary: binary-arch binary-indep -.PHONY: binary binary-arch binary-indep clean +install/cup:: + install -D dist/java-cup-11a.jar $(DEB_DESTDIR)/usr/share/java/cup-0.11a.jar get-orig-source: wget -o cup_0.11a+20060608.orig.tar.gz \ -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/cup.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
