[pkg-java] r9973 - trunk/libcommons-codec-java/debian

Damien Raude-Morvan drazzib-guest at alioth.debian.org
Fri Aug 14 09:46:28 UTC 2009


Author: drazzib-guest
Date: 2009-08-14 09:46:27 +0000 (Fri, 14 Aug 2009)
New Revision: 9973

Removed:
   trunk/libcommons-codec-java/debian/README.source
   trunk/libcommons-codec-java/debian/dirs
   trunk/libcommons-codec-java/debian/patches/
   trunk/libcommons-codec-java/debian/pom.xml
Modified:
   trunk/libcommons-codec-java/debian/changelog
   trunk/libcommons-codec-java/debian/control
   trunk/libcommons-codec-java/debian/libcommons-codec-java.poms
   trunk/libcommons-codec-java/debian/rules
Log:
[commons-codec]

  * New upstream release.
    - Remove build.patch: Merged upstream
  * No more patches: Remove Build-Depends on quilt and debian/README.source
  * Use Maven POM from upstream instead of debian/pom.xml



Deleted: trunk/libcommons-codec-java/debian/README.source
===================================================================
--- trunk/libcommons-codec-java/debian/README.source	2009-08-14 09:43:42 UTC (rev 9972)
+++ trunk/libcommons-codec-java/debian/README.source	2009-08-14 09:46:27 UTC (rev 9973)
@@ -1,37 +0,0 @@
-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.
-
-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: 
-
-     make -f debian/rules apply-patches
-
-   Note: It has been proposed that, in future, this should happen 
-   automatically when you run dpkg-source -x on a CDBS 
-   simple-patchsys.mk source package.  However, this proposal has 
-   apparently not yet been implemented, so for now you have to do 
-   it yourself like this.
-
- * 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:
-
-     cdbs-edit-patch 01_add_README.source_file.patch
-
-   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:
-
-     make -f debian/rules reverse-patches
-
- -- Damien Raude-Morvan <drazzib at drazzib.com>  Sun, 28 Jun 2009 20:45:26 +0200

Modified: trunk/libcommons-codec-java/debian/changelog
===================================================================
--- trunk/libcommons-codec-java/debian/changelog	2009-08-14 09:43:42 UTC (rev 9972)
+++ trunk/libcommons-codec-java/debian/changelog	2009-08-14 09:46:27 UTC (rev 9973)
@@ -1,10 +1,11 @@
 libcommons-codec-java (1.4-1) UNRELEASED; urgency=low
 
   * New upstream release.
-    - build.patch partialy merged: LICENSE file is now present in orig tarball
-      refresh this patch and add header using DEP-3 format
+    - Remove build.patch: Merged upstream
+  * No more patches: Remove Build-Depends on quilt and debian/README.source
+  * Use Maven POM from upstream instead of debian/pom.xml
 
- -- Damien Raude-Morvan <drazzib at drazzib.com>  Tue, 11 Aug 2009 23:29:00 +0200
+ -- Damien Raude-Morvan <drazzib at drazzib.com>  Fri, 14 Aug 2009 01:56:10 +0200
 
 libcommons-codec-java (1.3-8) unstable; urgency=low
 

Modified: trunk/libcommons-codec-java/debian/control
===================================================================
--- trunk/libcommons-codec-java/debian/control	2009-08-14 09:43:42 UTC (rev 9972)
+++ trunk/libcommons-codec-java/debian/control	2009-08-14 09:46:27 UTC (rev 9973)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Arnaud Vandyck <avdyk at debian.org>, Wolfgang Baer <WBaer at gmx.de>, Damien Raude-Morvan <drazzib at drazzib.com>, Torsten Werner <twerner at debian.org>
-Build-Depends: cdbs, debhelper (>= 5), ant, default-jdk, quilt
+Build-Depends: cdbs, debhelper (>= 5), ant, default-jdk
 Build-Depends-Indep: maven-repo-helper, ant-optional, junit
 Standards-Version: 3.8.2
 Homepage: http://commons.apache.org/codec/

Deleted: trunk/libcommons-codec-java/debian/dirs
===================================================================
--- trunk/libcommons-codec-java/debian/dirs	2009-08-14 09:43:42 UTC (rev 9972)
+++ trunk/libcommons-codec-java/debian/dirs	2009-08-14 09:46:27 UTC (rev 9973)
@@ -1,2 +0,0 @@
-usr/share/java
-usr/share/doc

