[med-svn] [Git][med-team/libkmlframework-java][master] 9 commits: Use git mode in watch file
Andreas Tille
gitlab at salsa.debian.org
Tue Jan 8 15:30:23 GMT 2019
Andreas Tille pushed to branch master at Debian Med / libkmlframework-java
Commits:
167dd7aa by Andreas Tille at 2019-01-08T15:08:36Z
Use git mode in watch file
- - - - -
3eaf456e by Andreas Tille at 2019-01-08T15:08:50Z
New upstream version 0.0+git20150825.a2e0518
- - - - -
395b9072 by Andreas Tille at 2019-01-08T15:23:05Z
Fix versioning
- - - - -
64a7d0c7 by Andreas Tille at 2019-01-08T15:23:29Z
debhelper 11
- - - - -
dbcefe26 by Andreas Tille at 2019-01-08T15:23:31Z
Point Vcs fields to salsa.debian.org
- - - - -
a0fcc1ef by Andreas Tille at 2019-01-08T15:23:31Z
Standards-Version: 4.3.0
- - - - -
9f90f239 by Andreas Tille at 2019-01-08T15:24:45Z
New upstream version 0.0.git20150825.a2e0518
- - - - -
08c36d89 by Andreas Tille at 2019-01-08T15:24:46Z
Update upstream source from tag 'upstream/0.0.git20150825.a2e0518'
Update to upstream version '0.0.git20150825.a2e0518'
with Debian dir 690c522d3f5efb0b9479db2efa91b00e94af44b9
- - - - -
656ff8a5 by Andreas Tille at 2019-01-08T15:29:13Z
Upload to unstable
- - - - -
18 changed files:
- + .classpath
- + .project
- + README.md
- + build.xml
- debian/changelog
- debian/compat
- debian/control
- − debian/get-orig-source
- debian/rules
- debian/watch
- + lib/ant-googlecode-0.0.1.jar
- + lib/commons-logging.jar
- + lib/javax.servlet.jar
- + lib/urlrewrite-2.6.0.jar
- + lib/xom-1.0.jar
- + lib/xpp3-1.1.3.4.O.jar
- + lib/xpp3_min-1.1.3.4.O.jar
- + lib/xpp3_xpath-1.1.3.4.O.jar
Changes:
=====================================
.classpath
=====================================
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="lib" path="lib/javax.servlet.jar"/>
+ <classpathentry kind="lib" path="lib/urlrewrite-2.6.0.jar"/>
+ <classpathentry kind="lib" path="lib/ant-googlecode-0.0.1.jar"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
=====================================
.project
=====================================
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>kmlframework</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
=====================================
README.md
=====================================
@@ -0,0 +1,2 @@
+# kmlframework
+Automatically exported from code.google.com/p/kmlframework
=====================================
build.xml
=====================================
@@ -0,0 +1,84 @@
+<?xml version="1.0"?>
+<project name="kmlframework" default="jar" basedir=".">
+
+ <property name="projectname" value="kmlframework"/>
+ <property name="src.dir" location="${basedir}/src"/>
+ <property name="lib.dir" location="${basedir}/lib"/>
+ <property name="doc.dir" location="${basedir}/docs"/>
+ <property name="javadoc.dir" location="${doc.dir}/javadoc"/>
+ <property name="bin.dir" location="${basedir}/bin"/>
+ <property name="jars.dir" location="jars"/>
+ <property name="distribution.dir" location="${basedir}/distribution"/>
+
+ <property file="build.properties"/>
+
+ <path id="classpath">
+ <fileset dir="${lib.dir}" includes="**/*.jar"/>
+ <pathelement location="${basedir}"/>
+ <pathelement location="${bin.dir}"/>
+ </path>
+
+ <target name="compile">
+ <mkdir dir="${bin.dir}"/>
+ <javac srcdir="${src.dir}"
+ destdir="${bin.dir}"
+ debug="on"
+ classpathref="classpath"
+ />
+ </target>
+
+ <target name="jar">
+ <tstamp />
+ <delete dir="${jars.dir}"/>
+ <mkdir dir="${jars.dir}"/>
+ <jar jarfile="${jars.dir}/org.boehn.kmlframework_${DSTAMP}.jar" basedir="${bin.dir}"/>
+ </target>
+
+ <target name="distribution" depends="jar,javadoc">
+ <tstamp />
+ <delete dir="${distribution.dir}"/>
+ <mkdir dir="${distribution.dir}"/>
+ <mkdir dir="${distribution.dir}/org.boehn.kmlframework_${DSTAMP}"/>
+ <copy file="${jars.dir}/org.boehn.kmlframework_${DSTAMP}.jar" todir="${distribution.dir}/org.boehn.kmlframework_${DSTAMP}"/>
+ <copy todir="${distribution.dir}/org.boehn.kmlframework_${DSTAMP}/documentation">
+ <fileset dir="${doc.dir}"/>
+ </copy>
+ <copy todir="${distribution.dir}/org.boehn.kmlframework_${DSTAMP}/src">
+ <fileset dir="${src.dir}"/>
+ </copy>
+ <zip destfile="${distribution.dir}/org.boehn.kmlframework_${DSTAMP}.zip" basedir="${distribution.dir}/org.boehn.kmlframework_${DSTAMP}" keepcompression="true"/>
+ </target>
+
+ <target name="javadoc">
+ <javadoc
+ packagenames="org.boehn.kmlframework.*"
+ sourcepath="${src.dir}"
+ excludepackagenames="org.boehn.kmlframework.examples.*"
+ defaultexcludes="yes"
+ destdir="${javadoc.dir}"
+ author="true"
+ version="true"
+ use="true"
+ windowtitle="KML Framework API"
+ classpathref="classpath"
+ />
+ </target>
+
+ <target name="deploy" depends="distribution">
+ <taskdef classname="net.bluecow.googlecode.ant.GoogleCodeUploadTask" classpath="${lib.dir}/ant-googlecode-0.0.1.jar" name="gcupload"/>
+ <gcupload
+ username="${gc.username}"
+ password="${gc.password}"
+ projectname="kmlframework"
+ filename="${distribution.dir}/org.boehn.kmlframework_${DSTAMP}.zip"
+ targetfilename="org.boehn.kmlframework_${DSTAMP}.zip"
+ summary="Version ${DSTAMP}"
+ />
+ </target>
+
+ <target name="clean">
+ <delete dir="${jars.dir}"/>
+ <delete dir="${bin.dir}"/>
+ </target>
+
+</project>
\ No newline at end of file
=====================================
debian/changelog
=====================================
@@ -1,3 +1,12 @@
+libkmlframework-java (0.0.git20150825.a2e0518-1) unstable; urgency=medium
+
+ * Use git mode in watch file
+ * debhelper 11
+ * Point Vcs fields to salsa.debian.org
+ * Standards-Version: 4.3.0
+
+ -- Andreas Tille <tille at debian.org> Tue, 08 Jan 2019 16:25:27 +0100
+
libkmlframework-java (0.0.20110822.r24-2) unstable; urgency=medium
* Upstream moved from googlecode to github - no code changes
=====================================
debian/compat
=====================================
@@ -1 +1 @@
-10
+11
=====================================
debian/control
=====================================
@@ -3,14 +3,14 @@ Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.
Uploaders: Andreas Tille <tille at debian.org>
Section: java
Priority: optional
-Build-Depends: debhelper (>= 10),
+Build-Depends: debhelper (>= 11~),
javahelper,
default-jdk,
ant,
libservlet3.1-java
-Standards-Version: 3.9.8
-Vcs-Browser: https://anonscm.debian.org/cgit/debian-med/libkmlframework-java.git
-Vcs-Git: https://anonscm.debian.org/git/debian-med/libkmlframework-java.git
+Standards-Version: 4.3.0
+Vcs-Browser: https://salsa.debian.org/med-team/libkmlframework-java
+Vcs-Git: https://salsa.debian.org/med-team/libkmlframework-java.git
Homepage: https://github.com/deinlandel/kmlframework
Package: libkmlframework-java
=====================================
debian/get-orig-source deleted
=====================================
@@ -1,47 +0,0 @@
-#!/bin/sh -e
-# if you need to repack for whatever reason you can
-# use this script via uscan or directly
-#
-# FIXME: currently the code is not conform to Debian Policy
-# http://www.debian.org/doc/debian-policy/ch-source.html
-# "get-orig-source (optional)"
-# This target may be invoked in any directory, ...
-# --> currently it is assumed the script is called in the
-# source directory featuring the debian/ dir
-
-cat <<EOT
-This used to work on googlecode but project was moved to
- https://github.com/deinlandel/kmlframework
-and thus this script needs to be redesigned. Since the
-project is deprecated anyway this was not done for the moment
-EOT
-exit 1
-
-COMPRESS=xz
-
-NAME=`dpkg-parsechangelog | awk '/^Source/ { print $2 }'`
-
-VERSION=`dpkg-parsechangelog | awk '/^Version:/ { print $2 }' | sed 's/\([0-9\.]\+\)-[0-9]\+$/\1/'`
-
-## NO tags no branches
-SVNURI="http://kmlframework.googlecode.com/svn/trunk"
-SVNSRCURI="$SVNURI/src"
-SVNDOCURI="$SVNURI/docs"
-revision=`LANG=C svn info ${SVNURI} | grep "^Last Changed Rev:" | sed 's/Last Changed Rev: *//'`
-VERSION=`echo ${VERSION}| sed "s/\.r[0-9]\+$//"`.r${revision}
-echo $VERSION
-
-TARDIR=${NAME}-${VERSION}
-
-mkdir -p ../tarballs
-cd ../tarballs
-# svn export conserves time stamps of the files, checkout does not
-rm -rf ${TARDIR}
-mkdir -p ${TARDIR}
-cd ${TARDIR}
-LC_ALL=C svn --quiet export ${SVNSRCURI}
-LC_ALL=C svn --quiet export ${SVNDOCURI}
-cd ..
-
-GZIP="--best --no-name" tar --owner=root --group=root --mode=a+rX -caf "$NAME"_"$VERSION".orig.tar.${COMPRESS} "${TARDIR}"
-rm -rf ${TARDIR}
=====================================
debian/rules
=====================================
@@ -17,6 +17,3 @@ override_dh_clean:
ant -f src/build.xml clean
rm -rf lib
dh_clean
-
-get-orig-source:
- uscan --verbose --force-download --repack --rename
=====================================
debian/watch
=====================================
@@ -1,5 +1,4 @@
version=4
-# no release tags (neither formerly at googlecode nor now at github)
-opts=dversionmangle=s/.*/0.No-Release/ \
- https://people.debian.org/~eriberto/ FakeWatchNoUpstreamReleaseForThisPackage-(\d\S+)\.gz
+opts="mode=git,pretty=0.0.git%cd.%h" \
+ https://github.com/deinlandel/kmlframework.git HEAD
=====================================
lib/ant-googlecode-0.0.1.jar
=====================================
Binary files /dev/null and b/lib/ant-googlecode-0.0.1.jar differ
=====================================
lib/commons-logging.jar
=====================================
Binary files /dev/null and b/lib/commons-logging.jar differ
=====================================
lib/javax.servlet.jar
=====================================
Binary files /dev/null and b/lib/javax.servlet.jar differ
=====================================
lib/urlrewrite-2.6.0.jar
=====================================
Binary files /dev/null and b/lib/urlrewrite-2.6.0.jar differ
=====================================
lib/xom-1.0.jar
=====================================
Binary files /dev/null and b/lib/xom-1.0.jar differ
=====================================
lib/xpp3-1.1.3.4.O.jar
=====================================
Binary files /dev/null and b/lib/xpp3-1.1.3.4.O.jar differ
=====================================
lib/xpp3_min-1.1.3.4.O.jar
=====================================
Binary files /dev/null and b/lib/xpp3_min-1.1.3.4.O.jar differ
=====================================
lib/xpp3_xpath-1.1.3.4.O.jar
=====================================
Binary files /dev/null and b/lib/xpp3_xpath-1.1.3.4.O.jar differ
View it on GitLab: https://salsa.debian.org/med-team/libkmlframework-java/compare/61df67028f026f7a638bc4cb7816ba4e52428d1a...656ff8a5ffa2b8d5884ab5f34374e71383691295
--
View it on GitLab: https://salsa.debian.org/med-team/libkmlframework-java/compare/61df67028f026f7a638bc4cb7816ba4e52428d1a...656ff8a5ffa2b8d5884ab5f34374e71383691295
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20190108/2d18866c/attachment-0001.html>
More information about the debian-med-commit
mailing list