diff -Nru atinject-jsr330-1.0/debian/changelog atinject-jsr330-1.0/debian/changelog --- atinject-jsr330-1.0/debian/changelog 2010-06-02 20:12:12.000000000 +0000 +++ atinject-jsr330-1.0/debian/changelog 2011-09-08 04:02:14.000000000 +0000 @@ -1,3 +1,12 @@ +atinject-jsr330 (1.0-2) unstable; urgency=low + + * Provide maven artifact. + * Fix watch file. + * Bump Standards-Version to 3.9.2. No changes were required. + * Update copyright file. + + -- Miguel Landaeta Sat, 03 Sep 2011 19:45:45 -0430 + atinject-jsr330 (1.0-1) unstable; urgency=low * Initial release. (Closes: #581768). diff -Nru atinject-jsr330-1.0/debian/control atinject-jsr330-1.0/debian/control --- atinject-jsr330-1.0/debian/control 2010-06-02 20:12:12.000000000 +0000 +++ atinject-jsr330-1.0/debian/control 2011-09-08 04:02:14.000000000 +0000 @@ -3,8 +3,8 @@ Uploaders: Miguel Landaeta Section: java Priority: optional -Build-Depends: debhelper (>= 7.0.50), default-jdk, javahelper -Standards-Version: 3.8.4 +Build-Depends: debhelper (>= 7.0.50), default-jdk, javahelper, maven-debian-helper +Standards-Version: 3.9.2 Homepage: http://code.google.com/p/atinject/ Vcs-Git: git://git.debian.org/git/pkg-java/atinject-jsr330.git Vcs-Browser: http://git.debian.org/?p=pkg-java/atinject-jsr330.git @@ -24,7 +24,7 @@ Architecture: all Section: doc Depends: ${misc:Depends} -Suggests: libatinject-jsr330-api-java (= ${binary:Version}) +Suggests: libatinject-jsr330-api-java (= ${binary:Version}), default-jdk-doc Description: Documentation for libatinject-jsr330-api-java Documentation for AtInject that is the Java API build by the JSR-330 Expert Group: . diff -Nru atinject-jsr330-1.0/debian/copyright atinject-jsr330-1.0/debian/copyright --- atinject-jsr330-1.0/debian/copyright 2010-06-02 20:12:12.000000000 +0000 +++ atinject-jsr330-1.0/debian/copyright 2011-09-08 04:02:14.000000000 +0000 @@ -1,13 +1,26 @@ -The sources were downloaded from http://atinject.googlecode.com/files/javax.inject.zip. +Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=173 +Upstream-Name: atinject +Upstream-Contact: The JSR-330 Expert Group +Source: http://code.google.com/p/atinject/downloads/list Files: * -Copyright: © 2009 The JSR-330 Expert Group +Copyright: © 2009, The JSR-330 Expert Group License: Apache-2.0 - The full text of the Apache 2.0 license is distributed in - /usr/share/common-licenses/Apache-2.0 on Debian systems. Files: debian/* -Copyright: © 2010 Miguel Landaeta +Copyright: © 2010-2011, Miguel Landaeta License: Apache-2.0 - The full text of the Apache 2.0 license is distributed in - /usr/share/common-licenses/Apache-2.0 on Debian systems. + +License: Apache-2.0 + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + . + http://www.apache.org/licenses/LICENSE-2.0 + /usr/share/common-licenses/Apache-2.0 (on Debian systems) + . + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff -Nru atinject-jsr330-1.0/debian/libatinject-jsr330-api-java.jlibs atinject-jsr330-1.0/debian/libatinject-jsr330-api-java.jlibs --- atinject-jsr330-1.0/debian/libatinject-jsr330-api-java.jlibs 2010-06-02 20:12:12.000000000 +0000 +++ atinject-jsr330-1.0/debian/libatinject-jsr330-api-java.jlibs 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -atinject-jsr330-api.jar diff -Nru atinject-jsr330-1.0/debian/libatinject-jsr330-api-java.poms atinject-jsr330-1.0/debian/libatinject-jsr330-api-java.poms --- atinject-jsr330-1.0/debian/libatinject-jsr330-api-java.poms 1970-01-01 00:00:00.000000000 +0000 +++ atinject-jsr330-1.0/debian/libatinject-jsr330-api-java.poms 2011-09-08 04:02:14.000000000 +0000 @@ -0,0 +1 @@ +debian/pom.xml diff -Nru atinject-jsr330-1.0/debian/orig-tar.sh atinject-jsr330-1.0/debian/orig-tar.sh --- atinject-jsr330-1.0/debian/orig-tar.sh 2010-06-02 20:12:12.000000000 +0000 +++ atinject-jsr330-1.0/debian/orig-tar.sh 2011-09-08 04:02:14.000000000 +0000 @@ -2,14 +2,14 @@ set -e -# called by uscan with '--upstream-version' -echo "version $2" +url="http://atinject.googlecode.com/files/javax.inject.zip" package=`dpkg-parsechangelog | sed -n 's/^Source: //p'` version=`dpkg-parsechangelog | sed -n 's/^Version: \(.*\)-.*/\1/p'` -tarball=$3 +tarball="javax.inject.zip" TAR=${package}_${version}.orig.tar.gz DIR=${package}-${version}.orig +wget $url unzip $tarball -d $DIR unzip $DIR/javax.inject-src.zip -d $DIR diff -Nru atinject-jsr330-1.0/debian/pom.xml atinject-jsr330-1.0/debian/pom.xml --- atinject-jsr330-1.0/debian/pom.xml 1970-01-01 00:00:00.000000000 +0000 +++ atinject-jsr330-1.0/debian/pom.xml 2011-09-08 04:02:14.000000000 +0000 @@ -0,0 +1,20 @@ + + 4.0.0 + javax.inject + javax.inject + jar + javax.inject + 1 + The javax.inject API + http://code.google.com/p/atinject/ + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + http://code.google.com/p/atinject/source/checkout + + diff -Nru atinject-jsr330-1.0/debian/rules atinject-jsr330-1.0/debian/rules --- atinject-jsr330-1.0/debian/rules 2010-06-02 20:12:12.000000000 +0000 +++ atinject-jsr330-1.0/debian/rules 2011-09-08 04:02:14.000000000 +0000 @@ -1,18 +1,24 @@ #!/usr/bin/make -f export JAVA_HOME=/usr/lib/jvm/default-java +VERSION := $(shell dpkg-parsechangelog | grep ^Version: | sed -r 's/^.*:\ (.*)-.*$$/\1/') %: - dh --with javahelper $@ + dh $@ --with javahelper override_jh_build: jh_build atinject-jsr330-api.jar javax +override_dh_install: + mh_installjar -plibatinject-jsr330-api-java -l \ + --usj-name=atinject-jsr330-api --usj-version=$(VERSION) \ + debian/pom.xml atinject-jsr330-api.jar + mh_installpoms -plibatinject-jsr330-api-java + +override_dh_clean: + dh_clean + mh_clean + get-orig-source: cd $(dir $(firstword $(MAKEFILE_LIST)))../ && \ - uscan \ - --verbose \ - --no-symlink \ - --destdir $(CURDIR) \ - --watchfile debian/watch \ - --force-download + ./debian/orig-tar.sh diff -Nru atinject-jsr330-1.0/debian/watch atinject-jsr330-1.0/debian/watch --- atinject-jsr330-1.0/debian/watch 2010-06-02 20:12:12.000000000 +0000 +++ atinject-jsr330-1.0/debian/watch 2011-09-08 04:02:14.000000000 +0000 @@ -1,7 +1,5 @@ version=3 -opts=\ -downloadurlmangle=s|.*[?]name=(.*?)&.*|http://atinject.googlecode.com/files/$1|,\ -filenamemangle=s|[^/]+[?]name=(.*?)&.*|$1|,\ -dversionmangle=s/\.inject/1.0/ \ -http://code.google.com/p/atinject/downloads/detail[?]name=javax(.inject).zip&.* \ -debian debian/orig-tar.sh +opts=uversionmangle=s/^(.*)$/$1.0/ \ +http://code.google.com/p/atinject/downloads/list \ + //atinject.googlecode.com/files/javax.inject-([0-9\.]+)-bundle.jar \ + debian debian/orig-tar.sh