[pkg-java] r11155 - trunk/junit/debian

Damien Raude-Morvan drazzib at alioth.debian.org
Sun Nov 29 00:28:54 UTC 2009


Author: drazzib
Date: 2009-11-29 00:28:53 +0000 (Sun, 29 Nov 2009)
New Revision: 11155

Added:
   trunk/junit/debian/MANIFEST.MF
   trunk/junit/debian/README.source
Removed:
   trunk/junit/debian/AboutDialog.java.diff
   trunk/junit/debian/README.Debian-source
   trunk/junit/debian/TestCollector.java.diff
   trunk/junit/debian/TestRunner.java
Modified:
   trunk/junit/debian/README.Debian
   trunk/junit/debian/changelog
   trunk/junit/debian/compat
   trunk/junit/debian/control
   trunk/junit/debian/copyright
   trunk/junit/debian/rules
Log:
* Add myself to Uploaders
* Bump debhelper version to >= 7
  - Rework debian/rules to use dh
* Bump Standards-Version to 3.8.3:
  - Rename debian/README.Debian-source to debian/README.source
* Build-Depends on default-jdk instead of default-jdk-builddep
  because we don't build a native GCJ package.
* Add Depends: ${misc:Depends}
* Restore SwingUI UI:
  - Don't remplace swingui TestRunner by an awtui TestRunner as, now,
    free java runtime fully support Swing
  - Remove unneeded debian/TestRunner.java file
