[pkg-java] r14008 - in trunk/jline/debian: . source

Torsten Werner twerner at alioth.debian.org
Sat Aug 6 17:57:02 UTC 2011


Author: twerner
Date: 2011-08-06 17:57:02 +0000 (Sat, 06 Aug 2011)
New Revision: 14008

Added:
   trunk/jline/debian/source/
   trunk/jline/debian/source/format
Removed:
   trunk/jline/debian/patches/
   trunk/jline/debian/pom.xml
Modified:
   trunk/jline/debian/changelog
   trunk/jline/debian/control
   trunk/jline/debian/libjline-java.poms
   trunk/jline/debian/rules
Log:
* New upstream release (Closes: #525559)
* Use upstream's file sr/pom.xml and remove debian/pom.xml.
* Remove debian/patches/* because they haven't been used for a long time.
* Switch to source format 3.0.
* Replace openjdk-6-doc by default-jdk-doc. (Closes: #567276)
* Remove Java runtime dependencies.

Modified: trunk/jline/debian/changelog
===================================================================
--- trunk/jline/debian/changelog	2011-08-06 17:13:27 UTC (rev 14007)
+++ trunk/jline/debian/changelog	2011-08-06 17:57:02 UTC (rev 14008)
@@ -1,3 +1,14 @@
+jline (1.0-1) unstable; urgency=low
+
+  * New upstream release (Closes: #525559)
+  * Use upstream's file sr/pom.xml and remove debian/pom.xml.
+  * Remove debian/patches/* because they haven't been used for a long time.
+  * Switch to source format 3.0.
+  * Replace openjdk-6-doc by default-jdk-doc. (Closes: #567276)
+  * Remove Java runtime dependencies.
+
+ -- Torsten Werner <twerner at debian.org>  Sat, 06 Aug 2011 19:49:02 +0200
+
 jline (0.9.94-5) unstable; urgency=low
 
   * Add myself to Uploaders.

Modified: trunk/jline/debian/control
===================================================================
--- trunk/jline/debian/control	2011-08-06 17:13:27 UTC (rev 14007)
+++ trunk/jline/debian/control	2011-08-06 17:57:02 UTC (rev 14008)
@@ -5,7 +5,7 @@
 Uploaders: Varun Hiremath <varun at debian.org>, Kumar Appaiah <akumar at ee.iitm.ac.in>,
  Torsten Werner <twerner at debian.org>
 Build-Depends: cdbs, debhelper (>= 5), default-jdk, ant
-Build-Depends-Indep: maven-repo-helper, junit, openjdk-6-doc
+Build-Depends-Indep: maven-repo-helper, junit, default-jdk-doc
 Standards-Version: 3.8.2
 Homepage: http://jline.sourceforge.net/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/jline
@@ -13,7 +13,7 @@
 
 Package: libjline-java
 Architecture: all
-Depends: ${misc:Depends}, default-jre-headless | java2-runtime-headless | java1-runtime-headless
+Depends: ${misc:Depends}
 Suggests: libjline-java-doc
 Description: Java library for handling console input
  JLine is a 100% pure Java library for reading and editing console input.
@@ -24,8 +24,8 @@
 Package: libjline-java-doc
 Section: doc
 Architecture: all
-Depends: ${misc:Depends}, openjdk-6-doc | classpath-doc
-Suggests: libjline-java
+Depends: ${misc:Depends}
+Suggests: libjline-java, default-jdk-doc
 Description: Java library for handling console input - documentation
  JLine is a 100% pure Java library for reading and editing console input.
  It is similar in functionality to BSD editline and GNU readline.  People

Modified: trunk/jline/debian/libjline-java.poms
===================================================================
--- trunk/jline/debian/libjline-java.poms	2011-08-06 17:13:27 UTC (rev 14007)
+++ trunk/jline/debian/libjline-java.poms	2011-08-06 17:57:02 UTC (rev 14008)
@@ -1 +1 @@
-debian/pom.xml
+src/pom.xml

Deleted: trunk/jline/debian/pom.xml
===================================================================
--- trunk/jline/debian/pom.xml	2011-08-06 17:13:27 UTC (rev 14007)
+++ trunk/jline/debian/pom.xml	2011-08-06 17:57:02 UTC (rev 14008)
@@ -1,212 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-To build, you need to have Maven 2 installed.
-
-To compile, run:
-
-    mvn compile
-
-To run tests, run:
-
-    mvn test
-
-To run one particular test, e.g. TestSomeTest, run:
-
-    mvn test -Dtest=TestSomeTest
-
-To build the jars, run:
-
-    mvn package
-
-To create and upload a release, run:
-
-    mvn deploy
-
-To build the site and upload it, run:
-
-    mvn site:deploy
-
-To perform a complete release, run:
-
-    mvn clean compile package site assembly:assembly deploy site:deploy
-
-To actually upload the artifact to sourceforge, it must be manually ftp'd:
-
-    lftp ftp://upload.sourceforge.net/incoming/ -e "put `ls target/jline-*.zip`"
-
-To make a bundle and request that ibilio upload it, do:
-
-    mvn source:jar javadoc:jar repository:bundle-create
-
-    scp target/jline-*-bundle.jar shell.sourceforge.net:/home/groups/j/jl/jline/htdocs
-
-    Make a request like at http://jira.codehaus.org/browse/MAVENUPLOAD-1003
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
-    http://maven.apache.org/maven-v4_0_0.xsd">
-
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>jline</groupId>
-  <artifactId>jline</artifactId>
-  <packaging>jar</packaging>
-  <name>JLine</name>
-  <version>0.9.94</version>
-  <description>JLine is a java library for reading and editing user input in console applications. It features tab-completion, command history, password masking, customizable keybindings, and pass-through handlers to use to chain to other console applications.</description>
-  <url>http://jline.sourceforge.net</url>
-  <issueManagement>
-    <system>sourceforge</system>
-    <url>http://sourceforge.net/tracker/?group_id=64033&atid=506056</url>
-  </issueManagement>
-  <inceptionYear>2002</inceptionYear>
-  <mailingLists>
-    <mailingList>
-      <name>JLine users</name>
-      <subscribe>https://lists.sourceforge.net/lists/listinfo/jline-users</subscribe>
-      <post>jline-users at lists.sourceforge.net</post>
-      <archive>http://sourceforge.net/mailarchive/forum.php?forum=jline-users</archive>
-    </mailingList>
-  </mailingLists>
-
-  <developers>
-    <developer>
-      <id>mprudhom</id>
-      <name>Marc Prud'hommeaux</name>
-      <email>mwp1 at cornell.edu</email>
-    </developer>
-  </developers>
-  <licenses>
-    <license>
-      <name>BSD</name>
-      <url>LICENSE.txt</url>
-    </license>
-  </licenses>
-  <scm>
-    <connection>scm:cvs:pserver:anonymous at jline.cvs.sourceforge.net:/cvsroot/jline:jline</connection>
-    <developerConnection>scm:cvs:ext:${maven.username}@jline.cvs.sourceforge.net:/cvsroot/jline:jline</developerConnection>
-    <url>http://jline.cvs.sourceforge.net/jline</url>
-  </scm>
-  <dependencies>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>3.8.1</version>
-      <scope>compile</scope>
-    </dependency>
-  </dependencies>
-  <build>
-    <plugins>
-      <!--
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>jalopy-maven-plugin</artifactId>
-        <version>1.0-SNAPSHOT</version>
-        <configuration>
-          <fileFormat>UNIX</fileFormat>
-          <convention>codestyle.xml</convention>
-        </configuration>
-        <executions>
-          <execution>
-            <goals>
-              <goal>format</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-      -->
-      <plugin>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <configuration>
-          <!-- <testFailureIgnore>true</testFailureIgnore> -->
-          <useFile>false</useFile>
-          <trimStackTrace>false</trimStackTrace>
-        </configuration>
-      </plugin>
-      <plugin>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-          <source>1.3</source>
-          <target>1.3</target>
-        </configuration>
-      </plugin>
-      <plugin>
-        <artifactId>maven-site-plugin</artifactId>
-        <configuration>
-          <stagingDirectory>../site-staging</stagingDirectory>
-        </configuration>
-      </plugin>
-      <plugin>
-        <artifactId>maven-assembly-plugin</artifactId>
-        <configuration>
-          <descriptors>
-            <descriptor>src/assembly/assembly.xml</descriptor>
-          </descriptors>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
-  <reporting>
-    <plugins>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>jxr-maven-plugin</artifactId>
-        <configuration>
-          <aggregate>true</aggregate>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-javadoc-plugin</artifactId>
-        <configuration>
-          <aggregate>true</aggregate>
-          <linksource>true</linksource>
-          <links>
-            <link>http://java.sun.com/j2se/1.5.0/docs/api</link>
-          </links>
-        </configuration>
-      </plugin>
-      <plugin>
-        <artifactId>maven-pmd-plugin</artifactId>
-      </plugin>
-      <plugin>
-        <artifactId>maven-project-info-reports-plugin</artifactId>
-        <reportSets>
-          <reportSet>
-            <reports>
-              <!-- <report>dependencies</report> -->
-              <!-- <report>cim</report> -->
-              <!-- <report>cobertura</report> -->
-              <report>project-team</report>
-              <report>mailing-list</report>
-              <report>issue-tracking</report>
-              <report>license</report>
-              <report>scm</report>
-            </reports>
-          </reportSet>
-        </reportSets>
-      </plugin>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>surefire-report-maven-plugin</artifactId>
-      </plugin>
-    </plugins>
-  </reporting>
-  <distributionManagement>
-    <repository>
-      <id>jline</id>
-      <url>scp://shell.sourceforge.net/home/groups/j/jl/jline/htdocs/m2repo</url>
-    </repository>
-    <snapshotRepository>
-      <id>jline</id>
-      <url>scp://shell.sourceforge.net/home/groups/j/jl/jline/htdocs/m2snapshot</url>
-    </snapshotRepository>
-    <site>
-      <id>jline</id>
-      <name>jline</name>
-      <url>scpexe://shell.sourceforge.net/home/groups/j/jl/jline/htdocs/</url>
-    </site>
-  </distributionManagement>
-</project>

Modified: trunk/jline/debian/rules
===================================================================
--- trunk/jline/debian/rules	2011-08-06 17:13:27 UTC (rev 14007)
+++ trunk/jline/debian/rules	2011-08-06 17:57:02 UTC (rev 14008)
@@ -14,7 +14,7 @@
 
 binary-post-install/lib$(PACKAGE)-java::
 	mh_installpoms -plib$(PACKAGE)-java
-	mh_installjar -plib$(PACKAGE)-java -l debian/pom.xml jline.jar
+	mh_installjar -plib$(PACKAGE)-java -l src/pom.xml jline.jar
 
 clean::
 	-rm -rf debian/tmp
@@ -22,6 +22,3 @@
 get-orig-source:
 	-uscan --upstream-version 0
 
-get-orig-pom:
-	wget -O debian/pom.xml http://repository.sonatype.org/service/local/repositories/central/content/jline/jline/$(VERSION)/jline-$(VERSION).pom
-

Added: trunk/jline/debian/source/format
===================================================================
--- trunk/jline/debian/source/format	                        (rev 0)
+++ trunk/jline/debian/source/format	2011-08-06 17:57:02 UTC (rev 14008)
@@ -0,0 +1 @@
+3.0 (quilt)




More information about the pkg-java-commits mailing list