[dnsjava] 02/03: Imported Debian patch 2.1.5-0.1

Emmanuel Bourg ebourg-guest at moszumanska.debian.org
Tue Jan 5 08:57:36 UTC 2016


This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository dnsjava.

commit 79b0091c766f7467893c615e6eb4565ada39d1b0
Merge: 4490fc7 7893f9d
Author: Damian Minkov <damencho at jitsi.org>
Date:   Fri Jul 26 16:08:27 2013 +0300

    Imported Debian patch 2.1.5-0.1

 Changelog                                          | 11 ++++
 Makefile                                           |  2 +-
 README                                             |  1 -
 build.xml                                          |  8 ++-
 debian/changelog                                   |  8 +++
 debian/control                                     |  4 +-
 debian/patches/build-bundle-default.patch          |  6 +-
 debian/patches/removes-bnd.jar-download.patch      | 16 +++++
 debian/patches/series                              |  1 +
 doc/allclasses-frame.html                          |  4 +-
 doc/allclasses-noframe.html                        |  4 +-
 doc/constant-values.html                           |  4 +-
 doc/deprecated-list.html                           |  4 +-
 doc/help-doc.html                                  |  4 +-
 doc/index-all.html                                 | 12 +++-
 doc/index.html                                     |  2 +-
 doc/org/xbill/DNS/A6Record.html                    |  4 +-
 doc/org/xbill/DNS/AAAARecord.html                  |  4 +-
 doc/org/xbill/DNS/AFSDBRecord.html                 |  4 +-
 doc/org/xbill/DNS/APLRecord.Element.html           |  4 +-
 doc/org/xbill/DNS/APLRecord.html                   |  4 +-
 doc/org/xbill/DNS/ARecord.html                     |  4 +-
 doc/org/xbill/DNS/Address.html                     |  4 +-
 doc/org/xbill/DNS/CERTRecord.CertificateType.html  |  4 +-
 doc/org/xbill/DNS/CERTRecord.html                  |  4 +-
 doc/org/xbill/DNS/CNAMERecord.html                 |  4 +-
 doc/org/xbill/DNS/Cache.html                       |  4 +-
 doc/org/xbill/DNS/ClientSubnetOption.html          |  4 +-
 doc/org/xbill/DNS/Compression.html                 |  4 +-
 doc/org/xbill/DNS/Credibility.html                 |  4 +-
 doc/org/xbill/DNS/DClass.html                      |  4 +-
 doc/org/xbill/DNS/DHCIDRecord.html                 |  4 +-
 doc/org/xbill/DNS/DLVRecord.html                   |  4 +-
 doc/org/xbill/DNS/DNAMERecord.html                 |  4 +-
 doc/org/xbill/DNS/DNSInput.html                    |  4 +-
 doc/org/xbill/DNS/DNSKEYRecord.Flags.html          |  4 +-
 doc/org/xbill/DNS/DNSKEYRecord.Protocol.html       |  4 +-
 doc/org/xbill/DNS/DNSKEYRecord.html                |  4 +-
 doc/org/xbill/DNS/DNSOutput.html                   |  4 +-
 doc/org/xbill/DNS/DNSSEC.Algorithm.html            |  4 +-
 doc/org/xbill/DNS/DNSSEC.DNSSECException.html      |  4 +-
 .../xbill/DNS/DNSSEC.IncompatibleKeyException.html |  4 +-
 doc/org/xbill/DNS/DNSSEC.KeyMismatchException.html |  4 +-
 .../xbill/DNS/DNSSEC.MalformedKeyException.html    |  4 +-
 .../DNS/DNSSEC.SignatureExpiredException.html      |  4 +-
 .../DNS/DNSSEC.SignatureNotYetValidException.html  |  4 +-
 .../DNS/DNSSEC.SignatureVerificationException.html |  4 +-
 .../DNS/DNSSEC.UnsupportedAlgorithmException.html  |  4 +-
 doc/org/xbill/DNS/DNSSEC.html                      |  4 +-
 doc/org/xbill/DNS/DSRecord.Digest.html             |  4 +-
 doc/org/xbill/DNS/DSRecord.html                    |  4 +-
 doc/org/xbill/DNS/EDNSOption.Code.html             |  4 +-
 doc/org/xbill/DNS/EDNSOption.html                  |  4 +-
 doc/org/xbill/DNS/ExtendedFlags.html               |  4 +-
 doc/org/xbill/DNS/ExtendedResolver.html            |  4 +-
 doc/org/xbill/DNS/Flags.html                       |  4 +-
 doc/org/xbill/DNS/GPOSRecord.html                  |  4 +-
 doc/org/xbill/DNS/Generator.html                   |  4 +-
 doc/org/xbill/DNS/GenericEDNSOption.html           |  4 +-
 doc/org/xbill/DNS/HINFORecord.html                 |  4 +-
 doc/org/xbill/DNS/Header.html                      |  4 +-
 doc/org/xbill/DNS/IPSECKEYRecord.Algorithm.html    |  4 +-
 doc/org/xbill/DNS/IPSECKEYRecord.Gateway.html      |  4 +-
 doc/org/xbill/DNS/IPSECKEYRecord.html              |  4 +-
 doc/org/xbill/DNS/ISDNRecord.html                  |  4 +-
 doc/org/xbill/DNS/InvalidDClassException.html      |  4 +-
 doc/org/xbill/DNS/InvalidTTLException.html         |  4 +-
 doc/org/xbill/DNS/InvalidTypeException.html        |  4 +-
 doc/org/xbill/DNS/KEYRecord.Flags.html             |  4 +-
 doc/org/xbill/DNS/KEYRecord.Protocol.html          |  4 +-
 doc/org/xbill/DNS/KEYRecord.html                   |  4 +-
 doc/org/xbill/DNS/KXRecord.html                    |  4 +-
 doc/org/xbill/DNS/LOCRecord.html                   |  4 +-
 doc/org/xbill/DNS/Lookup.html                      |  4 +-
 doc/org/xbill/DNS/MBRecord.html                    |  4 +-
 doc/org/xbill/DNS/MDRecord.html                    |  4 +-
 doc/org/xbill/DNS/MFRecord.html                    |  4 +-
 doc/org/xbill/DNS/MGRecord.html                    |  4 +-
 doc/org/xbill/DNS/MINFORecord.html                 |  4 +-
 doc/org/xbill/DNS/MRRecord.html                    |  4 +-
 doc/org/xbill/DNS/MXRecord.html                    |  4 +-
 doc/org/xbill/DNS/Master.html                      |  4 +-
 doc/org/xbill/DNS/Message.html                     |  4 +-
 doc/org/xbill/DNS/NAPTRRecord.html                 |  4 +-
 doc/org/xbill/DNS/NSAPRecord.html                  |  4 +-
 doc/org/xbill/DNS/NSAP_PTRRecord.html              |  4 +-
 doc/org/xbill/DNS/NSEC3PARAMRecord.html            |  4 +-
 doc/org/xbill/DNS/NSEC3Record.Digest.html          |  4 +-
 doc/org/xbill/DNS/NSEC3Record.Flags.html           |  4 +-
 doc/org/xbill/DNS/NSEC3Record.html                 |  4 +-
 doc/org/xbill/DNS/NSECRecord.html                  |  4 +-
 doc/org/xbill/DNS/NSIDOption.html                  |  4 +-
 doc/org/xbill/DNS/NSRecord.html                    |  4 +-
 doc/org/xbill/DNS/NULLRecord.html                  |  4 +-
 doc/org/xbill/DNS/NXTRecord.html                   |  4 +-
 doc/org/xbill/DNS/Name.html                        | 71 ++++++++++++++++------
 doc/org/xbill/DNS/NameTooLongException.html        |  4 +-
 doc/org/xbill/DNS/OPTRecord.html                   |  4 +-
 doc/org/xbill/DNS/Opcode.html                      |  4 +-
 doc/org/xbill/DNS/Options.html                     |  4 +-
 doc/org/xbill/DNS/PTRRecord.html                   |  4 +-
 doc/org/xbill/DNS/PXRecord.html                    |  4 +-
 doc/org/xbill/DNS/RPRecord.html                    |  4 +-
 doc/org/xbill/DNS/RRSIGRecord.html                 |  4 +-
 doc/org/xbill/DNS/RRset.html                       |  4 +-
 doc/org/xbill/DNS/RTRecord.html                    |  4 +-
 doc/org/xbill/DNS/Rcode.html                       |  4 +-
 doc/org/xbill/DNS/Record.html                      |  4 +-
 doc/org/xbill/DNS/RelativeNameException.html       |  4 +-
 doc/org/xbill/DNS/Resolver.html                    |  4 +-
 doc/org/xbill/DNS/ResolverConfig.html              |  4 +-
 doc/org/xbill/DNS/ResolverListener.html            |  4 +-
 doc/org/xbill/DNS/ReverseMap.html                  |  4 +-
 doc/org/xbill/DNS/SIG0.html                        |  4 +-
 doc/org/xbill/DNS/SIGRecord.html                   |  4 +-
 doc/org/xbill/DNS/SOARecord.html                   |  4 +-
 doc/org/xbill/DNS/SPFRecord.html                   |  4 +-
 doc/org/xbill/DNS/SRVRecord.html                   |  4 +-
 doc/org/xbill/DNS/SSHFPRecord.Algorithm.html       |  4 +-
 doc/org/xbill/DNS/SSHFPRecord.Digest.html          |  4 +-
 doc/org/xbill/DNS/SSHFPRecord.html                 |  4 +-
 doc/org/xbill/DNS/Section.html                     |  4 +-
 doc/org/xbill/DNS/Serial.html                      |  4 +-
 doc/org/xbill/DNS/SetResponse.html                 |  4 +-
 doc/org/xbill/DNS/SimpleResolver.html              |  4 +-
 doc/org/xbill/DNS/TKEYRecord.html                  |  4 +-
 doc/org/xbill/DNS/TLSARecord.CertificateUsage.html |  4 +-
 doc/org/xbill/DNS/TLSARecord.MatchingType.html     |  4 +-
 doc/org/xbill/DNS/TLSARecord.Selector.html         |  4 +-
 doc/org/xbill/DNS/TLSARecord.html                  |  4 +-
 doc/org/xbill/DNS/TSIG.StreamVerifier.html         |  4 +-
 doc/org/xbill/DNS/TSIG.html                        |  4 +-
 doc/org/xbill/DNS/TSIGRecord.html                  |  4 +-
 doc/org/xbill/DNS/TTL.html                         |  4 +-
 doc/org/xbill/DNS/TXTRecord.html                   |  4 +-
 doc/org/xbill/DNS/TextParseException.html          |  4 +-
 doc/org/xbill/DNS/Tokenizer.Token.html             |  4 +-
 doc/org/xbill/DNS/Tokenizer.html                   |  4 +-
 doc/org/xbill/DNS/Type.html                        |  4 +-
 doc/org/xbill/DNS/UNKRecord.html                   |  4 +-
 doc/org/xbill/DNS/Update.html                      |  4 +-
 doc/org/xbill/DNS/WKSRecord.Protocol.html          |  4 +-
 doc/org/xbill/DNS/WKSRecord.Service.html           |  4 +-
 doc/org/xbill/DNS/WKSRecord.html                   |  4 +-
 doc/org/xbill/DNS/WireParseException.html          |  4 +-
 doc/org/xbill/DNS/X25Record.html                   |  4 +-
 doc/org/xbill/DNS/Zone.html                        |  4 +-
 doc/org/xbill/DNS/ZoneTransferException.html       |  4 +-
 doc/org/xbill/DNS/ZoneTransferIn.Delta.html        |  4 +-
 .../DNS/ZoneTransferIn.ZoneTransferHandler.html    |  4 +-
 doc/org/xbill/DNS/ZoneTransferIn.html              |  4 +-
 doc/org/xbill/DNS/package-frame.html               |  4 +-
 doc/org/xbill/DNS/package-summary.html             |  4 +-
 doc/org/xbill/DNS/package-tree.html                |  4 +-
 doc/org/xbill/DNS/spi/DNSJavaNameService.html      |  4 +-
 .../DNS/spi/DNSJavaNameServiceDescriptor.html      |  4 +-
 doc/org/xbill/DNS/spi/package-frame.html           |  4 +-
 doc/org/xbill/DNS/spi/package-summary.html         |  4 +-
 doc/org/xbill/DNS/spi/package-tree.html            |  4 +-
 doc/org/xbill/DNS/utils/HMAC.html                  |  4 +-
 doc/org/xbill/DNS/utils/base16.html                |  4 +-
 doc/org/xbill/DNS/utils/base32.Alphabet.html       |  4 +-
 doc/org/xbill/DNS/utils/base32.html                |  4 +-
 doc/org/xbill/DNS/utils/base64.html                |  4 +-
 doc/org/xbill/DNS/utils/hexdump.html               |  4 +-
 doc/org/xbill/DNS/utils/package-frame.html         |  4 +-
 doc/org/xbill/DNS/utils/package-summary.html       |  4 +-
 doc/org/xbill/DNS/utils/package-tree.html          |  4 +-
 doc/overview-frame.html                            |  4 +-
 doc/overview-summary.html                          |  4 +-
 doc/overview-tree.html                             |  4 +-
 doc/serialized-form.html                           |  4 +-
 org/xbill/DNS/AAAARecord.java                      |  7 ++-
 org/xbill/DNS/ARecord.java                         |  7 ++-
 org/xbill/DNS/DNSSEC.java                          |  2 +-
 org/xbill/DNS/Name.java                            | 46 ++++++++++++--
 tests/org/xbill/DNS/KEYRecordTest.java             |  6 +-
 tests/org/xbill/DNS/NameTest.java                  | 31 ++++++++++
 178 files changed, 516 insertions(+), 365 deletions(-)

