This is an automated email from the git hooks/post-receive script. apo-guest pushed a commit to branch master in repository electric.
commit 5a83f6c1d96789cee1dbc18d0d20fa654d458359 Author: Onkar Shinde <[email protected]> Date: Mon Jul 13 16:15:37 2009 +0000 electric 8.09-1 --- debian/changelog | 23 ++++++++++++++++++++ debian/control | 6 ++--- debian/install | 2 +- debian/orig-tar.sh | 20 +++++++++++++++++ debian/patches/01_fix_build_xml.patch | 41 +++++++++++++---------------------- debian/rules | 10 +-------- debian/watch | 2 +- debian/wrappers/electric | 14 +++++------- 8 files changed, 70 insertions(+), 48 deletions(-) diff --git a/debian/changelog b/debian/changelog index 63f9854..4382e22 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,26 @@ +electric (8.09-1) unstable; urgency=low + + * New upstream version. + * debian/control + - Add myself to uploaders. + - Update standards version to 3.8.2. No change needed. + - Add java-wrappers dependency. + * debian/rules + - Move get-orig-source logic to orig-tar.sh. + - Remove unused variable VERSION. + * debian/watch + - Add orig-tar.sh action. + * debian/patches/01_fix_build_xml.patch + - Update for current version. + * debian/orig-tar.sh + - Add to use with uscan. + * debian/wrappers/electric + - Modify to use java-wrappers. + * debian/install + - Install the jar file to /usr/share/java instead of /usr/share/electric. + + -- Onkar Shinde <[email protected]> Sun, 12 Jul 2009 15:52:29 +0530 + electric (8.08-1) unstable; urgency=low * New upstream version. diff --git a/debian/control b/debian/control index ee96409..59c436c 100644 --- a/debian/control +++ b/debian/control @@ -2,17 +2,17 @@ Source: electric Section: electronics Priority: optional Maintainer: Debian Java Maintainers <[email protected]> -Uploaders: "Barak A. Pearlmutter" <[email protected]> +Uploaders: "Barak A. Pearlmutter" <[email protected]>, Onkar Shinde <[email protected]> Build-Depends: debhelper (>= 6), cdbs, ant Build-Depends-Indep: openjdk-6-jdk, bsh -Standards-Version: 3.8.0 +Standards-Version: 3.8.2 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/electric Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/electric Homepage: http://www.staticfreesoft.com/productsFree.html Package: electric Architecture: all -Depends: openjdk-6-jre, bsh, ${misc:Depends} +Depends: ${misc:Depends}, openjdk-6-jre, bsh, java-wrappers Description: electrical CAD system Electric is a sophisticated electrical CAD system that can handle many forms of circuit design, including custom IC layout (ASICs), schematic drawing, diff --git a/debian/install b/debian/install index 27f4e90..0084d92 100644 --- a/debian/install +++ b/debian/install @@ -1,4 +1,4 @@ -electric.jar usr/share/electric/ +electric.jar usr/share/java/ debian/electric.svg usr/share/icons/hicolor/scalable/apps/ debian/electric.desktop usr/share/applications/ debian/wrappers/electric usr/bin/ diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh new file mode 100755 index 0000000..1832025 --- /dev/null +++ b/debian/orig-tar.sh @@ -0,0 +1,20 @@ +#!/bin/sh -e + +# called by uscan with '--upstream-version' <version> <file> +TAR=../electric_$2.orig.tar.gz +DIR=electric-$2 +JAR=$3 + +# clean up the upstream tarball +mkdir $DIR && cd $DIR && jar -xvf ../$JAR +cd ../ && find $DIR/ -name *.class | xargs rm -f +tar -czvf $TAR $DIR +rm -rf $DIR + +# move to directory 'tarballs' +if [ -r .svn/deb-layout ]; then + . .svn/deb-layout + mv $TAR $origDir + echo "moved $TAR to $origDir" +fi + diff --git a/debian/patches/01_fix_build_xml.patch b/debian/patches/01_fix_build_xml.patch index 065ad9f..2674ca2 100644 --- a/debian/patches/01_fix_build_xml.patch +++ b/debian/patches/01_fix_build_xml.patch @@ -1,40 +1,29 @@ -diff -Nur -x '*.orig' -x '*~' electric-8.07/build.xml electric-8.07.new/build.xml ---- electric-8.07/build.xml 2008-07-23 23:57:01.000000000 +0530 -+++ electric-8.07.new/build.xml 2008-07-24 01:07:43.000000000 +0530 -@@ -75,6 +75,7 @@ - <patternset refid="exclusionGNU" /> - <patternset refid="exclusionSFS" /> - <exclude name="com/sun/electric/plugins/jogl/" unless="JOGL"/> +diff -Nur -x '*.orig' -x '*~' electric-8.09/build.xml electric-8.09.new/build.xml +--- electric-8.09/build.xml 2009-03-30 13:40:18.000000000 +0530 ++++ electric-8.09.new/build.xml 2009-07-12 14:04:48.000000000 +0530 +@@ -65,6 +65,7 @@ + <exclude name="com/sun/electric/plugins/tsmc/" unless="SUN"/> + <exclude name="com/sun/electric/tool/simulation/eventsim/" unless="SUN"/> + <exclude name="com/sun/electric/tool/simulation/interval/" unless="SUN"/> + <exclude name="com/sun/electric/tool/user/MacOSXInterface*"/> </patternset> <!-- Path for minimum set of external jars --> -@@ -97,8 +98,8 @@ - <javac debug="true" deprecation="true" destdir="." srcdir="." - fork="true" memoryMaximumSize="512m"> - <!--compilerarg value="-Xlint:unchecked"/--> -- <classpath refid="externalClassPath" /> -- <classpath refid="prefuseClassPath" /> -+ <!--classpath refid="externalClassPath" /> -+ <classpath refid="prefuseClassPath" /--> - <patternset refid="exclusion" /> - </javac> - </target> -@@ -337,10 +338,10 @@ - <property name="version" value=""/> +@@ -338,10 +339,10 @@ + </antcall> </target> -- <target name="jar" depends="clean,init,compileTests" description="Make binary Jar file"> -+ <target name="jar" depends="clean,init,compile" description="Make binary Jar file"> - <antcall target="unjarNoGNU"></antcall> -- <unjar dest="." src="${AppleJava}"/> +- <target name="jarWithTests" depends="clean,init,compileTests" description="Make binary Jar file"> +- <antcall target="unjarSUN"></antcall> ++ <target name="jarWithTests" depends="clean,init,compile" description="Make binary Jar file"> ++ <!--antcall target="unjarSUN"></antcall> + <unjar dest="." src="${AppleJava}"/> - <unjar dest="." src="${JUnit}"/> -+ <!--unjar dest="." src="${AppleJava}"/> + <unjar dest="." src="${JUnit}"/--> <delete dir="META-INF"/> <copy file="packaging/electric.mf" tofile="electric.mf"/> <jar basedir="." compress="true" jarfile="electric.jar" manifest="electric.mf"> -@@ -360,6 +361,7 @@ +@@ -362,6 +363,7 @@ <patternset refid="exclusion" /> <exclude name="**/*.java" unless="source"/> <exclude name="**/*.form" unless="source"/> diff --git a/debian/rules b/debian/rules index c2d42c6..cbebd9f 100755 --- a/debian/rules +++ b/debian/rules @@ -1,7 +1,5 @@ #!/usr/bin/make -f -export VERSION = $(shell head -1 debian/changelog | cut -f2 -d\( | cut -f1 -d\) | cut -f1 -d\-) - include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/class/ant.mk @@ -12,10 +10,4 @@ DEB_INSTALL_CHANGELOGS_ALL := ChangeLog.txt get-orig-source:: - cd .. && wget -c http://ftp.gnu.org/pub/gnu/electric/electric-$(VERSION).jar - mkdir debian/electric-$(VERSION) && cd debian/electric-$(VERSION) && jar -xvf ../../../electric-$(VERSION).jar - find debian/electric-$(VERSION)/ -name *.class | xargs rm -f - cd debian && tar -cf ../../electric_$(VERSION).orig.tar electric-$(VERSION)/ - gzip -9 ../electric_$(VERSION).orig.tar - rm -rf debian/electric-$(VERSION) - + uscan --verbose --force-download diff --git a/debian/watch b/debian/watch index 052a6f2..d68f4b9 100644 --- a/debian/watch +++ b/debian/watch @@ -4,4 +4,4 @@ # Site Directory Pattern Version Script version=3 -http://ftp.gnu.org/pub/gnu/electric/electric-(.*)\.jar +http://ftp.gnu.org/pub/gnu/electric/electric-(.*)\.jar debian debian/orig-tar.sh diff --git a/debian/wrappers/electric b/debian/wrappers/electric index 9a302e8..8d80ea5 100644 --- a/debian/wrappers/electric +++ b/debian/wrappers/electric @@ -1,12 +1,10 @@ #!/bin/sh -if [ "$1" = "-classpath" ] -then - CLASSPATH="$2" - shift 2 -fi +# Include the wrappers utility script +. /usr/lib/java-wrappers/java-wrappers.sh -CLASSPATH="${CLASSPATH:-.}:/usr/share/java/bsh.jar:/usr/share/electric/electric.jar" -export CLASSPATH +find_java_runtime openjdk -exec /usr/lib/jvm/java-6-openjdk/jre/bin/java com.sun.electric.Launcher "$@" +find_jars bsh electric + +run_java com.sun.electric.Launcher "$@" -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/electric.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
