[jsurf-alggeo] 03/03: Imported Debian patch 0.2.0+ds-1
Jerome Benoit
calculus-guest at moszumanska.debian.org
Tue Nov 10 02:40:45 UTC 2015
This is an automated email from the git hooks/post-receive script.
calculus-guest pushed a commit to branch master
in repository jsurf-alggeo.
commit 3a04b94c48c05ba245f333328e923729173319c4
Author: Jerome Benoit <calculus at rezozer.net>
Date: Tue Nov 10 03:32:30 2015 +0100
Imported Debian patch 0.2.0+ds-1
---
debian/adhoc/Makefile | 4 +-
debian/adhoc/script/jsurf-alggeo | 2 +-
debian/changelog | 10 ++
debian/jsurf-alggeo.docs | 1 -
debian/maven.rules | 1 -
debian/patches/debianization.patch | 23 ++-
debian/patches/upstream-java2help2man.patch | 155 +--------------------
debian/rules | 15 +-
.../jsurf-alggeo.manifest.in} | 1 +
.../jsurf-alggeo.pom.in} | 2 +-
10 files changed, 47 insertions(+), 167 deletions(-)
diff --git a/debian/adhoc/Makefile b/debian/adhoc/Makefile
index 8e0d509..6719080 100644
--- a/debian/adhoc/Makefile
+++ b/debian/adhoc/Makefile
@@ -1,13 +1,11 @@
TOP_BUILDDIR ?= $(CURDIR)
-jsurf_alggeo_DESCRIPTION = "Java based renderer for ALGebraic GEOmetric SURFaces"
+jsurf_alggeo_DESCRIPTION = "Java based renderer for real ALGebraic GEOmetric SURFaces"
HELP2MAN = help2man
H2MFLAGS = \
--manual="IMAGINARY" \
- --source="jsurf-alggeo $(DEB_PKG_VERSION)" \
- --version-string="$(DEB_PKG_VERSION)" \
--no-info
default:
diff --git a/debian/adhoc/script/jsurf-alggeo b/debian/adhoc/script/jsurf-alggeo
index fc3147c..a2b5456 100755
--- a/debian/adhoc/script/jsurf-alggeo
+++ b/debian/adhoc/script/jsurf-alggeo
@@ -2,6 +2,6 @@
JAVA_HOME=${JAVA_HOME:-/usr/lib/jvm/default-java}
JSURF_ALGGEO_JAR=${JSURF_ALGGEO_JAR:-/usr/share/java/jsurf-alggeo.jar}
[ -e ${JSURF_ALGGEO_JAR} ] || exit 127
-exec ${JAVA_HOME}/bin/java -jar ${JSURF_ALGGEO_JAR} $@
+exec ${JAVA_HOME}/bin/java -XX:-UsePerfData -jar ${JSURF_ALGGEO_JAR} $@
exit 126
# eos
diff --git a/debian/changelog b/debian/changelog
index 4f20f18..b7b6fa1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+jsurf-alggeo (0.2.0+ds-1) unstable; urgency=medium
+
+ * New upstream release.
+ * Debianization:
+ - debian/templates/*, introduce;
+ - debian/adhoc/script/jsurf-alggeo, harden;
+ - refresh and update.
+
+ -- Jerome Benoit <calculus at rezozer.net> Tue, 10 Nov 2015 02:31:27 +0000
+
jsurf-alggeo (0.1.4+ds-2) unstable; urgency=medium
* RC bug fix release (Closes: #803261), provide a shell wrapper to work around
diff --git a/debian/jsurf-alggeo.docs b/debian/jsurf-alggeo.docs
deleted file mode 100644
index 6d5ee1d..0000000
--- a/debian/jsurf-alggeo.docs
+++ /dev/null
@@ -1 +0,0 @@
-NOTICE
diff --git a/debian/maven.rules b/debian/maven.rules
deleted file mode 100644
index 9278bb0..0000000
--- a/debian/maven.rules
+++ /dev/null
@@ -1 +0,0 @@
-##* * * s/.*/debian/ *
diff --git a/debian/patches/debianization.patch b/debian/patches/debianization.patch
index a233b5d..09b72b9 100644
--- a/debian/patches/debianization.patch
+++ b/debian/patches/debianization.patch
@@ -8,12 +8,21 @@ Last-Update: 2015-09-07
--- a/src/main/java/de/mfo/jsurf/Main.java
+++ b/src/main/java/de/mfo/jsurf/Main.java
-@@ -38,7 +38,7 @@
- import de.mfo.jsurf.util.FileFormat;
+@@ -39,7 +39,7 @@
- public class Main {
-- public static final String PROGRAM_NAME = "jsurf";
-+ public static final String PROGRAM_NAME = "jsurf-alggeo";
-
- private static Options options = new Options();
+ public class Main {
+- public static final String jsurf_progname = "jsurf";
++ public static final String jsurf_progname = "jsurf-alggeo";
+
+ static int size = 100;
+ static AntiAliasingMode aam;
+@@ -86,7 +86,7 @@
+ CommandLineParser parser = new PosixParser();
+ HelpFormatter formatter = new HelpFormatter();
+ String cmd_line_syntax = jsurf_progname + " [options] jsurf_file\n\n";
+- String help_header = jsurf_progname + " is a renderer for real algebraic surfaces.\n" +
++ String help_header = jsurf_progname + " is a renderer for real algebraic geometric surfaces.\n" +
+ "If - is specified as a filename, the jsurf file is read from standard input.\n\n";
+ String help_footer = "";
+ try
diff --git a/debian/patches/upstream-java2help2man.patch b/debian/patches/upstream-java2help2man.patch
index d04755c..11d0e90 100644
--- a/debian/patches/upstream-java2help2man.patch
+++ b/debian/patches/upstream-java2help2man.patch
@@ -4,167 +4,18 @@ Description: format usages and helps
meant to be submitted to the upstream maintainer.
Origin: debian
Author: Jerome Benoit <calculus at rezozer.net>
-Last-Update: 2015-09-06
+Last-Update: 2015-11-10
--- a/src/main/java/de/mfo/jsurf/Main.java
+++ b/src/main/java/de/mfo/jsurf/Main.java
-@@ -37,7 +37,10 @@
- import de.mfo.jsurf.rendering.cpu.CPUAlgebraicSurfaceRenderer.AntiAliasingMode;
- import de.mfo.jsurf.util.FileFormat;
-
--public class Main {
-+public class Main {
-+ public static final String PROGRAM_NAME = "jsurf";
-+
-+ private static Options options = new Options();
-
- static int size = 100;
- static AntiAliasingMode aam;
-@@ -64,45 +67,52 @@
- AffineTransformOp op = new AffineTransformOp(tx, AffineTransformOp.TYPE_NEAREST_NEIGHBOR);
- return op.filter(bi, null);
- }
--
-+
-+ private static void help ( int exit_value )
-+ {
-+ HelpFormatter formatter = new HelpFormatter();
-+ formatter.setSyntaxPrefix("Usage: ");
-+ String cmd_line_syntax = PROGRAM_NAME + " [options] jsurf_script";
-+ String help_header = PROGRAM_NAME + " is a renderer for algebraic geometric surfaces. "
-+ + "If - is specified as a filename the jsurf script is read from standard input.";
-+ String help_footer = "";
-+ formatter.printHelp( cmd_line_syntax, help_header, options, help_footer );
-+ System.exit( exit_value );
-+ }
-+
- /**
- * @param args
- */
-- public static void main(String[] args) {
--
-+ public static void main(String[] args) {
-+
- String jsurf_filename = "";
- String output_filename = null;
--
-- Options options = new Options();
--
-+
- options.addOption("s","size", true, "width (and height) of a image (default: " + size + ")");
- options.addOption("q","quality",true,"quality of the rendering: 0 (low), 1 (medium, default), 2 (high), 3 (extreme)");
-- options.addOption("o","output",true,"output PNG into this file (- means standard output. Use ./- to denote a file literally named -.)");
-+ options.addOption("o","output",true,"output PNG into this file (- means standard output)");
-+ options.addOption("h","help",false,"display this help and exit");
-+
-+ CommandLineParser parser = new PosixParser();
-
-- CommandLineParser parser = new PosixParser();
-- HelpFormatter formatter = new HelpFormatter();
-- String cmd_line_syntax = "jsurf [options] jsurf_file";
-- String help_header = "jsurf is a renderer for algebraic surfaces. If - is specified as a filename the jsurf file is read from standard input. " +
-- "Use ./- to denote a file literally named -.";
-- String help_footer = "";
- try
- {
- CommandLine cmd = parser.parse( options, args );
--
-+
-+ if( cmd.hasOption( "help" ) )
-+ help( 0 );
-+
- if( cmd.getArgs().length > 0)
- jsurf_filename = cmd.getArgs()[ 0 ];
- else
-- {
-- formatter.printHelp( cmd_line_syntax, help_header, options, help_footer );
-- return;
-- }
--
-+ help( 0 );
-+
- if( cmd.hasOption( "output" ) )
- output_filename = cmd.getOptionValue("output");
--
-+
- if( cmd.hasOption("size") )
- size = Integer.parseInt( cmd.getOptionValue("size") );
--
-+
- int quality = 1;
- if( cmd.hasOption("quality") )
- quality = Integer.parseInt( cmd.getOptionValue( "quality" ) );
-@@ -125,16 +135,16 @@
- aap = AntiAliasingPattern.QUINCUNX;
- }
- }
-- catch( ParseException exp ) {
-+ catch( ParseException exp )
-+ {
- System.out.println( "Unexpected exception:" + exp.getMessage() );
- System.exit( -1 );
- }
- catch( NumberFormatException nfe )
-- {
-- formatter.printHelp( cmd_line_syntax, help_header, options, help_footer );
-- System.exit( -1 );
-- }
--
-+ {
-+ help( -1 );
-+ }
-+
- try
- {
- Properties jsurf = new Properties();
-@@ -142,25 +152,24 @@
- jsurf.load( System.in );
- else
- jsurf.load( new FileReader( jsurf_filename ) );
-- FileFormat.load( jsurf, asr );
-+ FileFormat.load( jsurf, asr );
- }
-- catch( Exception e )
-+ catch( Exception e )
- {
-- System.err.println( "Unable to read jsurf file " + jsurf_filename );
-+ System.err.println( "Unable to read jsurf script " + jsurf_filename );
- e.printStackTrace();
- System.exit( -2 );
- }
--
-+
- asr.setAntiAliasingMode( aam );
- asr.setAntiAliasingPattern( aap );
--
-+
- BufferedImage bi = null;
- try
- {
- ImgBuffer ib = new ImgBuffer( size, size );
- asr.draw( ib.rgbBuffer, size, size );
- bi = flipV( createBufferedImageFromRGB( ib ) );
--
- }
- catch( Exception e )
- {
-@@ -168,7 +177,7 @@
- e.printStackTrace();
- System.exit( -3 );
- }
--
-+
- if( output_filename != null )
- {
- // save to file
-@@ -191,8 +200,8 @@
+@@ -207,8 +207,8 @@
}
else
{
- // display the image in a window
- final String window_title = "jsurf: " + jsurf_filename;
+ // display the image in a window
-+ final String window_title = PROGRAM_NAME + ": " + jsurf_filename;
++ final String window_title = jsurf_progname + ": " + jsurf_filename;
final BufferedImage window_image = bi;
SwingUtilities.invokeLater( new Runnable() {
public void run()
diff --git a/debian/rules b/debian/rules
index 936c52e..49aeca1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,7 @@
#!/usr/bin/make -f
-export DEB_PKG_VERSION = $(shell dpkg-parsechangelog | sed -n -e '/^Version:/s/Version: //p')
+UPS_PKG_VERSION = $(shell dpkg-parsechangelog -S Version | sed s/+.*//)
+DEB_PKG_VERSION = $(shell dpkg-parsechangelog -S Version)
export JAVA_HOME ?= /usr/lib/jvm/default-java
export CLASSPATH = /usr/share/java/vecmath.jar:/usr/share/java/antlr3-runtime.jar:/usr/share/java/commons-cli.jar
@@ -16,6 +17,14 @@ default:
override_jh_build-indep:
jh_build --javacopts="-source 1.7 -target 1.7" --javadoc-opts="-source 1.7"
+override_dh_prep-indep:
+ sed \
+ -e "s|@DEB_PKG_VERSION@|$(DEB_PKG_VERSION)|" \
+ debian/templates/jsurf-alggeo.manifest.in > debian/jsurf-alggeo.manifest
+ sed \
+ -e "s|@UPS_PKG_VERSION@|$(UPS_PKG_VERSION)|" \
+ debian/templates/jsurf-alggeo.pom.in > debian/poms/jsurf-alggeo.pom
+
override_dh_auto_install-indep:
$(MAKE) -C examples install DESTDIR=$(CURDIR)/debian/tmp
@@ -32,5 +41,9 @@ override_jh_exec:
override_dh_compress-indep:
dh_compress -Xexamples
+override_dh_auto_clean-indep:
+ dh_auto_clean -i
+ rm -f debian/jsurf-alggeo.manifest debian/poms/jsurf-alggeo.pom
+
get-orig-source:
uscan --no-conf --download-current-version --compression xz --verbose
diff --git a/debian/jsurf-alggeo.manifest b/debian/templates/jsurf-alggeo.manifest.in
similarity index 71%
rename from debian/jsurf-alggeo.manifest
rename to debian/templates/jsurf-alggeo.manifest.in
index 8d53c3c..12da0da 100644
--- a/debian/jsurf-alggeo.manifest
+++ b/debian/templates/jsurf-alggeo.manifest.in
@@ -1,3 +1,4 @@
usr/share/java/jsurf-alggeo.jar:
Main-Class: de.mfo.jsurf.Main
+ Implementation-Version: @DEB_PKG_VERSION@
Debian-Java-Home: /usr/lib/jvm/default-java
diff --git a/debian/poms/jsurf-alggeo.pom b/debian/templates/jsurf-alggeo.pom.in
similarity index 95%
rename from debian/poms/jsurf-alggeo.pom
rename to debian/templates/jsurf-alggeo.pom.in
index 5e9fb44..d763b4d 100644
--- a/debian/poms/jsurf-alggeo.pom
+++ b/debian/templates/jsurf-alggeo.pom.in
@@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>de.mfo.jsurf</groupId>
<artifactId>jsurf</artifactId>
- <version>0.1.4</version>
+ <version>@UPS_PKG_VERSION@</version>
<dependencies>
<dependency>
<groupId>javax</groupId>
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/jsurf-alggeo.git
More information about the debian-science-commits
mailing list