[saxonb] 23/34: dfsg suffix added, non-free source removed, minor improvements
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Fri Apr 6 14:38:54 UTC 2018
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository saxonb.
commit de95f24ff7838db43686facad6e0e3139ae16fdd
Author: Eugene Zhukov <eugene at debian.org>
Date: Wed Sep 18 12:42:53 2013 +0000
dfsg suffix added, non-free source removed, minor improvements
---
debian/README.Debian-source | 10 ----------
debian/README.source | 12 ++++++++++++
debian/changelog | 23 +++++++++++++++++++++++
debian/control | 10 +++++-----
debian/manpages/saxonb-xquery.1 | 2 +-
debian/orig-tar.sh | 4 ++--
debian/rules | 9 +++------
debian/watch | 2 +-
8 files changed, 47 insertions(+), 25 deletions(-)
diff --git a/debian/README.Debian-source b/debian/README.Debian-source
deleted file mode 100644
index 9ebfa23..0000000
--- a/debian/README.Debian-source
+++ /dev/null
@@ -1,10 +0,0 @@
-libsaxon-java for debian
--------------------------
-
-I did completly revamped saxon. First Saxon is shipped in a zip form
-with compiled classes and jar files. I did unzip the original, removed
-the jar files and the javadoc (everything I can build). Then, I unjar
-the sources and put them in a 'src' directory. Finally I created an orig
-tarball.
-
- -- Arnaud Vandyck <arnaud.vandyck at ulg.ac.be>, Wed Aug 6 19:29:01 2003
diff --git a/debian/README.source b/debian/README.source
new file mode 100644
index 0000000..8733aed
--- /dev/null
+++ b/debian/README.source
@@ -0,0 +1,12 @@
+Information about saxonb
+------------------------------
+
+bn and build folders are redundant for this package.
+
+bj/net/sf/saxon/dotnet package is dropped as it is
+also omitted from original build process by Saxonica.
+
+bj/javax and bj/net/sf/saxon/xqj packages are dropped
+as they violate DFSG.
+
+-- Eugene Zhukov <jevgeni.zh at gmail.com> Wed, 18 Sep 2013 13:19:39 +0000
diff --git a/debian/changelog b/debian/changelog
index bf18858..6a066cf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,26 @@
+saxonb (9.1.0.8+dfsg-4) unstable; urgency=low
+
+ * Non-free upstream source removed, dfsg suffix added (Closes: #721925)
+ * README.source with explanations added
+ * Addressed file duplication issue
+ * Removed obsolete d/README.Debian-source
+ * Fixed typo in saxonb-xquery manpage
+ * Canonicalized URLs for the Vcs-* fields in d/control
+
+ -- Eugene Zhukov <jevgeni.zh at gmail.com> Wed, 18 Sep 2013 07:50:04 +0000
+
+saxonb (9.1.0.8-3) unstable; urgency=low
+
+ [ Eugene Zhukov ]
+ * Fix classpath generation
+
+ [ Mathieu Malaterre ]
+ * Team upload.
+ * Upload to sid
+ * Remove article from Description (lintian)
+
+ -- Mathieu Malaterre <malat at debian.org> Wed, 15 May 2013 13:48:26 +0200
+
saxonb (9.1.0.8-2) experimental; urgency=low
[ Eugene Zhukov ]
diff --git a/debian/control b/debian/control
index 5ffcef4..a39bfe1 100644
--- a/debian/control
+++ b/debian/control
@@ -2,19 +2,19 @@ Source: saxonb
Section: java
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Rene Engelhard <rene at debian.org>
+Uploaders: Rene Engelhard <rene at debian.org>, Eugene Zhukov <jevgeni.zh at gmail.com>
Build-Depends: debhelper (>= 7), cdbs, default-jdk, ant (>= 1.7), maven-repo-helper
Build-Depends-Indep: libdom4j-java, libjdom1-java, libxom-java
Standards-Version: 3.9.4
Homepage: http://saxon.sourceforge.net/
-Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/saxonb
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/saxonb
+Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/saxonb
+Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/saxonb/
Package: libsaxonb-java
Architecture: all
Depends: libdom4j-java, libjdom1-java, libxom-java, ${misc:Depends}
Suggests: libsaxonb-java-doc
-Description: The Saxon-B XSLT Processor
+Description: Saxon-B XSLT Processor
The saxon package is a collection of tools for processing XML documents and
implements XSLT 2.0, XPath 2.0, and XQuery 1.0.
.
@@ -26,7 +26,7 @@ Package: libsaxonb-java-doc
Section: doc
Architecture: all
Depends: ${misc:Depends}
-Description: The Saxon-B XSLT Processor's documentation and javadoc
+Description: Saxon-B XSLT Processor's documentation and javadoc
The saxon package is a collection of tools for processing XML documents and
implements XSLT 2.0, XPath 2.0, and XQuery 1.0.
.
diff --git a/debian/manpages/saxonb-xquery.1 b/debian/manpages/saxonb-xquery.1
index bb36541..32f4695 100644
--- a/debian/manpages/saxonb-xquery.1
+++ b/debian/manpages/saxonb-xquery.1
@@ -195,7 +195,7 @@ Display a help message and exit\.
.PP
\fB\-mr:\fR\fB\fIclassname\fR\fR
.RS 4
-Use the specifed class as a
+Use the specified class as a
ModuleURIResolver
to resolve query module URIs\. The class must implement
net\.sf\.saxon\.query\.ModuleURIResolver\.
diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh
index 2169419..e13c8f3 100755
--- a/debian/orig-tar.sh
+++ b/debian/orig-tar.sh
@@ -1,12 +1,12 @@
#!/bin/sh -e
VERSION=$2
-TAR=../saxonb_$VERSION.orig.tar.gz
+TAR=../saxonb_$VERSION+dfsg.orig.tar.gz
DIR=saxonb-$VERSION
TAG="$VERSION"
svn export https://saxon.svn.sourceforge.net/svnroot/saxon/tags/${TAG}/ $DIR
-tar -c -z -f $TAR --exclude '*.class' $DIR
+tar -c -z -f $TAR --exclude '*.class' --exclude 'build' --exclude 'bn' --exclude 'bj/net/sf/saxon/dotnet' --exclude 'bj/javax' --exclude 'bj/net/sf/saxon/xqj' $DIR
rm -rf $DIR ../$TAG
# move to directory 'tarballs'
diff --git a/debian/rules b/debian/rules
index 5bb987f..efe4273 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,7 +17,6 @@ DEB_ANT_BUILD_TARGET := jar javadoc
DEB_BUILDDIR := bj
install/libsaxonb-java::
- install -m 644 -D dist/saxonb-$(VERSION).jar debian/libsaxonb-java/usr/share/java/saxonb-$(VERSION).jar
install -m 644 -D dist/saxonb-ant-$(VERSION).jar debian/libsaxonb-java/usr/share/java/saxonb-ant-$(VERSION).jar
install -m 644 -D dist/saxonb-dom4j-$(VERSION).jar debian/libsaxonb-java/usr/share/java/saxonb-dom4j-$(VERSION).jar
install -m 644 -D dist/saxonb-dom-$(VERSION).jar debian/libsaxonb-java/usr/share/java/saxonb-dom-$(VERSION).jar
@@ -25,8 +24,6 @@ install/libsaxonb-java::
install -m 644 -D dist/saxonb-sql-$(VERSION).jar debian/libsaxonb-java/usr/share/java/saxonb-sql-$(VERSION).jar
install -m 644 -D dist/saxonb-xom-$(VERSION).jar debian/libsaxonb-java/usr/share/java/saxonb-xom-$(VERSION).jar
install -m 644 -D dist/saxonb-xpath-$(VERSION).jar debian/libsaxonb-java/usr/share/java/saxonb-xpath-$(VERSION).jar
- install -m 644 -D dist/saxonb-xqj-$(VERSION).jar debian/libsaxonb-java/usr/share/java/saxonb-xqj-$(VERSION).jar
- dh_link -p libsaxonb-java /usr/share/java/saxonb-$(VERSION).jar /usr/share/java/saxonb.jar
dh_link -p libsaxonb-java /usr/share/java/saxonb-ant-$(VERSION).jar /usr/share/java/saxonb-ant.jar
dh_link -p libsaxonb-java /usr/share/java/saxonb-dom4j-$(VERSION).jar /usr/share/java/saxonb-dom4j.jar
dh_link -p libsaxonb-java /usr/share/java/saxonb-dom-$(VERSION).jar /usr/share/java/saxonb-dom.jar
@@ -34,15 +31,15 @@ install/libsaxonb-java::
dh_link -p libsaxonb-java /usr/share/java/saxonb-sql-$(VERSION).jar /usr/share/java/saxonb-spl.jar
dh_link -p libsaxonb-java /usr/share/java/saxonb-xom-$(VERSION).jar /usr/share/java/saxonb-xom.jar
dh_link -p libsaxonb-java /usr/share/java/saxonb-xpath-$(VERSION).jar /usr/share/java/saxonb-xpath.jar
- dh_link -p libsaxonb-java /usr/share/java/saxonb-xqj-$(VERSION).jar /usr/share/java/saxonb-xqj.jar
mh_installpoms -plibsaxonb-java
- mh_installjar -plibsaxonb-java debian/saxonb.pom dist/saxonb-$(VERSION).jar
+ mh_installjar -l -nsaxonb -plibsaxonb-java debian/saxonb.pom dist/saxonb-$(VERSION).jar
clean::
mh_clean
+VERSION_DFSG := $(shell echo $(VERSION) | sed 's/+dfsg//')
get-orig-source:
- uscan --download-version $(VERSION) --force-download
+ uscan --download-version $(VERSION_DFSG) --force-download
get-orig-pom:
wget -O debian/saxonb.pom -U NoAgent-1.0 \
diff --git a/debian/watch b/debian/watch
index 87c3c74..bd4044c 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,4 +1,4 @@
version=3
-
+opts=dversionmangle=s/\+dfsg// \
https://saxon.svn.sourceforge.net/svnroot/saxon/tags/ (\d.*)/ \
debian debian/orig-tar.sh
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/saxonb.git
More information about the pkg-java-commits
mailing list