[Pkg-utopia-commits] r1638 - in /packages/unstable/dbus-java/debian: changelog control copyright rules
mjj29-guest at users.alioth.debian.org
mjj29-guest at users.alioth.debian.org
Sun Aug 5 15:53:11 UTC 2007
Author: mjj29-guest
Date: Sun Aug 5 15:53:11 2007
New Revision: 1638
URL: http://svn.debian.org/wsvn/pkg-utopia/?sc=1&rev=1638
Log:
+ * Upstream bug fix release (Closes: #422974)
+ * Have libdbus-java recommend dbus-java-bin to ensure upgraders don't lose
+ functionality
+ * Only need to depend on -jre not -jdk as well.
+ * Typographic changes to control and rules
+ * Call debhelper with -i
+ * Build docs under build
+ * Fix the licence statement
+ * Put a minimum version on the dbus-java-bin - libdbus-java dependency.
+ * No need to rm -rf debian/tmp, removed
Modified:
packages/unstable/dbus-java/debian/changelog
packages/unstable/dbus-java/debian/control
packages/unstable/dbus-java/debian/copyright
packages/unstable/dbus-java/debian/rules
Modified: packages/unstable/dbus-java/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/dbus-java/debian/changelog?rev=1638&op=diff
==============================================================================
--- packages/unstable/dbus-java/debian/changelog (original)
+++ packages/unstable/dbus-java/debian/changelog Sun Aug 5 15:53:11 2007
@@ -1,12 +1,21 @@
dbus-java (2.3.1-1) unstable; urgency=low
- * Upstream bug fix release
+ * Upstream bug fix release (Closes: #422974)
* Clean up control, add misc:Depends entries
* Wrap long lines in rules and control
* Don't ignore make clean errors
* Call test suite in build
+ * Have libdbus-java recommend dbus-java-bin to ensure upgraders don't lose
+ functionality
+ * Only need to depend on -jre not -jdk as well.
+ * Typographic changes to control and rules
+ * Call debhelper with -i
+ * Build docs under build
+ * Fix the licence statement
+ * Put a minimum version on the dbus-java-bin - libdbus-java dependency.
+ * No need to rm -rf debian/tmp, removed
- -- Matthew Johnson <debian at matthew.ath.cx> Thu, 26 Jul 2007 16:32:38 +0100
+ -- Matthew Johnson <debian at matthew.ath.cx> Sun, 5 Aug 2007 16:36:26 +0100
dbus-java (2.3-1) unstable; urgency=low
Modified: packages/unstable/dbus-java/debian/control
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/dbus-java/debian/control?rev=1638&op=diff
==============================================================================
--- packages/unstable/dbus-java/debian/control (original)
+++ packages/unstable/dbus-java/debian/control Sun Aug 5 15:53:11 2007
@@ -2,13 +2,13 @@
Section: contrib/devel
Priority: optional
Maintainer: Matthew Johnson <debian at matthew.ath.cx>
-Build-Depends: sun-java5-jdk,
- debhelper (>= 5.0.0),
- docbook-to-man,
- tex4ht,
- libmatthew-debug-java,
- libunixsocket-java,
- texlive-latex-base,
+Build-Depends: sun-java5-jdk,
+ debhelper (>= 5.0.0),
+ docbook-to-man,
+ tex4ht,
+ libmatthew-debug-java,
+ libunixsocket-java,
+ texlive-latex-base,
texlive-base-bin,
texlive-latex-extra,
classpath-doc
@@ -21,6 +21,7 @@
libunixsocket-java,
${misc:Depends}
Suggests: libdbus-java-doc
+Recommends: dbus-java-bin
Description: simple interprocess messaging system (Java implementation)
D-Bus is a message bus, used for sending messages between applications.
Conceptually, it fits somewhere in between raw sockets and CORBA in
@@ -33,10 +34,10 @@
Package: dbus-java-bin
Architecture: all
Section: contrib/devel
-Depends: sun-java5-jre | sun-java5-jdk,
+Depends: sun-java5-jre,
libmatthew-debug-java,
- libunixsocket-java,
- libdbus-java,
+ libunixsocket-java,
+ libdbus-java (>= 2.0),
${misc:Depends}
Conflicts: libdbus-java (<< 2.0)
Replaces: libdbus-java (<< 2.0)
Modified: packages/unstable/dbus-java/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/dbus-java/debian/copyright?rev=1638&op=diff
==============================================================================
--- packages/unstable/dbus-java/debian/copyright (original)
+++ packages/unstable/dbus-java/debian/copyright Sun Aug 5 15:53:11 2007
@@ -6,209 +6,165 @@
Upstream Author: Matthew Johnson <dbus at matthew.ath.cx>
This package is dual-licensed under the Academic Free License, and the GPL
-version 2. For a description of the GPL, see /usr/share/common-licenses/GPL-2
+version 2. For a description of the GPL, see /usr/share/common-licenses/GPL-2
on your Debian system.
-The included viewer application is only licensed under the GPL
+The included viewer application is copyright Peter Cox <petercox at gawab.com> and
+is dual-licensed under the Academic Free License, and the GPL version 2.
The Academic Free License follows:
- The Academic Free License
- v. 2.0
+The Academic Free License
+v. 2.1
-This Academic Free License (the "License") applies to any original
-work of authorship (the "Original Work") whose owner (the "Licensor")
-has placed the following notice immediately following the copyright
-notice for the Original Work:
+This Academic Free License (the "License") applies to any original work of
+authorship (the "Original Work") whose owner (the "Licensor") has placed the
+following notice immediately following the copyright notice for the Original
+Work:
-Licensed under the Academic Free License version 2.0
+Licensed under the Academic Free License version 2.1
-1) Grant of Copyright License. Licensor hereby grants You a
-world-wide, royalty-free, non-exclusive, perpetual, sublicenseable
-license to do the following:
+1) Grant of Copyright License. Licensor hereby grants You a world-wide,
+royalty-free, non-exclusive, perpetual, sublicenseable license to do the
+following:
-a) to reproduce the Original Work in copies;
+a) to reproduce the Original Work in copies;
-b) to prepare derivative works ("Derivative Works") based upon the Original Work;
+b) to prepare derivative works ("Derivative Works") based upon the Original
+Work;
-c) to distribute copies of the Original Work and Derivative Works to the public;
+c) to distribute copies of the Original Work and Derivative Works to the
+public;
-d) to perform the Original Work publicly; and
+d) to perform the Original Work publicly; and
-e) to display the Original Work publicly.
+e) to display the Original Work publicly.
2) Grant of Patent License. Licensor hereby grants You a world-wide,
-royalty-free, non-exclusive, perpetual, sublicenseable license, under
-patent claims owned or controlled by the Licensor that are embodied in
-the Original Work as furnished by the Licensor, to make, use, sell and
-offer for sale the Original Work and Derivative Works.
+royalty-free, non-exclusive, perpetual, sublicenseable license, under patent
+claims owned or controlled by the Licensor that are embodied in the Original
+Work as furnished by the Licensor, to make, use, sell and offer for sale the
+Original Work and Derivative Works.
-3) Grant of Source Code License. The term "Source Code" means the
-preferred form of the Original Work for making modifications to it and
-all available documentation describing how to modify the Original
-Work. Licensor hereby agrees to provide a machine-readable copy of
-the Source Code of the Original Work along with each copy of the
-Original Work that Licensor distributes. Licensor reserves the right
-to satisfy this obligation by placing a machine-readable copy of the
-Source Code in an information repository reasonably calculated to
-permit inexpensive and convenient access by You for as long as
-Licensor continues to distribute the Original Work, and by publishing
-the address of that information repository in a notice immediately
-following the copyright notice that applies to the Original Work.
+3) Grant of Source Code License. The term "Source Code" means the preferred
+form of the Original Work for making modifications to it and all available
+documentation describing how to modify the Original Work. Licensor hereby
+agrees to provide a machine-readable copy of the Source Code of the Original
+Work along with each copy of the Original Work that Licensor distributes.
+Licensor reserves the right to satisfy this obligation by placing a
+machine-readable copy of the Source Code in an information repository
+reasonably calculated to permit inexpensive and convenient access by You for as
+long as Licensor continues to distribute the Original Work, and by publishing
+the address of that information repository in a notice immediately following
+the copyright notice that applies to the Original Work.
-4) Exclusions From License Grant. Neither the names of Licensor, nor
-the names of any contributors to the Original Work, nor any of their
-trademarks or service marks, may be used to endorse or promote
-products derived from this Original Work without express prior written
-permission of the Licensor. Nothing in this License shall be deemed
-to grant any rights to trademarks, copyrights, patents, trade secrets
-or any other intellectual property of Licensor except as expressly
-stated herein. No patent license is granted to make, use, sell or
-offer to sell embodiments of any patent claims other than the licensed
-claims defined in Section 2. No right is granted to the trademarks of
-Licensor even if such marks are included in the Original Work.
-Nothing in this License shall be interpreted to prohibit Licensor from
-licensing under different terms from this License any Original Work
-that Licensor otherwise would have a right to license.
+4) Exclusions From License Grant. Neither the names of Licensor, nor the names
+of any contributors to the Original Work, nor any of their trademarks or
+service marks, may be used to endorse or promote products derived from this
+Original Work without express prior written permission of the Licensor. Nothing
+in this License shall be deemed to grant any rights to trademarks, copyrights,
+patents, trade secrets or any other intellectual property of Licensor except as
+expressly stated herein. No patent license is granted to make, use, sell or
+offer to sell embodiments of any patent claims other than the licensed claims
+defined in Section 2. No right is granted to the trademarks of Licensor even if
+such marks are included in the Original Work. Nothing in this License shall be
+interpreted to prohibit Licensor from licensing under different terms from this
+License any Original Work that Licensor otherwise would have a right to
+license.
-5) This section intentionally omitted.
+5) This section intentionally omitted.
-6) Attribution Rights. You must retain, in the Source Code of any
-Derivative Works that You create, all copyright, patent or trademark
-notices from the Source Code of the Original Work, as well as any
-notices of licensing and any descriptive text identified therein as an
-"Attribution Notice." You must cause the Source Code for any
-Derivative Works that You create to carry a prominent Attribution
-Notice reasonably calculated to inform recipients that You have
+6) Attribution Rights. You must retain, in the Source Code of any Derivative
+Works that You create, all copyright, patent or trademark notices from the
+Source Code of the Original Work, as well as any notices of licensing and any
+descriptive text identified therein as an "Attribution Notice." You must cause
+the Source Code for any Derivative Works that You create to carry a prominent
+Attribution Notice reasonably calculated to inform recipients that You have
modified the Original Work.
-7) Warranty of Provenance and Disclaimer of Warranty. Licensor
-warrants that the copyright in and to the Original Work and the patent
-rights granted herein by Licensor are owned by the Licensor or are
-sublicensed to You under the terms of this License with the permission
-of the contributor(s) of those copyrights and patent rights. Except
-as expressly stated in the immediately proceeding sentence, the
-Original Work is provided under this License on an "AS IS" BASIS and
-WITHOUT WARRANTY, either express or implied, including, without
-limitation, the warranties of NON-INFRINGEMENT, MERCHANTABILITY or
-FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY
-OF THE ORIGINAL WORK IS WITH YOU. This DISCLAIMER OF WARRANTY
-constitutes an essential part of this License. No license to Original
-Work is granted hereunder except under this disclaimer.
+7) Warranty of Provenance and Disclaimer of Warranty. Licensor warrants that
+the copyright in and to the Original Work and the patent rights granted herein
+by Licensor are owned by the Licensor or are sublicensed to You under the terms
+of this License with the permission of the contributor(s) of those copyrights
+and patent rights. Except as expressly stated in the immediately proceeding
+sentence, the Original Work is provided under this License on an "AS IS" BASIS
+and WITHOUT WARRANTY, either express or implied, including, without limitation,
+the warranties of NON-INFRINGEMENT, MERCHANTABILITY or FITNESS FOR A PARTICULAR
+PURPOSE. THE ENTIRE RISK AS TO THE QUALITY OF THE ORIGINAL WORK IS WITH YOU.
+This DISCLAIMER OF WARRANTY constitutes an essential part of this License. No
+license to Original Work is granted hereunder except under this disclaimer.
-8) Limitation of Liability. Under no circumstances and under no legal
-theory, whether in tort (including negligence), contract, or
-otherwise, shall the Licensor be liable to any person for any direct,
-indirect, special, incidental, or consequential damages of any
-character arising as a result of this License or the use of the
-Original Work including, without limitation, damages for loss of
-goodwill, work stoppage, computer failure or malfunction, or any and
-all other commercial damages or losses. This limitation of liability
-shall not apply to liability for death or personal injury resulting
-from Licensor's negligence to the extent applicable law prohibits such
-limitation. Some jurisdictions do not allow the exclusion or
-limitation of incidental or consequential damages, so this exclusion
-and limitation may not apply to You.
+8) Limitation of Liability. Under no circumstances and under no legal theory,
+whether in tort (including negligence), contract, or otherwise, shall the
+Licensor be liable to any person for any direct, indirect, special, incidental,
+or consequential damages of any character arising as a result of this License
+or the use of the Original Work including, without limitation, damages for loss
+of goodwill, work stoppage, computer failure or malfunction, or any and all
+other commercial damages or losses. This limitation of liability shall not
+apply to liability for death or personal injury resulting from Licensor's
+negligence to the extent applicable law prohibits such limitation. Some
+jurisdictions do not allow the exclusion or limitation of incidental or
+consequential damages, so this exclusion and limitation may not apply to You.
-9) Acceptance and Termination. If You distribute copies of the
-Original Work or a Derivative Work, You must make a reasonable effort
-under the circumstances to obtain the express assent of recipients to
-the terms of this License. Nothing else but this License (or another
-written agreement between Licensor and You) grants You permission to
-create Derivative Works based upon the Original Work or to exercise
-any of the rights granted in Section 1 herein, and any attempt to do
-so except under the terms of this License (or another written
-agreement between Licensor and You) is expressly prohibited by
-U.S. copyright law, the equivalent laws of other countries, and by
-international treaty. Therefore, by exercising any of the rights
-granted to You in Section 1 herein, You indicate Your acceptance of
-this License and all of its terms and conditions.
+9) Acceptance and Termination. If You distribute copies of the Original Work or
+a Derivative Work, You must make a reasonable effort under the circumstances to
+obtain the express assent of recipients to the terms of this License. Nothing
+else but this License (or another written agreement between Licensor and You)
+grants You permission to create Derivative Works based upon the Original Work
+or to exercise any of the rights granted in Section 1 herein, and any attempt
+to do so except under the terms of this License (or another written agreement
+between Licensor and You) is expressly prohibited by U.S. copyright law, the
+equivalent laws of other countries, and by international treaty. Therefore, by
+exercising any of the rights granted to You in Section 1 herein, You indicate
+Your acceptance of this License and all of its terms and conditions.
-10) Termination for Patent Action. This License shall terminate
-automatically and You may no longer exercise any of the rights granted
-to You by this License as of the date You commence an action,
-including a cross-claim or counterclaim, for patent infringement (i)
-against Licensor with respect to a patent applicable to software or
-(ii) against any entity with respect to a patent applicable to the
-Original Work (but excluding combinations of the Original Work with
-other software or hardware).
+10) Termination for Patent Action. This License shall terminate automatically
+and You may no longer exercise any of the rights granted to You by this License
+as of the date You commence an action, including a cross-claim or counterclaim,
+against Licensor or any licensee alleging that the Original Work infringes a
+patent. This termination provision shall not apply for an action alleging
+patent infringement by combinations of the Original Work with other software or
+hardware.
-11) Jurisdiction, Venue and Governing Law. Any action or suit relating
-to this License may be brought only in the courts of a jurisdiction
-wherein the Licensor resides or in which Licensor conducts its primary
-business, and under the laws of that jurisdiction excluding its
-conflict-of-law provisions. The application of the United Nations
-Convention on Contracts for the International Sale of Goods is
-expressly excluded. Any use of the Original Work outside the scope of
-this License or after its termination shall be subject to the
-requirements and penalties of the U.S. Copyright Act, 17 U.S.C. \u00a4
-101 et seq., the equivalent laws of other countries, and international
-treaty. This section shall survive the termination of this License.
+11) Jurisdiction, Venue and Governing Law. Any action or suit relating to this
+License may be brought only in the courts of a jurisdiction wherein the
+Licensor resides or in which Licensor conducts its primary business, and under
+the laws of that jurisdiction excluding its conflict-of-law provisions. The
+application of the United Nations Convention on Contracts for the International
+Sale of Goods is expressly excluded. Any use of the Original Work outside the
+scope of this License or after its termination shall be subject to the
+requirements and penalties of the U.S. Copyright Act, 17 U.S.C. § 101 et seq.,
+the equivalent laws of other countries, and international treaty. This section
+shall survive the termination of this License.
-12) Attorneys Fees. In any action to enforce the terms of this License
-or seeking damages relating thereto, the prevailing party shall be
-entitled to recover its costs and expenses, including, without
-limitation, reasonable attorneys' fees and costs incurred in
-connection with such action, including any appeal of such action.
-This section shall survive the termination of this License.
+12) Attorneys Fees. In any action to enforce the terms of this License or
+seeking damages relating thereto, the prevailing party shall be entitled to
+recover its costs and expenses, including, without limitation, reasonable
+attorneys' fees and costs incurred in connection with such action, including
+any appeal of such action. This section shall survive the termination of this
+License.
-13) Miscellaneous. This License represents the complete agreement
-concerning the subject matter hereof. If any provision of this
-License is held to be unenforceable, such provision shall be reformed
-only to the extent necessary to make it enforceable.
+13) Miscellaneous. This License represents the complete agreement concerning
+the subject matter hereof. If any provision of this License is held to be
+unenforceable, such provision shall be reformed only to the extent necessary to
+make it enforceable.
-14) Definition of "You" in This License. "You" throughout this
-License, whether in upper or lower case, means an individual or a
-legal entity exercising rights under, and complying with all of the
-terms of, this License. For legal entities, "You" includes any entity
-that controls, is controlled by, or is under common control with you.
-For purposes of this definition, "control" means (i) the power, direct
-or indirect, to cause the direction or management of such entity,
-whether by contract or otherwise, or (ii) ownership of fifty percent
-(50%) or more of the outstanding shares, or (iii) beneficial ownership
-of such entity.
+14) Definition of "You" in This License. "You" throughout this License, whether
+in upper or lower case, means an individual or a legal entity exercising rights
+under, and complying with all of the terms of, this License. For legal
+entities, "You" includes any entity that controls, is controlled by, or is
+under common control with you. For purposes of this definition, "control" means
+(i) the power, direct or indirect, to cause the direction or management of such
+entity, whether by contract or otherwise, or (ii) ownership of fifty percent
+(50%) or more of the outstanding shares, or (iii) beneficial ownership of such
+entity.
-15) Right to Use. You may use the Original Work in all ways not
-otherwise restricted or conditioned by this License or by law, and
-Licensor promises not to interfere with or be responsible for such
-uses by You.
+15) Right to Use. You may use the Original Work in all ways not otherwise
+restricted or conditioned by this License or by law, and Licensor promises not
+to interfere with or be responsible for such uses by You.
-This license is Copyright (C) 2003 Lawrence E. Rosen. All rights
-reserved. Permission is hereby granted to copy and distribute this
-license without modification. This license may not be modified
-without the express written permission of its copyright owner.
+This license is Copyright (C) 2003-2004 Lawrence E. Rosen. All rights reserved.
+Permission is hereby granted to copy and distribute this license without
+modification. This license may not be modified without the express written
+permission of its copyright owner.
---
-END OF ACADEMIC FREE LICENSE. The following is intended to describe the essential
-differences between the Academic Free License (AFL) version 1.0 and other
-open source licenses:
-
-The Academic Free License is similar to the BSD, MIT, UoI/NCSA and Apache
-licenses in many respects but it is intended to solve a few problems with
-those licenses.
-
-* The AFL is written so as to make it clear what software is being
-licensed (by the inclusion of a statement following the copyright notice
-in the software). This way, the license functions better than a template
-license. The BSD, MIT and UoI/NCSA licenses apply to unidentified software.
-
-* The AFL contains a complete copyright grant to the software. The BSD
-and Apache licenses are vague and incomplete in that respect.
-
-* The AFL contains a complete patent grant to the software. The BSD, MIT,
-UoI/NCSA and Apache licenses rely on an implied patent license and contain
-no explicit patent grant.
-
-* The AFL makes it clear that no trademark rights are granted to the
-licensor's trademarks. The Apache license contains such a provision, but the
-BSD, MIT and UoI/NCSA licenses do not.
-
-* The AFL includes the warranty by the licensor that it either owns the
-copyright or that it is distributing the software under a license. None of
-the other licenses contain that warranty. All other warranties are disclaimed,
-as is the case for the other licenses.
-
-* The AFL is itself copyrighted (with the right granted to copy and distribute
-without modification). This ensures that the owner of the copyright to the
-license will control changes. The Apache license contains a copyright notice,
-but the BSD, MIT and UoI/NCSA licenses do not.
Modified: packages/unstable/dbus-java/debian/rules
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/dbus-java/debian/rules?rev=1638&op=diff
==============================================================================
--- packages/unstable/dbus-java/debian/rules (original)
+++ packages/unstable/dbus-java/debian/rules Sun Aug 5 15:53:11 2007
@@ -17,7 +17,7 @@
JAVA=/usr/lib/jvm/java-1.5.0-sun/bin/java \
JAR=/usr/lib/jvm/java-1.5.0-sun/bin/jar \
JAVADOC="/usr/lib/jvm/java-1.5.0-sun/bin/javadoc -link /usr/share/doc/classpath-doc/api" \
- all check
+ all doc check
touch $@
@@ -29,7 +29,6 @@
# Add here commands to clean up after the build process.
$(MAKE) clean
- rm -rf debian/tmp
dh_clean
install: build
@@ -43,22 +42,22 @@
install install-man install-doc
# These are installed by upstream and aren't needed on Debian
rm -f $(CURDIR)/debian/tmp/usr/share/doc/libdbus-java/COPYING \
- $(CURDIR)/debian/tmp/usr/share/doc/libdbus-java/AUTHORS \
- $(CURDIR)/debian/tmp/usr/share/doc/libdbus-java/INSTALL
+ $(CURDIR)/debian/tmp/usr/share/doc/libdbus-java/AUTHORS \
+ $(CURDIR)/debian/tmp/usr/share/doc/libdbus-java/INSTALL
# Build architecture-independent files here.
binary-indep: build install
dh_testdir
dh_testroot
- dh_installchangelogs
- dh_installdocs
- dh_install --sourcedir=debian/tmp
- dh_compress -X.pdf
- dh_fixperms
- dh_installdeb
- dh_gencontrol
- dh_md5sums
- dh_builddeb
+ dh_installchangelogs -i
+ dh_installdocs -i
+ dh_install -i --sourcedir=debian/tmp
+ dh_compress -i -X.pdf
+ dh_fixperms -i
+ dh_installdeb -i
+ dh_gencontrol -i
+ dh_md5sums -i
+ dh_builddeb -i
binary-arch:
More information about the Pkg-utopia-commits
mailing list