diff --cc debian/changelog
index 0e50663,0000000..854764c
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,51 -1,0 +1,59 @@@
++dnsjava (2.1.5-0.1) unstable; urgency=low
++
++  * Non-maintainer upload.
++  * New upstream release.
++  * Update to remove internet connectivity requirement. (Closes: #708692)
++
++ -- Damian Minkov <damencho at jitsi.org>  Fri, 26 Jul 2013 16:08:27 +0300
++
 +dnsjava (2.1.4-0.1) unstable; urgency=low
 +
 +  [ Damian Minkov ]
 +  * Non-maintainer upload.
 +  * New upstream release. (Closes: #699033)
 +  * Changed the source format to 3.0 (quilt).
 +  * Switched debhelper's compatibility level from 5 to 9.
 +  * Added patch to build bundle jar by default, that adds support
 +  for an OSGi bundle.
 +  * Removed a bad field from debian/control ("XSBC-Original-Maintainer").
 +  * Changed Build-Depends switched debhelper version to 9.
 +  * Increased Standards-Version to 3.9.3.
 +  * Changed debian/rules to rename the built jar OSGi bundle file to the name
 +  used in the package.
 +
 +  [ Raphaël Hertzog ]
 +  * Sponsoring the upload.
 +  * Drop Dm-Upload-Allowed field from debian/control since it's no longer used
 +    by dak.
 +  * Drop the useless debian/libdnsjava-java.jlibs.
 +
 + -- Damian Minkov <damencho at jitsi.org>  Tue, 26 Mar 2013 10:45:35 +0200
 +
 +dnsjava (2.0.8-1) unstable; urgency=low
 +
 +  * Port package to pkg-java based largely on existing Ubuntu package.
 +  [ by sponsor moeller at d.o ]
 +  * New upstream version (Closes: #562199).
 +  * Disabled checks because of issue with byteArrayToString().
 +
 + -- Chris Grzegorczyk <grze at eucalyptus.com>  Thu, 17 Dec 2009 01:08:10 -0800
 +
 +dnsjava (2.0.6-0ubuntu3) karmic; urgency=low
 +
 +  * debian/patches/run-tests.patch: Disable the AddressTest testsuite since
 +    it needs network and therefore fails on most buildds, resulting in FTBFS.
 +
 + -- Thierry Carrez <thierry.carrez at ubuntu.com>  Mon, 24 Aug 2009 13:48:12 +0200
 +
 +dnsjava (2.0.6-0ubuntu2) karmic; urgency=low
 +
 +  * debian/control: Downgrade minimal JRE requirements to
 +    java2-runtime-headless since code is java2-compatible.
 +
 + -- Thierry Carrez <thierry.carrez at ubuntu.com>  Mon, 24 Aug 2009 11:42:18 +0200
 +
 +dnsjava (2.0.6-0ubuntu1) karmic; urgency=low
 +
 +  * Initial release. New Eucalyptus dependency.
 +
 + -- Thierry Carrez <thierry.carrez at ubuntu.com>  Tue, 21 Jul 2009 15:17:03 +0200
diff --cc debian/control
index c0de1fb,0000000..7456bfd
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,17 -1,0 +1,17 @@@
 +Source: dnsjava
 +Section: java
 +Priority: optional
 +Maintainer: Chris Grzegorczyk <grze at eucalyptus.com>
 +Uploaders: Graziano Obertelli <graziano at eucalyptus.com>, Kyo Lee <kyo.lee at eucalyptus.com>
 +Build-Depends-Indep: default-jdk, junit
- Build-Depends: ant, ant-optional, debhelper (>= 9), cdbs
- Standards-Version: 3.9.3
++Build-Depends: ant, ant-optional, debhelper (>= 9), cdbs, bnd
++Standards-Version: 3.9.4
 +Homepage: http://www.dnsjava.org
 +
 +Package: libdnsjava-java
 +Architecture: all
 +Depends: ${misc:Depends}
 +Description: Implementation of DNS in Java
 + dnsjava is an implementation of DNS in Java. It can be used for queries,
 + zone transfers, and dynamic updates. It includes a cache which can be
 + used by clients, and a minimal implementation of a server.
diff --cc debian/patches/build-bundle-default.patch
index 425e572,0000000..58386d5
mode 100644,000000..100644
--- a/debian/patches/build-bundle-default.patch
+++ b/debian/patches/build-bundle-default.patch
@@@ -1,15 -1,0 +1,13 @@@
 +Description: Patch enables building an OSGi bundle
 + Changes the default target of the ant build.xml.
 + The result jar file that will be used for the package will be an OSGi
 + bundle enabled jar.
 +Author: Damian Minkov <damencho at jitsi.org>
- Index: dnsjava-2.1.4/build.xml
- ===================================================================
- --- dnsjava-2.1.4.orig/build.xml	2013-01-31 17:06:28.000000000 +0200
- +++ dnsjava-2.1.4/build.xml	2013-01-31 17:07:12.000000000 +0200
++--- a/build.xml
+++++ b/build.xml
 +@@ -1,4 +1,4 @@
 +-<project name="dnsjava" default="all" basedir=".">
 ++<project name="dnsjava" default="bundle" basedir=".">
 +     <property name="build_dir" value="${basedir}"/>
 +     <property name="src_dir" value="${basedir}"/>
 +     <property name="doc_dir" value="${basedir}/doc"/>
diff --cc debian/patches/removes-bnd.jar-download.patch
index 0000000,0000000..af9511e
new file mode 100644
--- /dev/null
+++ b/debian/patches/removes-bnd.jar-download.patch
@@@ -1,0 -1,0 +1,16 @@@
++Index: dnsjava-2.1.5/build.xml
++===================================================================
++--- dnsjava-2.1.5.orig/build.xml	2013-04-11 00:05:09.000000000 +0300
+++++ dnsjava-2.1.5/build.xml	2013-07-23 11:32:39.000000000 +0300
++@@ -46,10 +46,8 @@
++     </target>
++ 	
++ 	<target name="bundle" description="Creates an OSGi bundle" depends="jar">
++-		<get src="http://www.aqute.biz/repo/biz/aQute/bnd/0.0.384/bnd-0.0.384.jar"
++-			dest="${build_dir}/bnd.jar"/>
++ 		<taskdef resource="aQute/bnd/ant/taskdef.properties"
++-			classpath="${build_dir}/bnd.jar"/> 
+++			classpath="/usr/share/java/bnd.jar"/> 
++ 		<echo file="${dist_dir}/dnsjava-${version}.bnd" append="false">
++ 			Bundle-Version: ${version}
++ 			Bundle-Name: dnsjava is an implementation of DNS in Java
diff --cc debian/patches/series
index 125c2fa,0000000..b5e4126
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,1 -1,0 +1,2 @@@
 +build-bundle-default.patch
++removes-bnd.jar-download.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/dnsjava.git



More information about the pkg-java-commits mailing list