Author: onkarshinde-guest Date: 2010-01-09 11:12:34 +0000 (Sat, 09 Jan 2010) New Revision: 11332
Added: trunk/electric/debian/patches/series Modified: trunk/electric/debian/README.source trunk/electric/debian/ant.properties trunk/electric/debian/changelog trunk/electric/debian/control trunk/electric/debian/patches/01_fix_build_xml.patch trunk/electric/debian/rules trunk/electric/debian/wrappers/electric Log: electric 8.10-1 Modified: trunk/electric/debian/README.source =================================================================== --- trunk/electric/debian/README.source 2010-01-06 23:53:27 UTC (rev 11331) +++ trunk/electric/debian/README.source 2010-01-09 11:12:34 UTC (rev 11332) @@ -1,33 +1,32 @@ -This package uses CDBS (and therefore simple-patchsys.mk) in order to -apply patches to the upstream source. Patches are stored in -debian/patches and their filenames usually end in .patch or .diff . -For further details, see the man page for cdbs-edit-patch. +This package uses quilt in order to apply patches to the upstream source. +Patches are stored in debian/patches. For further details, see the man page for +quilt. All commands described below should be run from the top directory of the package source tree, unless otherwise stated. - * To generate the fully patched source, in a form ready for - editing, that would be built to create Debian packages, run: + * To generate the fully patched source, in a form ready for editing, that + would be built to create Debian packages, run: + + export QUILT_PATCHES=debian/patches + quilt push -a - make -f debian/rules apply-patches + * To modify the source and save those modifications so that they will be + applied when building the package, pick a suitably informative patch file + name, for example Modify_README.source, and then run: - Note: This should happen automatically when you run - dpkg-source -x on a CDBS simple-patchsys.mk source package. + export QUILT_PATCHES=debian/patches + quilt new Modify_README.source + quilt edit README.source - * To modify the source and save those modifications so that - they will be applied when building the package, pick a - suitably informative patch file name, for example - 01_add_README.source_file.patch, and then run: + This will place you in your default editor to modify the file. + Once your are done editing, save the file and run: - cdbs-edit-patch 01_add_README.source_file.patch + quilt refresh - This will place you in a new shell in a temporary copy of the - source tree. Make your desired modifications to it, and then - exit the shell to create the patch file containing them (this - file will appear in debian/patches). + * To remove source modifications that are currently being applied when + building the package, run: - * To remove source modifications that are currently being - applied when building the package, run: + export QUILT_PATCHES=debian/patches + quilt top - make -f debian/rules reverse-patches - Modified: trunk/electric/debian/ant.properties =================================================================== --- trunk/electric/debian/ant.properties 2010-01-06 23:53:27 UTC (rev 11331) +++ trunk/electric/debian/ant.properties 2010-01-09 11:12:34 UTC (rev 11332) @@ -1,4 +1,4 @@ ant.build.javac.source=1.5 ant.build.javac.target=1.5 -NO3D=1 GNU=1 +NOMAC=1 Modified: trunk/electric/debian/changelog =================================================================== --- trunk/electric/debian/changelog 2010-01-06 23:53:27 UTC (rev 11331) +++ trunk/electric/debian/changelog 2010-01-09 11:12:34 UTC (rev 11332) @@ -1,3 +1,25 @@ +electric (8.10-1) unstable; urgency=low + + * New upstream version. + * debian/control + - Add libjava3d-java and quilt build dependencies. + - Update standards version to 3.8.3. + - Add libjava3d-java as recommends to binary package. + * debian/rules + - Use quilt patch system instead of simple patchsys. + - Add java3d related jar files to DEB_JARS. + * debian/patches/* + - Update as per current upstream source. Convert to quilt. + * debian/ant.properties + - Do not disable 3D plugin anymore. + - Use new property to disable compilation of OS X related classes. + * debian/wrappers/electric + - Add java3d related jar files to runtime classpath. + * debian/README.source + - Change text to the appropriate one for quilt. + + -- Onkar Shinde <onkarshi...@ubuntu.com> Sat, 09 Jan 2010 16:26:04 +0530 + electric (8.09-1) unstable; urgency=low * New upstream version. Modified: trunk/electric/debian/control =================================================================== --- trunk/electric/debian/control 2010-01-06 23:53:27 UTC (rev 11331) +++ trunk/electric/debian/control 2010-01-09 11:12:34 UTC (rev 11332) @@ -3,9 +3,9 @@ Priority: optional Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org> Uploaders: "Barak A. Pearlmutter" <b...@debian.org>, Onkar Shinde <onkarshi...@ubuntu.com> -Build-Depends: debhelper (>= 6), cdbs, ant -Build-Depends-Indep: openjdk-6-jdk, bsh -Standards-Version: 3.8.2 +Build-Depends: debhelper (>= 6), cdbs, ant, quilt +Build-Depends-Indep: openjdk-6-jdk, bsh, libjava3d-java +Standards-Version: 3.8.3 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 @@ -13,6 +13,7 @@ Package: electric Architecture: all Depends: ${misc:Depends}, openjdk-6-jre, bsh, java-wrappers +Recommends: libjava3d-java 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, Modified: trunk/electric/debian/patches/01_fix_build_xml.patch =================================================================== --- trunk/electric/debian/patches/01_fix_build_xml.patch 2010-01-06 23:53:27 UTC (rev 11331) +++ trunk/electric/debian/patches/01_fix_build_xml.patch 2010-01-09 11:12:34 UTC (rev 11332) @@ -1,33 +1,31 @@ -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 --> -@@ -338,10 +339,10 @@ - </antcall> +Index: electric-8.10/build.xml +=================================================================== +--- electric-8.10.orig/build.xml 2010-01-04 23:42:20.000000000 +0530 ++++ electric-8.10/build.xml 2010-01-04 23:46:41.000000000 +0530 +@@ -371,10 +371,10 @@ + </antcall> </target> -- <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="${JUnit}"/--> - <delete dir="META-INF"/> - <copy file="packaging/electric.mf" tofile="electric.mf"/> - <jar basedir="." compress="true" jarfile="electric.jar" manifest="electric.mf"> -@@ -362,6 +363,7 @@ +- <target name="jarWithTests" depends="clean,init,compileTests" description="Make binary Jar file"> +- <antcall target="unjarSUN"></antcall> +- <copy file="../packaging/electric.mf" tofile="electric.mf"/> +- <jar basedir="." compress="true" jarfile="electric.jar" manifest="electric.mf"> ++ <target name="jarWithTests" depends="clean,init,compile" description="Make binary Jar file"> ++ <!--antcall target="unjarSUN"></antcall--> ++ <!--copy file="../packaging/electric.mf" tofile="electric.mf"/--> ++ <jar basedir="." compress="true" jarfile="electric.jar"> + <exclude name="**/.nfs*"/> + <exclude name="apidoc/"/> + <exclude name="build.xml" unless="source"/> +@@ -393,8 +393,9 @@ <patternset refid="exclusion" /> <exclude name="**/*.java" unless="source"/> <exclude name="**/*.form" unless="source"/> +- <zipfileset src="${AppleJava}" excludes="META-INF/**"/> +- <zipfileset src="${JUnit}" excludes="META-INF/**"/> + <exclude name="debian/"/> - </jar> - <delete file="electric.mf"/> - <antcall target="deleteExternalJars"></antcall> ++ <!--zipfileset src="${AppleJava}" excludes="META-INF/**"/> ++ <zipfileset src="${JUnit}" excludes="META-INF/**"/--> + <!-- + <zipfileset src="${beanshell}" excludes="META-INF/**"> + <selector if="SUN"> Added: trunk/electric/debian/patches/series =================================================================== --- trunk/electric/debian/patches/series (rev 0) +++ trunk/electric/debian/patches/series 2010-01-09 11:12:34 UTC (rev 11332) @@ -0,0 +1 @@ +01_fix_build_xml.patch Modified: trunk/electric/debian/rules =================================================================== --- trunk/electric/debian/rules 2010-01-06 23:53:27 UTC (rev 11331) +++ trunk/electric/debian/rules 2010-01-09 11:12:34 UTC (rev 11332) @@ -1,11 +1,11 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/rules/simple-patchsys.mk +include /usr/share/cdbs/1/rules/patchsys-quilt.mk include /usr/share/cdbs/1/class/ant.mk JAVA_HOME := /usr/lib/jvm/java-6-openjdk -DEB_JARS := bsh +DEB_JARS := bsh vecmath j3dcore j3dutils DEB_INSTALL_CHANGELOGS_ALL := ChangeLog.txt Modified: trunk/electric/debian/wrappers/electric =================================================================== --- trunk/electric/debian/wrappers/electric 2010-01-06 23:53:27 UTC (rev 11331) +++ trunk/electric/debian/wrappers/electric 2010-01-09 11:12:34 UTC (rev 11332) @@ -6,5 +6,6 @@ find_java_runtime openjdk find_jars bsh electric +find_jars vecmath j3dcore j3dutils run_java com.sun.electric.Launcher "$@" _______________________________________________ pkg-java-commits mailing list pkg-java-comm...@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits