[electric] 12/19: Debian release 9.04+dfsg-1
Markus Koschany
apo-guest at moszumanska.debian.org
Wed Jul 9 09:49:39 UTC 2014
This is an automated email from the git hooks/post-receive script.
apo-guest pushed a commit to branch master
in repository electric.
commit 78bf99f52769542590dbd297f2951e6b3839a68f
Author: Markus Koschany <apo at gambaru.de>
Date: Fri Apr 4 19:20:48 2014 +0000
Debian release 9.04+dfsg-1
---
debian/README.source | 32 --------------
debian/TODO.Debian | 1 -
debian/ant.properties | 4 --
debian/{wrappers => bin}/electric | 4 +-
debian/changelog | 35 +++++++++++++++
debian/compat | 2 +-
debian/control | 31 ++++++++++----
debian/copyright | 41 +++++++++++-------
debian/electric.desktop | 2 +
debian/electric.docs | 2 -
debian/{ => icons}/electric.svg | 0
debian/icons/electric.xpm | 81 +++++++++++++++++++++++++++++++++++
debian/install | 9 ++--
debian/menu | 12 +++---
debian/orig-tar.sh | 20 ---------
debian/patches/01_fix_build_xml.patch | 31 --------------
debian/patches/build.patch | 51 ++++++++++++++++++++++
debian/patches/series | 2 +-
debian/rules | 12 +++---
debian/watch | 9 ++--
20 files changed, 241 insertions(+), 140 deletions(-)
diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index 56ec679..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,32 +0,0 @@
-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:
-
- export QUILT_PATCHES=debian/patches
- quilt push -a
-
- * 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:
-
- export QUILT_PATCHES=debian/patches
- quilt new Modify_README.source
- quilt edit README.source
-
- This will place you in your default editor to modify the file.
- Once your are done editing, save the file and run:
-
- quilt refresh
-
- * To remove source modifications that are currently being applied when
- building the package, run:
-
- export QUILT_PATCHES=debian/patches
- quilt top
-
diff --git a/debian/TODO.Debian b/debian/TODO.Debian
deleted file mode 100644
index bf10aae..0000000
--- a/debian/TODO.Debian
+++ /dev/null
@@ -1 +0,0 @@
-- add icon for electric in the debian menu system
diff --git a/debian/ant.properties b/debian/ant.properties
deleted file mode 100644
index 7d5b11a..0000000
--- a/debian/ant.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-ant.build.javac.source=1.5
-ant.build.javac.target=1.5
-GNU=1
-NOMAC=1
diff --git a/debian/wrappers/electric b/debian/bin/electric
similarity index 67%
rename from debian/wrappers/electric
rename to debian/bin/electric
index a7639a0..08aa3e1 100644
--- a/debian/wrappers/electric
+++ b/debian/bin/electric
@@ -5,7 +5,7 @@
find_java_runtime openjdk
-find_jars bsh electric
-find_jars vecmath j3dcore j3dutils
+find_jars bsh jython electric
+find_jars vecmath j3dcore j3dutils slf4j-simple
run_java com.sun.electric.Launcher "$@"
diff --git a/debian/changelog b/debian/changelog
index 8bf6c9b..8caa66a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,38 @@
+electric (9.04+dfsg-1) unstable; urgency=medium
+
+ * Imported Upstream version 9.04. (Closes: #598445)
+ * Declare compliance with Debian Policy 3.9.5.
+ * Use compat level 9 and require debhelper >= 9.
+ * debian/control:
+ - Remove Onkar Shinde from Uploaders. He is apparently not active anymore.
+ - Add myself to Uploaders.
+ - Use canonical VCS fields.
+ - New build-dependencies for plugins and additional features:
+ + scala, jython, libslf4j-java.
+ - Use ${java:Depends} substvar.
+ - Remove recommendation for libjava3d-java. It is a dependency now.
+ - Depend on default-jre | java7-runtime.
+ * electric.desktop: Add comment in German and Keywords.
+ * Drop README.source since source format 3.0 uses quilt by default.
+ * Drop TODO.Debian. Done.
+ * Drop ant.properties files. Not needed.
+ * Drop orig.tar.sh script and use the Files-Excluded mechanism.
+ * Update menu file. Add longtitle and icon entry.
+ * Add electric.xpm icon and install it to /usr/share/pixmaps.
+ * wrap-and-sort -sa.
+ * debian/patches:
+ - Drop 01_fix_build_xml.patch. It is obsolete.
+ - Add build.patch.
+ + Search for jars in /usr/share/java.
+ + Use UTF-8 for encoding.
+ + Do not build MacOSX specific code.
+ * Switch from cdbs to javahelper and dh sequencer.
+ * Move icons to debian/icons subdirectory.
+ * Rename wrappers directory to bin.
+ * Improve watch file. Mangle version correctly.
+
+ -- Markus Koschany <apo at gambaru.de> Fri, 04 Apr 2014 13:51:14 +0200
+
electric (8.10-2) unstable; urgency=low
* Team upload
diff --git a/debian/compat b/debian/compat
index 7f8f011..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+9
diff --git a/debian/control b/debian/control
index a5ef906..a4e6469 100644
--- a/debian/control
+++ b/debian/control
@@ -2,21 +2,34 @@ Source: electric
Section: electronics
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: "Barak A. Pearlmutter" <bap at debian.org>, Onkar Shinde <onkarshinde at ubuntu.com>
-Build-Depends: debhelper (>= 7), cdbs, ant
-Build-Depends-Indep: default-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
+Uploaders:
+ Barak A. Pearlmutter <bap at debian.org>,
+ Markus Koschany <apo at gambaru.de>
+Build-Depends:
+ ant,
+ debhelper (>= 9),
+ javahelper
+Build-Depends-Indep:
+ bsh,
+ default-jdk,
+ jython,
+ libjava3d-java,
+ libslf4j-java,
+ scala
+Standards-Version: 3.9.5
+Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/electric
+Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/electric
Homepage: http://www.staticfreesoft.com/productsFree.html
Package: electric
Architecture: all
-Depends: ${misc:Depends}, default-jre, bsh, java-wrappers
-Recommends: libjava3d-java
+Depends:
+ default-jre | java7-runtime,
+ java-wrappers,
+ ${java:Depends},
+ ${misc:Depends}
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,
hardware description language specifications, and electro-mechanical hybrid
layout.
-
diff --git a/debian/copyright b/debian/copyright
index 6355cdb..bd1c31a 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,19 +1,30 @@
-This package was debianized by Chris Ruffin <cmruffin at debian.org> on
-Sat, 9 Sep 2000 16:50:25 -0400.
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: Electric
+Source: ftp://ftp.gnu.org/pub/gnu/electric
+Files-Excluded:
+ *.jar
+ *.class
+ com/sun/electric/tool/user/MacOSXInterface.java
-It was downloaded from ftp://ftp.gnu.org/pub/gnu/electric/
-Upstream Author: Static Free Software <info at staticfreesoft.com>
- or
- Steven Rubin <strubin at staticfreesoft.com>
+Files: *
+Copyright: 2000-2013, Oracle and/or its affiliates
+ Static Free Software
+ Sun Microsystems
+ Karlsruhe Institute of Technology (KIT)
+ and other contributors
+License: GPL-3+
-Copyright:
+Files: debian/*
+Copyright: 2000-2002, Chris Ruffin <cmruffin at debian.org>
+ 2004-2005, Kyle McMartin <kyle at debian.org>
+ 2006, Kai Hendry <hendry at iki.fi>
+ 2008, Ralf Treinen <treinen at debian.org>
+ 2008-2010, Onkar Shinde <onkarshinde at gmail.com>
+ 2011, Torsten Werner <twerner at debian.org>
+ 2014, Markus Koschany <apo at gambaru.de>
+License: GPL-3+
-Copyright (c) 2003 Sun Microsystems and Static Free Software
-These scripts are free software; you can redistribute it and/or modify it
-under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 3, or (at your option) any
-later version.
-
-On Debian GNU/Linux systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL'.
+License: GPL-3+
+ On Debian systems the complete text of the GNU General Public License 3
+ can be found in `/usr/share/common-licenses/GPL-3'.
diff --git a/debian/electric.desktop b/debian/electric.desktop
index 405d564..56a6ca6 100644
--- a/debian/electric.desktop
+++ b/debian/electric.desktop
@@ -3,7 +3,9 @@ Version=1.0
Name=electric
GenericName=Electrical CAD
Comment=Electrical CAD System
+Comment[de]=CAD-System für elektrische Schaltpläne
Type=Application
Exec=electric
Icon=electric
Categories=Education;Electronics;Engineering;
+Keywords=CAD;editor;electrical;circuits;engineering;
diff --git a/debian/electric.docs b/debian/electric.docs
index 6da10b4..71dfd5b 100644
--- a/debian/electric.docs
+++ b/debian/electric.docs
@@ -1,3 +1 @@
README.txt
-#ChangeLog.txt
-
diff --git a/debian/electric.svg b/debian/icons/electric.svg
similarity index 100%
rename from debian/electric.svg
rename to debian/icons/electric.svg
diff --git a/debian/icons/electric.xpm b/debian/icons/electric.xpm
new file mode 100644
index 0000000..ba1c294
--- /dev/null
+++ b/debian/icons/electric.xpm
@@ -0,0 +1,81 @@
+/* XPM */
+static char *electric[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 43 1 ",
+" c black",
+". c #020202",
+"X c #030303",
+"o c #040404",
+"O c #050505",
+"+ c #070707",
+"@ c #090909",
+"# c #0A0A0A",
+"$ c #0C0C0C",
+"% c #101010",
+"& c #111111",
+"* c #121212",
+"= c #161616",
+"- c #181818",
+"; c #191919",
+": c #1C1C1C",
+"> c #1D1D1D",
+", c #1F1F1F",
+"< c #232323",
+"1 c #242424",
+"2 c #262626",
+"3 c #292929",
+"4 c #2D2D2D",
+"5 c #323232",
+"6 c #333333",
+"7 c #343434",
+"8 c #353535",
+"9 c #383838",
+"0 c #3B3B3B",
+"q c #3C3C3C",
+"w c #414141",
+"e c #424242",
+"r c #434343",
+"t c #494949",
+"y c #4A4A4A",
+"u c #4B4B4B",
+"i c #4D4D4D",
+"p c #4E4E4E",
+"a c #4F4F4F",
+"s c #515151",
+"d c #525252",
+"f c #545454",
+"g c None",
+/* pixels */
+"gggggggggggggggggggggggggggggggg",
+"gggggggggggggggggggggggggggggggg",
+"gggggggg gggggggg",
+"ggggggg gggggggggggggggg gggggg",
+"ggggg gggggggggggggggggggg ggggg",
+"gggg gggggggggggggggggggggg gggg",
+"ggg gggggggggggggggggggggggg ggg",
+"ggg ggggo;<;oggggggg;,,$gggg ggg",
+"gg ggggg&yswoggggggo9si;ggggg gg",
+"gggggggg&ysw$ggggggoqsi;gggggggg",
+"g gggggg&ysw$ggggggoqsi;gggggg g",
+"g gggggg&yfw$ggggggoqfi=gggggg g",
+"gggggggg&yfw$gggggg$qfi;ggggggg ",
+" ggggggg&ifr$ggggggoqfs;ggggggg ",
+" ggggggg$794ogggggg 397&ggggggg ",
+" gggggggg o gggggggg o gggggggg ",
+" gggggggggggggggggggggggggggggg ",
+" gggggggggggggggggggggggggggggg ",
+" gggggggggggggggggggggggggggggg ",
+"ggggggggggggggggggggggggggggggg ",
+"g gggggggggggg$<3$gggggggggggg g",
+"g gggggggggggg4ss7oggggggggggg g",
+"gggggggggggggg7ssqoggggggggggggg",
+"gg ggggggggggg7ffqogggggggggg gg",
+"ggg gggggggggg,551oggggggggg ggg",
+"ggg gggggggggggggggggggggggg ggg",
+"gggg gggggggggggggggggggggg gggg",
+"ggggg ggggggggggggggggggg ggggg",
+"ggggggg gggggggggggggggg gggggg",
+"gggggggg gggggggg",
+"gggggggggggggggggggggggggggggggg",
+"gggggggggggggggggggggggggggggggg"
+};
diff --git a/debian/install b/debian/install
index 0084d92..236b267 100644
--- a/debian/install
+++ b/debian/install
@@ -1,4 +1,5 @@
-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/
+debian/bin/electric usr/bin
+debian/electric.desktop usr/share/applications
+debian/icons/electric.svg usr/share/icons/hicolor/scalable/apps
+debian/icons/electric.xpm usr/share/pixmaps
+electric.jar usr/share/java
diff --git a/debian/menu b/debian/menu
index 4f00fe8..64c46c3 100644
--- a/debian/menu
+++ b/debian/menu
@@ -1,5 +1,7 @@
-?package(electric):needs="X11"\
- section="Applications/Science/Engineering"\
- hints="CAD,Electric"\
- title="electric" \
- command="/usr/bin/electric"
+?package(electric):needs="X11" \
+ section="Applications/Science/Engineering" \
+ hints="CAD,Electric" \
+ title="Electric" \
+ longtitle="Electric - electrical CAD system" \
+ command="/usr/bin/electric" \
+ icon="/usr/share/pixmaps/electric.xpm"
diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh
deleted file mode 100755
index 1832025..0000000
--- a/debian/orig-tar.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/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
deleted file mode 100644
index cb7d86a..0000000
--- a/debian/patches/01_fix_build_xml.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-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>
-- <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/"/>
-+ <!--zipfileset src="${AppleJava}" excludes="META-INF/**"/>
-+ <zipfileset src="${JUnit}" excludes="META-INF/**"/-->
- <!--
- <zipfileset src="${beanshell}" excludes="META-INF/**">
- <selector if="SUN">
diff --git a/debian/patches/build.patch b/debian/patches/build.patch
new file mode 100644
index 0000000..9aa8b19
--- /dev/null
+++ b/debian/patches/build.patch
@@ -0,0 +1,51 @@
+From: Markus Koschany <apo at gambaru.de>
+Date: Fri, 4 Apr 2014 17:29:02 +0200
+Subject: build
+
+---
+ build.xml | 18 +++++++++++-------
+ 1 file changed, 11 insertions(+), 7 deletions(-)
+
+diff --git a/build.xml b/build.xml
+index 2d5b1a9..ac20f5c 100644
+--- a/build.xml
++++ b/build.xml
+@@ -26,7 +26,7 @@
+ <!-- *********************************** MAIN TARGET *********************************** -->
+
+ <target name="jar" depends="initialize" description="Make Jar file incrementally">
+- <property name="jarname" value="electric-${version}.jar" />
++ <property name="jarname" value="electric.jar" />
+ <echo message="Building ${jarname}" />
+ <mkdir dir="${antBuild}"/>
+ <antcall target="compile" />
+@@ -43,7 +43,6 @@
+
+ <!-- the location of various JAR files -->
+ <property name="org" value="${packaging}/org" />
+- <property name="AppleJava" value="${packaging}/AppleJavaExtensions-1.4.jar" />
+
+ <!-- does the build directory already exist? -->
+ <condition property="buildDirExists">
+@@ -65,11 +64,16 @@
+ </target>
+
+ <target name="compile" description="Compile Electric">
+- <javac debug="true" includeantruntime="false" destdir="${antBuild}" srcdir="${ElectricJavaLoc}"
+- fork="true" memoryMaximumSize="1024m" source="1.6" target="1.6">
+- <classpath>
+- <pathelement location="${packaging}" />
+- <pathelement location="${AppleJava}" />
++ <javac encoding="UTF-8" debug="true" includeantruntime="false" destdir="${antBuild}" srcdir="${ElectricJavaLoc}"
++ fork="true" memoryMaximumSize="1024m" source="1.6" target="1.6">
++ <classpath>
++ <pathelement location="/usr/share/java/bsh.jar" />
++ <pathelement location="/usr/share/java/vecmath.jar" />
++ <pathelement location="/usr/share/java/j3dcore.jar" />
++ <pathelement location="/usr/share/java/j3dutils.jar" />
++ <pathelement location="/usr/share/java/slf4j-api.jar" />
++ <pathelement location="/usr/share/java/scala-library.jar" />
++ <pathelement location="/usr/share/java/jython.jar" />
+ </classpath>
+ </javac>
+ <copy todir="${antBuild}/com">
diff --git a/debian/patches/series b/debian/patches/series
index 9638de8..5879227 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-01_fix_build_xml.patch
+build.patch
diff --git a/debian/rules b/debian/rules
index 456f67c..5d375ac 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,12 +1,10 @@
#!/usr/bin/make -f
+export JAVA_HOME=/usr/lib/jvm/default-java
+export CLASSPATH=/usr/share/java/bsh.jar:/usr/share/java/j3dcore.jar:/usr/share/java/j3dutils.jar:/usr/share/java/vecmath.jar:/usr/share/java/slf4j-simple.jar:/usr/share/java/slf4j-api.jar:/usr/share/java/jython.jar
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/ant.mk
-
-JAVA_HOME := /usr/lib/jvm/default-java
-DEB_JARS := bsh vecmath j3dcore j3dutils
-DEB_INSTALL_CHANGELOGS_ALL := ChangeLog.txt
+%:
+ dh $@ --parallel --with javahelper
get-orig-source::
- uscan --verbose --download-version $(DEB_UPSTREAM_VERSION) --force-download
+ uscan --verbose --repack --force-download
diff --git a/debian/watch b/debian/watch
index d68f4b9..1bb458c 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,7 +1,4 @@
-# Example watch control file for uscan
-# Rename this file to "watch" and then you can run the "uscan" command
-# to check for upstream updates and more.
-# Site Directory Pattern Version Script
version=3
-
-http://ftp.gnu.org/pub/gnu/electric/electric-(.*)\.jar debian debian/orig-tar.sh
+opts=uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha|b|a)[\-\.]?\d*)$/$1~$2/,\
+dversionmangle=s/(\da?)[\+\.\-~](?:dfsg|debian|ds|repack|repacked)\.?\d*$/$1/ \
+http://ftp.gnu.org/pub/gnu/electric/electric-(.*)\.(?:jar|tgz|tbz2|txz|tar\.gz|tar\.bz2|tar\.xz)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/electric.git
More information about the pkg-java-commits
mailing list