* Add OSGi metadata to junit.jar (Closes: #558177)
* Rewrite debian/copyright with DEP5-format

Deleted: trunk/junit/debian/AboutDialog.java.diff
===================================================================
--- trunk/junit/debian/AboutDialog.java.diff	2009-11-28 10:08:31 UTC (rev 11154)
+++ trunk/junit/debian/AboutDialog.java.diff	2009-11-29 00:28:53 UTC (rev 11155)
@@ -1,12 +0,0 @@
-diff -uNr src.orig/junit/awtui/AboutDialog.java src/junit/awtui/AboutDialog.java
---- src.orig/junit/awtui/AboutDialog.java	2003-09-12 07:52:49.000000000 +0900
-+++ src/junit/awtui/AboutDialog.java	2003-09-12 07:53:26.000000000 +0900
-@@ -15,7 +15,7 @@
- 
- import junit.runner.Version;
- 
--class AboutDialog extends Dialog {
-+public class AboutDialog extends Dialog {
- 	public AboutDialog(Frame parent) {
- 		super(parent);
- 		

Added: trunk/junit/debian/MANIFEST.MF
===================================================================
--- trunk/junit/debian/MANIFEST.MF	                        (rev 0)
+++ trunk/junit/debian/MANIFEST.MF	2009-11-29 00:28:53 UTC (rev 11155)
@@ -0,0 +1,13 @@
+Manifest-Version: 1.0
+Bundle-ClassPath: junit.jar
+Bundle-Vendor: JUnit
+Bundle-Localization: plugin
+Bundle-RequiredExecutionEnvironment: J2SE-1.3
+Bundle-Name: JUnit Testing Framework
+Bundle-SymbolicName: org.junit
+Export-Package: junit.awtui;version="3.8.2",junit.extensions;version="
+ 3.8.2",junit.framework;version="3.8.2",junit.runner;version="3.8.2",j
+ unit.swingui;version="3.8.2",junit.swingui.icons;version="3.8.2",juni
+ t.textui;version="3.8.2"
+Bundle-Version: 3.8.2
+Bundle-ManifestVersion: 2

Modified: trunk/junit/debian/README.Debian
===================================================================
--- trunk/junit/debian/README.Debian	2009-11-28 10:08:31 UTC (rev 11154)
+++ trunk/junit/debian/README.Debian	2009-11-29 00:28:53 UTC (rev 11155)
@@ -1,8 +1,6 @@
 JUnit for Debian
 ----------------------
 
-* Debian specific parts (debian/*) are distributed under GPL.
-
 * /usr/bin/junit script provides the following options:
 
    -text    run junit.textui.TestRunner

Deleted: trunk/junit/debian/README.Debian-source
===================================================================
--- trunk/junit/debian/README.Debian-source	2009-11-28 10:08:31 UTC (rev 11154)
+++ trunk/junit/debian/README.Debian-source	2009-11-29 00:28:53 UTC (rev 11155)
@@ -1,10 +0,0 @@
-JUnit for Debian
-----------------
-
-The upstream supplied tar.gz package contains prebuild libraries. So,
-the orig-tar.sh script is used to automate rebuilding the tarball.
-
-For step-by-step information on how the orig.tar.sh is obtained,
-please look at the orig-tar.sh present in this directory.
-
- -- Kumar Appaiah <akumar at ee.iitm.ac.in>, Fri, 30 Nov 2007 12:50:43 +0530

Copied: trunk/junit/debian/README.source (from rev 11154, trunk/junit/debian/README.Debian-source)
===================================================================
--- trunk/junit/debian/README.source	                        (rev 0)
+++ trunk/junit/debian/README.source	2009-11-29 00:28:53 UTC (rev 11155)
@@ -0,0 +1,10 @@
+JUnit for Debian
+----------------
+
+The upstream supplied tar.gz package contains prebuild libraries. So,
+the orig-tar.sh script is used to automate rebuilding the tarball.
+
+For step-by-step information on how the orig.tar.sh is obtained,
+please look at the orig-tar.sh present in this directory.
+
+ -- Kumar Appaiah <akumar at ee.iitm.ac.in>, Fri, 30 Nov 2007 12:50:43 +0530

Deleted: trunk/junit/debian/TestCollector.java.diff
===================================================================
--- trunk/junit/debian/TestCollector.java.diff	2009-11-28 10:08:31 UTC (rev 11154)
+++ trunk/junit/debian/TestCollector.java.diff	2009-11-29 00:28:53 UTC (rev 11155)
@@ -1,10 +0,0 @@
---- src/junit/runner/TestCollector.java.orig	2007-12-27 22:54:55.000000000 +0100
-+++ src/junit/runner/TestCollector.java	2007-12-27 22:55:00.000000000 +0100
-@@ -1,7 +1,6 @@
- package junit.runner;
- 
- import java.util.Enumeration;
--import junit.swingui.TestSelector;
- 
- 
- /**

Deleted: trunk/junit/debian/TestRunner.java
===================================================================
--- trunk/junit/debian/TestRunner.java	2009-11-28 10:08:31 UTC (rev 11154)
+++ trunk/junit/debian/TestRunner.java	2009-11-29 00:28:53 UTC (rev 11155)
@@ -1,541 +0,0 @@
-package junit.swingui;
-
-import java.awt.*;
-import java.awt.event.*;
-import junit.awtui.*;
-import java.awt.image.ImageProducer;
-import java.util.Vector;
-
-import junit.framework.*;
-import junit.runner.*;
-
-
-/**
- * An AWT based user interface to run tests.
- * Enter the name of a class which either provides a static
- * suite method or is a subclass of TestCase.
- * <pre>
- * Synopsis: java junit.awtui.TestRunner [-noloading] [TestCase]
- * </pre>
- * TestRunner takes as an optional argument the name of the testcase class to be run.
- */
- public class TestRunner extends BaseTestRunner {
-	protected Frame fFrame;
-	protected Vector fExceptions;
-	protected Vector fFailedTests;
-	protected Thread fRunner;
-	protected TestResult fTestResult;
-
-	protected TextArea fTraceArea;
-	protected TextField fSuiteField;
-	protected Button fRun;
-	protected ProgressBar fProgressIndicator;
-	protected List fFailureList;
-	protected Logo fLogo;
-	protected Label fNumberOfErrors;
-	protected Label fNumberOfFailures;
-	protected Label fNumberOfRuns;
-	protected Button fQuitButton;
-	protected Button fRerunButton;
-	protected TextField fStatusLine;
-	protected Checkbox fUseLoadingRunner;
-
-	protected static final Font PLAIN_FONT= new Font("dialog", Font.PLAIN, 12);
-	private static final int GAP= 4;
-
-	public TestRunner() {
-	}
-
-	private void about() {
-		AboutDialog about= new AboutDialog(fFrame);
-		about.setModal(true);
-		about.setLocation(300, 300);
-		about.setVisible(true);
-	}
-
-	public void testStarted(String testName) {
-		showInfo("Running: "+testName);
-	}
-
-	public void testEnded(String testName) {
-		setLabelValue(fNumberOfRuns, fTestResult.runCount());
-		synchronized(this) {
-			fProgressIndicator.step(fTestResult.wasSuccessful());
-		}
-	}
-
-	public void testFailed(int status, Test test, Throwable t) {
-		switch (status) {
-			case TestRunListener.STATUS_ERROR:
-				fNumberOfErrors.setText(Integer.toString(fTestResult.errorCount()));
-				appendFailure("Error", test, t);
-				break;
-			case TestRunListener.STATUS_FAILURE:
-				fNumberOfFailures.setText(Integer.toString(fTestResult.failureCount()));
-				appendFailure("Failure", test, t);
-				break;
-		}
-	}
-
-	protected void addGrid(Panel p, Component co, int x, int y, int w, int fill, double wx, int anchor) {
-		GridBagConstraints c= new GridBagConstraints();
-		c.gridx= x; c.gridy= y;
-		c.gridwidth= w;
-		c.anchor= anchor;
-		c.weightx= wx;
-		c.fill= fill;
-		if (fill == GridBagConstraints.BOTH || fill == GridBagConstraints.VERTICAL)
-			c.weighty= 1.0;
-		c.insets= new Insets(y == 0 ? GAP : 0, x == 0 ? GAP : 0, GAP, GAP);
-		p.add(co, c);
-	}
-
-	private void appendFailure(String kind, Test test, Throwable t) {
-		kind+= ": " + test;
-		String msg= t.getMessage();
-		if (msg != null) {
-			kind+= ":" + truncate(msg);
-		}
-		fFailureList.add(kind);
-		fExceptions.addElement(t);
-		fFailedTests.addElement(test);
-		if (fFailureList.getItemCount() == 1) {
-			fFailureList.select(0);
-			failureSelected();
-		}
-	}
-	/**
-	 * Creates the JUnit menu. Clients override this
-	 * method to add additional menu items.
-	 */
-	protected Menu createJUnitMenu() {
-		Menu menu= new Menu("JUnit");
-		MenuItem mi= new MenuItem("About...");
-		mi.addActionListener(
-		    new ActionListener() {
-		        public void actionPerformed(ActionEvent event) {
-		            about();
-		        }
-		    }
-		);
-		menu.add(mi);
-
-		menu.addSeparator();
-		mi= new MenuItem("Exit");
-		mi.addActionListener(
-		    new ActionListener() {
-		        public void actionPerformed(ActionEvent event) {
-		            System.exit(0);
-		        }
-		    }
-		);
-		menu.add(mi);
-		return menu;
-	}
-
-	protected void createMenus(MenuBar mb) {
-		mb.add(createJUnitMenu());
-	}
-	protected TestResult createTestResult() {
-		return new TestResult();
-	}
-
-	protected Frame createUI(String suiteName) {
-		Frame frame= new Frame("JUnit");
-		Image icon= loadFrameIcon();
-		if (icon != null)
-			frame.setIconImage(icon);
-
-		frame.setLayout(new BorderLayout(0, 0));
-		frame.setBackground(SystemColor.control);
-		final Frame finalFrame= frame;
-
-		frame.addWindowListener(
-			new WindowAdapter() {
-				public void windowClosing(WindowEvent e) {
-					finalFrame.dispose();
-					System.exit(0);
-				}
-			}
-		);
-
-		MenuBar mb = new MenuBar();
-		createMenus(mb);
-		frame.setMenuBar(mb);
-
-		//---- first section
-		Label suiteLabel= new Label("Test class name:");
-
-		fSuiteField= new TextField(suiteName != null ? suiteName : "");
-		fSuiteField.selectAll();
-		fSuiteField.requestFocus();
-		fSuiteField.setFont(PLAIN_FONT);
-		fSuiteField.setColumns(40);
-		fSuiteField.addActionListener(
-			new ActionListener() {
-				public void actionPerformed(ActionEvent e) {
-					runSuite();
-				}
-			}
-		);
-		fSuiteField.addTextListener(
-			new TextListener() {
-				public void textValueChanged(TextEvent e) {
-					fRun.setEnabled(fSuiteField.getText().length() > 0);
-					fStatusLine.setText("");
-				}
-			}
-		);
-		fRun= new Button("Run");
-		fRun.setEnabled(false);
-		fRun.addActionListener(
-			new ActionListener() {
-				public void actionPerformed(ActionEvent e) {
-					runSuite();
-				}
-			}
-		);
-		boolean useLoader= useReloadingTestSuiteLoader();
-		fUseLoadingRunner= new Checkbox("Reload classes every run", useLoader);
-		if (inVAJava())
-			fUseLoadingRunner.setVisible(false);
-
-		//---- second section
-		fProgressIndicator= new ProgressBar();
-
-		//---- third section
-		fNumberOfErrors= new Label("0000", Label.RIGHT);
-		fNumberOfErrors.setText("0");
-		fNumberOfErrors.setFont(PLAIN_FONT);
-
-		fNumberOfFailures= new Label("0000", Label.RIGHT);
-		fNumberOfFailures.setText("0");
-		fNumberOfFailures.setFont(PLAIN_FONT);
-
-		fNumberOfRuns= new Label("0000", Label.RIGHT);
-		fNumberOfRuns.setText("0");
-		fNumberOfRuns.setFont(PLAIN_FONT);
-
-		Panel numbersPanel= createCounterPanel();
-
-		//---- fourth section
-		Label failureLabel= new Label("Errors and Failures:");
-
-		fFailureList= new List(5);
-		fFailureList.addItemListener(
-			new ItemListener() {
-				public void itemStateChanged(ItemEvent e) {
-					failureSelected();
-				}
-			}
-		);
-		fRerunButton= new Button("Run");
-		fRerunButton.setEnabled(false);
-		fRerunButton.addActionListener(
-			new ActionListener() {
-				public void actionPerformed(ActionEvent e) {
-					rerun();
-				}
-			}
-		);
-
-		Panel failedPanel= new Panel(new GridLayout(0, 1, 0, 2));
-		failedPanel.add(fRerunButton);
-
-		fTraceArea= new TextArea();
-		fTraceArea.setRows(5);
-		fTraceArea.setColumns(60);
-
-		//---- fifth section
-		fStatusLine= new TextField();
-		fStatusLine.setFont(PLAIN_FONT);
-		fStatusLine.setEditable(false);
-		fStatusLine.setForeground(Color.red);
-
-		fQuitButton= new Button("Exit");
-		fQuitButton.addActionListener(
-			new ActionListener() {
-				public void actionPerformed(ActionEvent e) {
-					System.exit(0);
-				}
-			}
-		);
-
-		// ---------
-		fLogo= new Logo();
-
-		//---- overall layout
-		Panel panel= new Panel(new GridBagLayout());
-
-		addGrid(panel, suiteLabel,		 0, 0, 2, GridBagConstraints.HORIZONTAL, 	1.0, GridBagConstraints.WEST);
-
-		addGrid(panel, fSuiteField, 	 0, 1, 2, GridBagConstraints.HORIZONTAL, 	1.0, GridBagConstraints.WEST);
-		addGrid(panel, fRun, 			 2, 1, 1, GridBagConstraints.HORIZONTAL, 	0.0, GridBagConstraints.CENTER);
-		addGrid(panel, fUseLoadingRunner, 0, 2, 2, GridBagConstraints.NONE, 	1.0, GridBagConstraints.WEST);
-		addGrid(panel, fProgressIndicator, 0, 3, 2, GridBagConstraints.HORIZONTAL, 	1.0, GridBagConstraints.WEST);
-		addGrid(panel, fLogo, 			 2, 3, 1, GridBagConstraints.NONE, 			0.0, GridBagConstraints.NORTH);
-
-		addGrid(panel, numbersPanel,	 0, 4, 2, GridBagConstraints.NONE, 			0.0, GridBagConstraints.WEST);
-
-		addGrid(panel, failureLabel, 	 0, 5, 2, GridBagConstraints.HORIZONTAL, 	1.0, GridBagConstraints.WEST);
-		addGrid(panel, fFailureList, 	 0, 6, 2, GridBagConstraints.BOTH, 			1.0, GridBagConstraints.WEST);
-		addGrid(panel, failedPanel, 	 2, 6, 1, GridBagConstraints.HORIZONTAL, 	0.0, GridBagConstraints.CENTER);
-		addGrid(panel, fTraceArea, 	     0, 7, 2, GridBagConstraints.BOTH, 			1.0, GridBagConstraints.WEST);
-
-		addGrid(panel, fStatusLine, 	 0, 8, 2, GridBagConstraints.HORIZONTAL, 	1.0, GridBagConstraints.CENTER);
-		addGrid(panel, fQuitButton, 	 2, 8, 1, GridBagConstraints.HORIZONTAL, 	0.0, GridBagConstraints.CENTER);
-
-		frame.add(panel, BorderLayout.CENTER);
-		frame.pack();
-		return frame;
-	}
-
-	protected Panel createCounterPanel() {
-		Panel numbersPanel= new Panel(new GridBagLayout());
-		addToCounterPanel(
-			numbersPanel,
-			new Label("Runs:"),
-			0, 0, 1, 1, 0.0, 0.0,
-          	GridBagConstraints.CENTER, GridBagConstraints.NONE,
-          	new Insets(0, 0, 0, 0) 
-		);	
-		addToCounterPanel(
-			numbersPanel,
-			fNumberOfRuns, 
-          	1, 0, 1, 1, 0.33, 0.0,
-          	GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL,
-          	new Insets(0, 8, 0, 40)
-		);
-		addToCounterPanel(
-			numbersPanel,
-			new Label("Errors:"),
-          	2, 0, 1, 1, 0.0, 0.0,
-          	GridBagConstraints.CENTER, GridBagConstraints.NONE,
-          	new Insets(0, 8, 0, 0)
-		);
-		addToCounterPanel(
-			numbersPanel,
-			fNumberOfErrors,
-          	3, 0, 1, 1, 0.33, 0.0,
-          	GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL,
-          	new Insets(0, 8, 0, 40)
-		);
-		addToCounterPanel(
-			numbersPanel,
-			new Label("Failures:"),
-          	4, 0, 1, 1, 0.0, 0.0,
-          	GridBagConstraints.CENTER, GridBagConstraints.NONE,
-          	new Insets(0, 8, 0, 0)
-		);	
-		addToCounterPanel(
-			numbersPanel,
-			fNumberOfFailures,
-          	5, 0, 1, 1, 0.33, 0.0,
-          	GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL,
-          	new Insets(0, 8, 0, 0) 
-		);
-		return numbersPanel;
-	}
-
-	private void addToCounterPanel(Panel counter, Component comp,
-	    	int gridx, int gridy, int gridwidth, int gridheight,
-			double weightx, double weighty,
-			int anchor, int fill,
-			Insets insets) {
-		
-		GridBagConstraints constraints= new GridBagConstraints();
-		constraints.gridx= gridx;
-		constraints.gridy= gridy;
-		constraints.gridwidth= gridwidth;
-		constraints.gridheight= gridheight;
-		constraints.weightx= weightx;
-		constraints.weighty= weighty;
-		constraints.anchor= anchor;
-		constraints.fill= fill;
-		constraints.insets= insets;
-		counter.add(comp, constraints);
-	}
-
-
-	public void failureSelected() {
-		fRerunButton.setEnabled(isErrorSelected());
-		showErrorTrace();
-	}
-
-	private boolean isErrorSelected() {
-		return fFailureList.getSelectedIndex() != -1;
-	}
-
-	private Image loadFrameIcon() {
-		Toolkit toolkit= Toolkit.getDefaultToolkit();
-		try {
-			java.net.URL url= BaseTestRunner.class.getResource("smalllogo.gif");
-			return toolkit.createImage((ImageProducer) url.getContent());
-		} catch (Exception ex) {
-		}
-		return null;
-	}
-
-	public Thread getRunner() {
-		return fRunner;
-	}
-
-	public static void main(String[] args) {
-		new TestRunner().start(args);
-	}
-
-	public static void run(Class test) {
-		String args[]= { test.getName() };
-		main(args);
-	}
-
-	public void rerun() {
-		int index= fFailureList.getSelectedIndex();
-		if (index == -1)
-			return;
-
-		Test test= (Test)fFailedTests.elementAt(index);
-		rerunTest(test);
-	}
-
-	private void rerunTest(Test test) {
-		if (!(test instanceof TestCase)) {
-			showInfo("Could not reload "+ test.toString());
-			return;
-		}
-		Test reloadedTest= null;
-		TestCase rerunTest= (TestCase)test;
-		try {
-			Class reloadedTestClass= getLoader().reload(test.getClass()); 
-			reloadedTest= TestSuite.createTest(reloadedTestClass, rerunTest.getName());
-		} catch(Exception e) {
-			showInfo("Could not reload "+ test.toString());
-			return;
-		}
-		TestResult result= new TestResult();
-		reloadedTest.run(result);
-
-		String message= reloadedTest.toString();
-		if(result.wasSuccessful())
-			showInfo(message+" was successful");
-		else if (result.errorCount() == 1)
-			showStatus(message+" had an error");
-		else
-			showStatus(message+" had a failure");
-	}
-
-	protected void reset() {
-		setLabelValue(fNumberOfErrors, 0);
-		setLabelValue(fNumberOfFailures, 0);
-		setLabelValue(fNumberOfRuns, 0);
-		fProgressIndicator.reset();
-		fRerunButton.setEnabled(false);
-		fFailureList.removeAll();
-		fExceptions= new Vector(10);
-		fFailedTests= new Vector(10);
-		fTraceArea.setText("");
-
-	}
-
-	protected void runFailed(String message) {
-		showStatus(message);
-		fRun.setLabel("Run");
-		fRunner= null;
-	}
-
-	synchronized public void runSuite() {
-		if (fRunner != null && fTestResult != null) {
-			fTestResult.stop();
-		} else {
-			setLoading(shouldReload());
-			fRun.setLabel("Stop");
-			showInfo("Initializing...");
-			reset();
-
-			showInfo("Load Test Case...");
-
-			final Test testSuite= getTest(fSuiteField.getText());
-			if (testSuite != null) {
-				fRunner= new Thread() {
-					public void run() {
-						fTestResult= createTestResult();
-						fTestResult.addListener(TestRunner.this);
-						fProgressIndicator.start(testSuite.countTestCases());
-						showInfo("Running...");
-
-						long startTime= System.currentTimeMillis();
-						testSuite.run(fTestResult);
-
-						if (fTestResult.shouldStop()) {
-							showStatus("Stopped");
-						} else {
-							long endTime= System.currentTimeMillis();
-							long runTime= endTime-startTime;
-							showInfo("Finished: " + elapsedTimeAsString(runTime) + " seconds");
-						}
-						fTestResult= null;
-						fRun.setLabel("Run");
-						fRunner= null;
-						System.gc();
-					}
-				};
-				fRunner.start();
-			}
-		}
-	}
-
-	private boolean shouldReload() {
-		return !inVAJava() && fUseLoadingRunner.getState();
-	}
-
-	private void setLabelValue(Label label, int value) {
-		label.setText(Integer.toString(value));
-		label.invalidate();
-		label.getParent().validate();
-
-	}
-
-	public void setSuiteName(String suite) {
-		fSuiteField.setText(suite);
-	}
-
-	private void showErrorTrace() {
-		int index= fFailureList.getSelectedIndex();
-		if (index == -1)
-			return;
-
-		Throwable t= (Throwable) fExceptions.elementAt(index);
-		fTraceArea.setText(getFilteredTrace(t));
-	}
-
-
-	private void showInfo(String message) {
-		fStatusLine.setFont(PLAIN_FONT);
-		fStatusLine.setForeground(Color.black);
-		fStatusLine.setText(message);
-	}
-
-	protected void clearStatus() {
-		showStatus("");
-	}
-
-	private void showStatus(String status) {
-		fStatusLine.setFont(PLAIN_FONT);
-		fStatusLine.setForeground(Color.red);
-		fStatusLine.setText(status);
-	}
-	/**
-	 * Starts the TestRunner
-	 */
-	public void start(String[] args) {
-		String suiteName= processArguments(args);
-		fFrame= createUI(suiteName);
-		fFrame.setLocation(200, 200);
-		fFrame.setVisible(true);
-
-		if (suiteName != null) {
-			setSuiteName(suiteName);
-			runSuite();
-		}
-	}
-}
\ No newline at end of file

Modified: trunk/junit/debian/changelog
===================================================================
--- trunk/junit/debian/changelog	2009-11-28 10:08:31 UTC (rev 11154)
+++ trunk/junit/debian/changelog	2009-11-29 00:28:53 UTC (rev 11155)
@@ -1,3 +1,22 @@
+junit (3.8.2-4) unstable; urgency=low
+
+  * Add myself to Uploaders
+  * Bump debhelper version to >= 7
+    - Rework debian/rules to use dh
+  * Bump Standards-Version to 3.8.3:
+    - Rename debian/README.Debian-source to debian/README.source
+  * Build-Depends on default-jdk instead of default-jdk-builddep
+    because we don't build a native GCJ package.
+  * Add Depends: ${misc:Depends}
+  * Restore SwingUI UI:
+    - Don't remplace swingui TestRunner by an awtui TestRunner as, now,
+      free java runtime fully support Swing
+    - Remove unneeded debian/TestRunner.java file
+  * Add OSGi metadata to junit.jar (Closes: #558177)
+  * Rewrite debian/copyright with DEP5-format
+
+ -- Damien Raude-Morvan <drazzib at debian.org>  Sun, 29 Nov 2009 01:03:35 +0100
+
 junit (3.8.2-3) unstable; urgency=low
 
   * Upload to unstable.

Modified: trunk/junit/debian/compat
===================================================================
--- trunk/junit/debian/compat	2009-11-28 10:08:31 UTC (rev 11154)
+++ trunk/junit/debian/compat	2009-11-29 00:28:53 UTC (rev 11155)
@@ -1 +1 @@
-6
+7

Modified: trunk/junit/debian/control
===================================================================
--- trunk/junit/debian/control	2009-11-28 10:08:31 UTC (rev 11154)
+++ trunk/junit/debian/control	2009-11-29 00:28:53 UTC (rev 11155)
@@ -2,17 +2,17 @@
 Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Michael Koch <konqueror at gmx.de>, Wolfgang Baer <WBaer at gmx.de>
-Build-Depends: debhelper (>= 4.2.30), cdbs, default-jdk-builddep
+Uploaders: Michael Koch <konqueror at gmx.de>, Wolfgang Baer <WBaer at gmx.de>, Damien Raude-Morvan <drazzib at debian.org>
+Build-Depends: debhelper (>= 7.0.50~), cdbs, default-jdk
 Build-Depends-Indep: maven-repo-helper
-Standards-Version: 3.8.1
-Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/junit
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/junit
+Standards-Version: 3.8.3
+Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/junit/
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/junit/
 Homepage: http://www.junit.org
 
 Package: junit
 Architecture: all
-Depends: default-jre (>= 1.4) | default-jre-headless (>= 1.4) | java2-runtime | java2-runtime-headless
+Depends: ${misc:Depends}, default-jre (>= 1.4) | default-jre-headless (>= 1.4) | java2-runtime | java2-runtime-headless
 Suggests: junit-doc
 Enhances: ant-optional
 Description: Automated testing framework for Java
@@ -23,6 +23,7 @@
 Package: junit-doc
 Section: doc
 Architecture: all
+Depends: ${misc:Depends}
 Suggests: junit
 Description: Document for JUnit
  This package provide documents and examples for JUnit which is a simple 

Modified: trunk/junit/debian/copyright
===================================================================
--- trunk/junit/debian/copyright	2009-11-28 10:08:31 UTC (rev 11154)
+++ trunk/junit/debian/copyright	2009-11-29 00:28:53 UTC (rev 11155)
@@ -1,9 +1,11 @@
-This package was debianized by Takashi Okamoto tora at debian.org on
-Thu, 28 Jun 2001 18:47:32 +0900.
+Format-Specification: http://dep.debian.net/deps/dep5/
+Name: JUnit Testing Framework
+Maintainer: http://www.junit.org/
+Source: http://sourceforge.net/projects/junit/files/junit/
 
-It was downloaded from <http://www.junit.org/>.
-
-Copyright:
+Files: *
+Copyright: Copyright 2000-2006 Kent Beck, Erich Gamma and Mike Clark
+License: CPL 
                          Common Public License - v 1.0
 
 THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS COMMON PUBLIC
@@ -220,3 +222,13 @@
 Agreement will bring a legal action under this Agreement more than one year
 after the cause of action arose. Each party waives its rights to a jury trial
 in any resulting litigation.
+
+
+Files: debian/*
+Copyright: Copyright 2001-2007 Takashi Okamoto <tora at debian.org>
+Copyright: Copyright 2009 Damien Raude-Morvan <drazzib at debian.org>
+License: GPL-2+
+  On Debian systems the full text of the GNU General Public 
+  License can be found in the `/usr/share/common-licenses/GPL-2'
+  file.
+

Modified: trunk/junit/debian/rules
===================================================================
--- trunk/junit/debian/rules	2009-11-28 10:08:31 UTC (rev 11154)
+++ trunk/junit/debian/rules	2009-11-29 00:28:53 UTC (rev 11155)
@@ -2,8 +2,6 @@
 # 
 # build file for junit uses cdbs
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-
 JAVA_HOME	:= /usr/lib/jvm/default-java
 
 JAVAC 		= $(JAVA_HOME)/bin/javac
@@ -14,34 +12,35 @@
 
 UPSTREAM_VERSION=$(shell echo $(DEB_VERSION) | cut -d- -f1)
 
-build:
+%:
+	dh $@
+
+override_dh_auto_configure:
 	(mkdir src; cd src; ${JAR} xvf ../src.jar)
-	(rm  src/junit/swingui/*.java; cp debian/TestRunner.java src/junit/swingui)
-	patch -p0 < debian/AboutDialog.java.diff
-	patch -p0 < debian/TestCollector.java.diff
 
+override_dh_auto_build:
 	mkdir -p classes
 	(cd src;${JAVAC} -source 1.4 -target 1.4 -classpath ${CLASSPATH} -d ../classes junit/*/*.java)
 	cp -r src/junit/swingui/icons classes/junit/swingui
 	cp src/junit/runner/*.gif classes/junit/runner
 	cp src/junit/runner/excluded.properties classes/junit/runner
-	(${JAR} cvf ${JARNAME} -C classes junit)
-	# build the api with gjdoc
+	(${JAR} cvmf debian/MANIFEST.MF ${JARNAME} -C classes junit)
 	mkdir -p doc/api
 	(cd src;${JAVADOC} -d ../doc/api junit.framework junit.awtui junit.swingui junit.runner junit.textui junit.extensions)
 
-clean::
+override_dh_install:
+	-rm -f javadoc/package-list
+	install -m 755 debian/junit.sh debian/junit/usr/bin/junit
+	mh_installpoms -pjunit
+	mh_installjar -pjunit -l debian/pom.xml ${JARNAME}
+
+override_dh_clean:
+	dh_clean
 	-rm -rf classes doc/api ${JARNAME}
 	-rm -f `find . -name "*~"`
 	-rm -rf src
 	-rm -rf debian/tmp
 
-install/junit:: 
-	-rm -f javadoc/package-list
-	install -m 755 debian/junit.sh debian/junit/usr/bin/junit
-	mh_installpoms -pjunit 
-	mh_installjar -pjunit -l debian/pom.xml ${JARNAME}
-
 get-orig-pom:
 	wget -O debian/pom.xml http://repository.sonatype.org/service/local/repositories/central/content/junit/junit/${UPSTREAM_VERSION}/junit-${UPSTREAM_VERSION}.pom
 




More information about the pkg-java-commits mailing list