Modified: trunk/libcommons-codec-java/debian/libcommons-codec-java.poms
===================================================================
--- trunk/libcommons-codec-java/debian/libcommons-codec-java.poms	2009-08-14 09:43:42 UTC (rev 9972)
+++ trunk/libcommons-codec-java/debian/libcommons-codec-java.poms	2009-08-14 09:46:27 UTC (rev 9973)
@@ -1 +1 @@
-debian/pom.xml --no-parent
+pom.xml --no-parent

Deleted: trunk/libcommons-codec-java/debian/pom.xml
===================================================================
--- trunk/libcommons-codec-java/debian/pom.xml	2009-08-14 09:43:42 UTC (rev 9972)
+++ trunk/libcommons-codec-java/debian/pom.xml	2009-08-14 09:46:27 UTC (rev 9973)
@@ -1,178 +0,0 @@
-<project>
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>commons-codec</groupId>
-  <artifactId>commons-codec</artifactId>
-  <name>Codec</name>
-  <version>1.3</version>
-  <description>The codec package contains simple encoder and decoders for
-   various formats such as Base64 and Hexadecimal.  In addition to these
-   widely used encoders and decoders, the codec package also maintains a
-   collection of phonetic encoding utilities.</description>
-  <url>http://jakarta.apache.org/commons/codec/</url>
-  <issueManagement>
-    <url>http://nagoya.apache.org/bugzilla/buglist.cgi?bug_status=NEW&amp;bug_status=ASSIGNED&amp;bug_status=REOPENED&amp;email1=&amp;emailtype1=substring&amp;emailassigned_to1=1&amp;email2=&amp;emailtype2=substring&amp;emailreporter2=1&amp;bugidtype=include&amp;bug_id=&amp;changedin=&amp;votes=&amp;chfieldfrom=&amp;chfieldto=Now&amp;chfieldvalue=&amp;product=Commons&amp;component=Codec&amp;short_desc=&amp;short_desc_type=allwordssubstr&amp;long_desc=&amp;long_desc_type=allwordssubstr&amp;bug_file_loc=&amp;bug_file_loc_type=allwordssubstr&amp;keywords=&amp;keywords_type=anywords&amp;field0-0-0=noop&amp;type0-0-0=noop&amp;value0-0-0=&amp;cmdtype=doit&amp;newqueryname=&amp;order=Reuse+same+sort+as+last+time</url>
-  </issueManagement>
-  <ciManagement>
-    <notifiers>
-      <notifier>
-        <address>commons-dev at jakarta.apache.org</address>
-      </notifier>
-    </notifiers>
-  </ciManagement>
-  <inceptionYear>2002</inceptionYear>
-  <mailingLists>
-    <mailingList>
-      <name>Commons Dev List</name>
-      <subscribe>commons-dev-subscribe at jakarta.apache.org</subscribe>
-      <unsubscribe>commons-dev-unsubscribe at jakarta.apache.org</unsubscribe>
-      <archive>http://nagoya.apache.org/eyebrowse/SummarizeList?listName=commons-dev@jakarta.apache.org</archive>
-    </mailingList>
-    <mailingList>
-      <name>Commons User List</name>
-      <subscribe>commons-user-subscribe at jakarta.apache.org</subscribe>
-      <unsubscribe>commons-user-unsubscribe at jakarta.apache.org</unsubscribe>
-      <archive>http://nagoya.apache.org/eyebrowse/SummarizeList?listName=commons-user@jakarta.apache.org</archive>
-    </mailingList>
-  </mailingLists>
-  <developers>
-    <developer>
-      <id>bayard</id>
-      <name>Henri Yandell</name>
-      <email>bayard at generationjava.com</email>
-    </developer>
-    <developer>
-      <id>tobrien</id>
-      <name>Tim OBrien</name>
-      <email>tobrien at apache.org</email>
-      <timezone>-6</timezone>
-    </developer>
-    <developer>
-      <id>sanders</id>
-      <name>Scott Sanders</name>
-      <email>sanders at totalsync.com</email>
-    </developer>
-    <developer>
-      <id>rwaldhoff</id>
-      <name>Rodney Waldhoff</name>
-      <email>rwaldhoff at apache.org</email>
-    </developer>
-    <developer>
-      <id>dlr</id>
-      <name>Daniel Rall</name>
-      <email>dlr at finemaltcoding.com</email>
-    </developer>
-    <developer>
-      <id>jon</id>
-      <name>Jon S. Stevens</name>
-      <email>jon at collab.net</email>
-    </developer>
-    <developer>
-      <id>ggregory</id>
-      <name>Gary D. Gregory</name>
-      <email>ggregory at seagullsw.com</email>
-      <organization>Seagull Software</organization>
-      <timezone>-8</timezone>
-    </developer>
-    <developer>
-      <id>dgraham</id>
-      <name>David Graham</name>
-      <email>dgraham at apache.org</email>
-    </developer>
-  </developers>
-  <contributors>
-    <contributor>
-      <name>Christopher O'Brien</name>
-      <email>siege at preoccupied.net</email>
-    </contributor>
-    <contributor>
-      <name>Martin Redington</name>
-    </contributor>
-    <contributor>
-      <name>Jeffery Dever</name>
-    </contributor>
-    <contributor>
-      <name>Steve Zimmermann</name>
-      <email>steve.zimmermann at heii.com</email>
-    </contributor>
-    <contributor>
-      <name>Benjamin Walstrum</name>
-      <email>ben at walstrum.com</email>
-    </contributor>
-    <contributor>
-      <name>Oleg Kalnichevski</name>
-      <email>oleg at ural.ru</email>
-    </contributor>
-    <contributor>
-      <name>Dave Dribin</name>
-      <email>apache at dave.dribin.org</email>
-    </contributor>
-    <contributor>
-      <name>Alex Karasulu</name>
-      <email>aok123 at bellsouth.net</email>
-    </contributor>
-    <contributor>
-      <name>Matthew Inger</name>
-      <email>mattinger at yahoo.com</email>
-    </contributor>
-  </contributors>
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>/LICENSE.txt</url>
-    </license>
-  </licenses>
-  <scm>
-    <connection>scm:cvs:pserver:anoncvs at cvs.apache.org:/home/cvspublic:jakarta-commons/codec</connection>
-    <url>http://cvs.apache.org/viewcvs/jakarta-commons/codec/</url>
-  </scm>
-  <organization>
-    <name>The Apache Software Foundation</name>
-    <url>http://jakarta.apache.org</url>
-  </organization>
-  <build>
-    <sourceDirectory>src/java</sourceDirectory>
-    <testSourceDirectory>src/test</testSourceDirectory>
-    <testResources>
-      <testResource>
-        <directory>src/test</directory>
-        <includes>
-          <include>**/*.xml</include>
-        </includes>
-      </testResource>
-    </testResources>
-    <plugins>
-      <plugin>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <configuration>
-          <includes>
-            <include>**/Test*.java</include>
-            <include>**/*Test.java</include>
-          </includes>
-          <excludes>
-            <exclude>**/*AbstractTest.java</exclude>
-          </excludes>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-  <dependencies>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>3.8.1</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-  <distributionManagement>
-    <repository>
-      <id>default</id>
-      <name>Default Repository</name>
-      <url>file:///www/jakarta.apache.org/builds/jakarta-commons/codec/</url>
-    </repository>
-    <site>
-      <id>default</id>
-      <name>Default Site</name>
-      <url>scp://jakarta.apache.org//www/jakarta.apache.org/commons/codec/</url>
-    </site>
-  </distributionManagement>
-</project>
\ No newline at end of file

Modified: trunk/libcommons-codec-java/debian/rules
===================================================================
--- trunk/libcommons-codec-java/debian/rules	2009-08-14 09:43:42 UTC (rev 9972)
+++ trunk/libcommons-codec-java/debian/rules	2009-08-14 09:46:27 UTC (rev 9973)
@@ -3,7 +3,6 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/ant.mk
-include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
 PACKAGE			   := $(DEB_SOURCE_PACKAGE)
 VERSION			   := $(DEB_UPSTREAM_VERSION)
@@ -15,7 +14,7 @@
 
 binary-post-install/$(PACKAGE)::
 	mh_installpoms -p$(PACKAGE)
-	mh_installjar -p$(PACKAGE) -l debian/pom.xml dist/commons-codec-$(VERSION).jar
+	mh_installjar -p$(PACKAGE) -l pom.xml dist/commons-codec-$(VERSION).jar
 
 clean::
 	-rm -rf debian/tmp




More information about the pkg-java-commits mailing list