Author: twerner
Date: 2008-10-16 21:14:35 +0000 (Thu, 16 Oct 2008)
New Revision: 7158
Added:
trunk/cup/debian/patches/
trunk/cup/debian/patches/build.diff
trunk/cup/debian/patches/series
Removed:
trunk/cup/debian/Makefile
trunk/cup/debian/manifest
Modified:
trunk/cup/debian/changelog
trunk/cup/debian/control
trunk/cup/debian/cup.links
trunk/cup/debian/rules
Log:
Switch to cdbs.
Deleted: trunk/cup/debian/Makefile
===================================================================
--- trunk/cup/debian/Makefile 2008-10-16 20:53:58 UTC (rev 7157)
+++ trunk/cup/debian/Makefile 2008-10-16 21:14:35 UTC (rev 7158)
@@ -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/*
-
Modified: trunk/cup/debian/changelog
===================================================================
--- trunk/cup/debian/changelog 2008-10-16 20:53:58 UTC (rev 7157)
+++ trunk/cup/debian/changelog 2008-10-16 21:14:35 UTC (rev 7158)
@@ -6,8 +6,9 @@
[ 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
Modified: trunk/cup/debian/control
===================================================================
--- trunk/cup/debian/control 2008-10-16 20:53:58 UTC (rev 7157)
+++ trunk/cup/debian/control 2008-10-16 21:14:35 UTC (rev 7158)
@@ -2,8 +2,10 @@
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
Modified: trunk/cup/debian/cup.links
===================================================================
--- trunk/cup/debian/cup.links 2008-10-16 20:53:58 UTC (rev 7157)
+++ trunk/cup/debian/cup.links 2008-10-16 21:14:35 UTC (rev 7158)
@@ -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
Deleted: trunk/cup/debian/manifest
===================================================================
--- trunk/cup/debian/manifest 2008-10-16 20:53:58 UTC (rev 7157)
+++ trunk/cup/debian/manifest 2008-10-16 21:14:35 UTC (rev 7158)
@@ -1,2 +0,0 @@
-Manifest-Version: 1.0
-Main-Class: java_cup/Main
Added: trunk/cup/debian/patches/build.diff
===================================================================
--- trunk/cup/debian/patches/build.diff (rev 0)
+++ trunk/cup/debian/patches/build.diff 2008-10-16 21:14:35 UTC (rev 7158)
@@ -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>
Added: trunk/cup/debian/patches/series
===================================================================
--- trunk/cup/debian/patches/series (rev 0)
+++ trunk/cup/debian/patches/series 2008-10-16 21:14:35 UTC (rev 7158)
@@ -0,0 +1 @@
+build.diff
Modified: trunk/cup/debian/rules
===================================================================
--- trunk/cup/debian/rules 2008-10-16 20:53:58 UTC (rev 7157)
+++ trunk/cup/debian/rules 2008-10-16 21:14:35 UTC (rev 7158)
@@ -1,46 +1,15 @@
#!/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
+install/cup::
+ install -D dist/java-cup-11a.jar
$(DEB_DESTDIR)/usr/share/java/cup-0.11a.jar
-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
-
get-orig-source:
wget -o cup_0.11a+20060608.orig.tar.gz \
https://www2.in.tum.de/WebSVN/dl.php?repname=CUP&path=/develop/&rev=0&isdir=1
_______________________________________________
pkg-java-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
