This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository snakeyaml.
commit 2038d1fa3d173af19ab068cbc38d976ed86589d4 Author: Hilko Bengen <[email protected]> Date: Sat Aug 24 19:05:38 2013 +0200 Imported Debian patch 1.12-2 --- debian/changelog | 13 ++ debian/control | 31 +++-- debian/get-orig-source.sh | 8 +- debian/libsnakeyaml-java.docs | 1 - debian/libyaml-snake-java-doc.doc-base.api | 10 ++ debian/libyaml-snake-java-doc.install | 2 + debian/libyaml-snake-java.poms | 28 ++++ debian/maven.cleanIgnoreRules | 1 + debian/maven.ignoreRules | 12 ++ debian/maven.properties | 5 + debian/maven.publishedRules | 2 + debian/maven.rules | 3 + debian/patches/dependencies | 213 ----------------------------- debian/patches/series | 1 - debian/rules | 22 +-- debian/snakeyaml-javadoc | 8 -- 16 files changed, 106 insertions(+), 254 deletions(-) diff --git a/debian/changelog b/debian/changelog index b48692b..f98e5b1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,16 @@ +snakeyaml (1.12-2) unstable; urgency=low + + [ Stefan Denker ] + * Add versionless symlink in /usr/share/java/ + * Add group-ID-Directory to maven-repository + + [ Hilko Bengen ] + * Add myself to uploaders + * Bump Standards-Version + * Switch build to use maven-debian-helper, add -doc package + + -- Hilko Bengen <[email protected]> Sat, 24 Aug 2013 19:05:38 +0200 + snakeyaml (1.12-1) unstable; urgency=low * Initial release (Closes: #585903 ) diff --git a/debian/control b/debian/control index a1e5528..e5bbf9c 100644 --- a/debian/control +++ b/debian/control @@ -2,17 +2,16 @@ Source: snakeyaml Section: java Priority: extra Maintainer: Stefan Denker <[email protected]> -Build-Depends: debhelper (>= 9), default-jdk, javahelper, maven2 -Build-Depends-Indep: libmaven-bundle-plugin-java, - libmaven-clean-plugin-java, - libmaven-compiler-plugin-java, - libsurefire-java, +Uploaders: Hilko Bengen <[email protected]> +Build-Depends: + debhelper (>= 9), + default-jdk, + javahelper, + maven-debian-helper (>= 1.6.5), +Build-Depends-Indep: + libmaven-bundle-plugin-java, libmaven-javadoc-plugin-java, - libmaven-resources-plugin-java, - libjoda-time-java, - velocity, - junit4, -Standards-Version: 3.9.3 +Standards-Version: 3.9.4 Homepage: http://code.google.com/p/snakeyaml/ Package: libyaml-snake-java @@ -31,3 +30,15 @@ Description: YAML parser and emitter for the Java programming language * high-level API for serializing and deserializing native Java objects. * support for all types from the YAML types repository. * relatively sensible error messages. + +Package: libyaml-snake-java-doc +Architecture: all +Section: doc +Depends: ${misc:Depends}, ${maven:DocDepends} +Recommends: ${maven:DocOptionalDepends} +Suggests: libyaml-snake-java +Description: Documentation for SnakeYAML + SnakeYAML is a YAML parser and emitter for the Java programming + language. + . + This package contains the API documentation of libyaml-snake-java. diff --git a/debian/get-orig-source.sh b/debian/get-orig-source.sh index 5435bb9..8cdc44c 100644 --- a/debian/get-orig-source.sh +++ b/debian/get-orig-source.sh @@ -2,6 +2,11 @@ TEMP=`mktemp -d` +if [ ! -x /usr/bin/hg ]; then + echo "Please install mercurial"; + exit 1; +fi + if [ -d "$1" ]; then cp -r $1 $TEMP/snakeyaml/ else @@ -16,7 +21,8 @@ for VER in $( hg tags |grep '^v[0-9]\.[0-9]* ' |sed 's/^v//' |awk '{print $1}'); fi done hg update "v$LATEST_VERSION" >/dev/null -hg archive --exclude '\.hg*' --type tgz --prefix "." "/tmp/snakeyaml_$LATEST_VERSION.orig.tar.gz" +hg archive --exclude '\.hg*' --type tgz --prefix "." "$TEMP/snakeyaml_$LATEST_VERSION.orig.tar.gz" cd - +mv "$TEMP/snakeyaml_$LATEST_VERSION.orig.tar.gz" ../ rm -r $TEMP diff --git a/debian/libsnakeyaml-java.docs b/debian/libsnakeyaml-java.docs deleted file mode 100644 index 63add0a..0000000 --- a/debian/libsnakeyaml-java.docs +++ /dev/null @@ -1 +0,0 @@ -target/apidocs/ diff --git a/debian/libyaml-snake-java-doc.doc-base.api b/debian/libyaml-snake-java-doc.doc-base.api new file mode 100644 index 0000000..8a12c7f --- /dev/null +++ b/debian/libyaml-snake-java-doc.doc-base.api @@ -0,0 +1,10 @@ +Document: libyaml-snake-java +Title: API Javadoc for SnakeYAML +Author: SnakeYAML developers +Abstract: This is the API Javadoc provided for the + libyaml-snake-java library. +Section: Programming + +Format: HTML +Index: /usr/share/doc/libyaml-snake-java/api/index.html +Files: /usr/share/doc/libyaml-snake-java/api/* diff --git a/debian/libyaml-snake-java-doc.install b/debian/libyaml-snake-java-doc.install new file mode 100644 index 0000000..85e8dde --- /dev/null +++ b/debian/libyaml-snake-java-doc.install @@ -0,0 +1,2 @@ +target/apidocs/* usr/share/doc/libyaml-snake-java/api + diff --git a/debian/libyaml-snake-java.poms b/debian/libyaml-snake-java.poms new file mode 100644 index 0000000..0417132 --- /dev/null +++ b/debian/libyaml-snake-java.poms @@ -0,0 +1,28 @@ +# List of POM files for the package +# Format of this file is: +# <path to pom file> [option]* +# where option can be: +# --ignore: ignore this POM and its artifact if any +# --ignore-pom: don't install the POM. To use on POM files that are created +# temporarily for certain artifacts such as Javadoc jars. [mh_install, mh_installpoms] +# --no-parent: remove the <parent> tag from the POM +# --package=<package>: an alternative package to use when installing this POM +# and its artifact +# --has-package-version: to indicate that the original version of the POM is the same as the upstream part +# of the version for the package. +# --keep-elements=<elem1,elem2>: a list of XML elements to keep in the POM +# during a clean operation with mh_cleanpom or mh_installpom +# --artifact=<path>: path to the build artifact associated with this POM, +# it will be installed when using the command mh_install. [mh_install] +# --java-lib: install the jar into /usr/share/java to comply with Debian +# packaging guidelines +# --usj-name=<name>: name to use when installing the library in /usr/share/java +# --usj-version=<version>: version to use when installing the library in /usr/share/java +# --no-usj-versionless: don't install the versionless link in /usr/share/java +# --dest-jar=<path>: the destination for the real jar. +# It will be installed with mh_install. [mh_install] +# --classifier=<classifier>: Optional, the classifier for the jar. Empty by default. +# --site-xml=<location>: Optional, the location for site.xml if it needs to be installed. +# Empty by default. [mh_install] +# +pom.xml --has-package-version diff --git a/debian/maven.cleanIgnoreRules b/debian/maven.cleanIgnoreRules new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/debian/maven.cleanIgnoreRules @@ -0,0 +1 @@ + diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules new file mode 100644 index 0000000..a59e954 --- /dev/null +++ b/debian/maven.ignoreRules @@ -0,0 +1,12 @@ + +com.mycila.maven-license-plugin maven-license-plugin * * * * +joda-time joda-time * * * * +junit junit * * * * +org.apache.maven.plugins maven-changes-plugin * * * * +org.apache.maven.plugins maven-eclipse-plugin * * * * +org.apache.maven.plugins maven-jxr-plugin * * * * +org.apache.maven.plugins maven-source-plugin * * * * +org.apache.maven.plugins maven-surefire-plugin * * * * +org.apache.velocity velocity * * * * +org.codehaus.mojo cobertura-maven-plugin * * * * +org.springframework spring * * * * diff --git a/debian/maven.properties b/debian/maven.properties new file mode 100644 index 0000000..e593715 --- /dev/null +++ b/debian/maven.properties @@ -0,0 +1,5 @@ +# Include here properties to pass to Maven during the build. +# For example: +# maven.test.skip=true + +maven.test.skip=true diff --git a/debian/maven.publishedRules b/debian/maven.publishedRules new file mode 100644 index 0000000..5bd7ad4 --- /dev/null +++ b/debian/maven.publishedRules @@ -0,0 +1,2 @@ + +org.yaml snakeyaml s/jar/bundle/ s/1\..*/1.x/ * * diff --git a/debian/maven.rules b/debian/maven.rules new file mode 100644 index 0000000..6b4033f --- /dev/null +++ b/debian/maven.rules @@ -0,0 +1,3 @@ + +org.yaml snakeyaml bundle s/1\..*/1.x/ * * +org.apache.felix maven-bundle-plugin * * * * diff --git a/debian/patches/dependencies b/debian/patches/dependencies deleted file mode 100644 index 64d0407..0000000 --- a/debian/patches/dependencies +++ /dev/null @@ -1,213 +0,0 @@ -pom.xml file adjustments to dependencies. - * Delete unused dependencies - * Adjust versions of packages used to match debian versions ---- a/pom.xml -+++ b/pom.xml -@@ -52,25 +52,19 @@ - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> -- <version>4.7</version> -- <scope>test</scope> -- </dependency> -- <dependency> -- <groupId>org.springframework</groupId> -- <artifactId>spring</artifactId> -- <version>2.5.6</version> -+ <version>4.x</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.velocity</groupId> - <artifactId>velocity</artifactId> -- <version>1.6.2</version> -+ <version>debian</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>joda-time</groupId> - <artifactId>joda-time</artifactId> -- <version>1.6</version> -+ <version>debian</version> - <scope>test</scope> - </dependency> - </dependencies> -@@ -92,7 +86,7 @@ - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> -- <version>2.3.2</version> -+ <version>2.0.2</version> - <configuration> - <source>1.5</source> - <target>1.5</target> -@@ -102,7 +96,7 @@ - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> -- <version>2.6</version> -+ <version>2.10</version> - <configuration> - <argLine>-Xmx512m</argLine> - <includes> -@@ -116,73 +110,8 @@ - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> -- <artifactId>maven-eclipse-plugin</artifactId> -- <version>2.8</version> -- <configuration> -- <buildOutputDirectory>bin</buildOutputDirectory> -- </configuration> -- </plugin> -- <plugin> -- <groupId>org.codehaus.mojo</groupId> -- <artifactId>cobertura-maven-plugin</artifactId> -- <version>2.5.1</version> -- <configuration> -- <check> -- <totalBranchRate>80</totalBranchRate> -- <totalLineRate>95</totalLineRate> -- </check> -- <formats> -- <format>html</format> -- <format>xml</format> -- </formats> -- <instrumentation> -- <excludes> -- <exclude>org/yaml/snakeyaml/external/**</exclude> -- </excludes> -- </instrumentation> -- </configuration> -- <executions> -- <execution> -- <goals> -- <goal>clean</goal> -- <goal>check</goal> -- </goals> -- </execution> -- </executions> -- </plugin> -- <plugin> -- <groupId>org.apache.maven.plugins</groupId> -- <artifactId>maven-changes-plugin</artifactId> -- <version>2.5</version> -- <executions> -- <execution> -- <id>validate-changes</id> -- <phase>pre-site</phase> -- <goals> -- <goal>changes-validate</goal> -- </goals> -- <configuration> -- <failOnError>true</failOnError> -- </configuration> -- </execution> -- </executions> -- </plugin> -- <plugin> -- <groupId>org.apache.maven.plugins</groupId> -- <artifactId>maven-source-plugin</artifactId> -- <version>2.1.2</version> -- <executions> -- <execution> -- <goals> -- <goal>jar</goal> -- </goals> -- </execution> -- </executions> -- </plugin> -- <plugin> -- <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> -- <version>2.8</version> -+ <version>2.6.1</version> - <configuration> - <links> - <link>http://java.sun.com/javase/6/docs/api/</link> -@@ -198,38 +127,9 @@ - </executions> - </plugin> - <plugin> -- <groupId>com.mycila.maven-license-plugin</groupId> -- <artifactId>maven-license-plugin</artifactId> -- <version>1.9.0</version> -- <configuration> -- <header>src/etc/header.txt</header> -- <quiet>false</quiet> -- <failIfMissing>true</failIfMissing> -- <aggregate>false</aggregate> -- <includes> -- <include>src/**/*.java</include> -- </includes> -- <excludes> -- <exclude>src/main/java/org/yaml/snakeyaml/external/**</exclude> -- </excludes> -- <useDefaultExcludes>true</useDefaultExcludes> -- <useDefaultMapping>true</useDefaultMapping> -- <strictCheck>true</strictCheck> -- <encoding>UTF-8</encoding> -- </configuration> -- <executions> -- <execution> -- <phase>site</phase> -- <goals> -- <goal>format</goal> -- </goals> -- </execution> -- </executions> -- </plugin> -- <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> -- <version>2.3.4</version> -+ <version>2.3.5</version> - <extensions>true</extensions> - <configuration> - <instructions> -@@ -244,45 +144,6 @@ - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> -- <artifactId>maven-changes-plugin</artifactId> -- <version>2.3</version> -- <configuration> -- <issueLinkTemplate>http://code.google.com/p/snakeyaml/issues/detail?id=%ISSUE%</issueLinkTemplate> -- </configuration> -- <reportSets> -- <reportSet> -- <reports> -- <report>changes-report</report> -- </reports> -- </reportSet> -- </reportSets> -- </plugin> -- <plugin> -- <groupId>org.apache.maven.plugins</groupId> -- <artifactId>maven-surefire-report-plugin</artifactId> -- <version>2.6</version> -- <configuration> -- <showSuccess>true</showSuccess> -- </configuration> -- </plugin> -- <plugin> -- <groupId>org.codehaus.mojo</groupId> -- <artifactId>cobertura-maven-plugin</artifactId> -- <version>2.5.1</version> -- <configuration> -- <formats> -- <format>html</format> -- <format>xml</format> -- </formats> -- </configuration> -- </plugin> -- <plugin> -- <groupId>org.apache.maven.plugins</groupId> -- <artifactId>maven-jxr-plugin</artifactId> -- <version>2.2</version> -- </plugin> -- <plugin> -- <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <version>2.8</version> - <reportSets> diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index 8f6ca63..0000000 --- a/debian/patches/series +++ /dev/null @@ -1 +0,0 @@ -dependencies diff --git a/debian/rules b/debian/rules index dd1aac3..67de8cc 100755 --- a/debian/rules +++ b/debian/rules @@ -1,28 +1,10 @@ #!/usr/bin/make -f export DH_VERBOSE=1 -JAVA_HOME := /usr/lib/jvm/default-java/ - -DEBVERS := $(shell dpkg-parsechangelog | sed -n -e 's/^Version: //p') -VERSION := $(shell echo '$(DEBVERS)' | sed -e 's/^[[:digit:]]*://' -e 's/[~-].*//') +JAVA_HOME := /usr/lib/jvm/default-java %: - dh $@ - -override_dh_auto_clean: - dh_auto_clean - mvn -o -Dmaven.test.skip=true -DskipTests -Dmaven.repo.local=/usr/share/maven-repo/ clean - -override_dh_auto_build: - mvn -o -Dmaven.test.skip=true -DskipTests -Dmaven.repo.local=/usr/share/maven-repo/ package - -override_dh_auto_install: - dh_auto_install - dh_install target/snakeyaml-${VERSION}.jar /usr/share/java/ - for i in ${VERSION} debian; do \ - dh_link usr/share/java/snakeyaml-${VERSION}.jar usr/share/maven-repo/org/yaml/$$i/snakeyaml-${VERSION}.jar; \ - cp -a ./pom.xml debian/libyaml-snake-java/usr/share/maven-repo/org/yaml//$$i/snakeyaml-${VERSION}.pom; \ - done + dh $@ --buildsystem=maven get-orig-source: /bin/bash debian/get-orig-source.sh diff --git a/debian/snakeyaml-javadoc b/debian/snakeyaml-javadoc deleted file mode 100644 index 68a885e..0000000 --- a/debian/snakeyaml-javadoc +++ /dev/null @@ -1,8 +0,0 @@ -Document: snakeyaml-javadoc -Title: The SnakeYAML API -Section: Programming/Java -Abstract: Javadoc of SnakeYAML - -Format: HTML -Index: /usr/share/doc/libsnakeyaml-java/apidocs/index.html -FIles: /usr/share/doc/libsnakeyaml-java/apidocs/*.html -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/snakeyaml.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
