[dbus-java] 03/17: wrap-and-sort -sa.
Markus Koschany
apo at moszumanska.debian.org
Wed Dec 20 12:51:17 UTC 2017
This is an automated email from the git hooks/post-receive script.
apo pushed a commit to branch master
in repository dbus-java.
commit e7a6f656bdc752d5173155214e788fbf0613f239
Author: Markus Koschany <apo at debian.org>
Date: Mon Dec 18 21:49:54 2017 +0100
wrap-and-sort -sa.
---
debian/control | 60 ++++++++++++++++++++++++-----------------
debian/copyright | 3 +--
debian/dbus-java-bin.install | 4 +--
debian/libdbus-java-doc.install | 8 +++---
debian/libdbus-java.install | 4 +--
5 files changed, 45 insertions(+), 34 deletions(-)
diff --git a/debian/control b/debian/control
index ad3d491..3834d9b 100644
--- a/debian/control
+++ b/debian/control
@@ -2,20 +2,22 @@ Source: dbus-java
Section: java
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Markus Koschany <apo at debian.org>
-Build-Depends: default-jdk,
- debhelper (>= 10),
- docbook-to-man,
- tex4ht,
- libmatthew-debug-java,
- libunixsocket-java (>= 0.6),
- texlive-latex-base,
- texlive-base-bin,
- texlive-latex-extra,
- texlive-latex-recommended,
- default-jdk-doc,
- gettext,
- javahelper (>= 0.42)
+Uploaders:
+ Markus Koschany <apo at debian.org>
+Build-Depends:
+ debhelper (>= 10),
+ default-jdk,
+ default-jdk-doc,
+ docbook-to-man,
+ gettext,
+ javahelper (>= 0.42),
+ libmatthew-debug-java,
+ libunixsocket-java (>= 0.6),
+ tex4ht,
+ texlive-base-bin,
+ texlive-latex-base,
+ texlive-latex-extra,
+ texlive-latex-recommended
Standards-Version: 3.9.6
Vcs-Git: git://anonscm.debian.org/pkg-java/dbus-java.git
Vcs-Browser: http://anonscm.debian.org/cgit/pkg-java/dbus-java.git
@@ -23,9 +25,13 @@ Homepage: http://www.freedesktop.org/wiki/Software/DBusBindings
Package: libdbus-java
Architecture: all
-Depends: ${java:Depends}, ${misc:Depends}
-Suggests: libdbus-java-doc
-Recommends: dbus-java-bin
+Depends:
+ ${java:Depends},
+ ${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
@@ -38,9 +44,14 @@ Description: simple interprocess messaging system (Java implementation)
Package: dbus-java-bin
Architecture: all
Section: utils
-Depends: ${misc:Depends}, default-jre-headless (>= 2:1.6) | java6-runtime-headless, libdbus-java (=${binary:Version})
-Conflicts: libdbus-java (<< 2.0)
-Replaces: libdbus-java (<< 2.0)
+Depends:
+ default-jre-headless (>= 2:1.6) | java6-runtime-headless,
+ libdbus-java (=${binary:Version}),
+ ${misc:Depends}
+Conflicts:
+ libdbus-java (<< 2.0)
+Replaces:
+ libdbus-java (<< 2.0)
Description: simple interprocess messaging system (Java Binaries)
D-Bus is a message bus, used for sending messages between applications.
Conceptually, it fits somewhere in between raw sockets and CORBA in
@@ -54,8 +65,11 @@ Description: simple interprocess messaging system (Java Binaries)
See the dbus description for more information about D-Bus in general.
Package: libdbus-java-doc
-Recommends: libdbus-java
-Depends: default-jdk-doc, ${misc:Depends}
+Recommends:
+ libdbus-java
+Depends:
+ default-jdk-doc,
+ ${misc:Depends}
Architecture: all
Section: doc
Description: simple interprocess messaging system (Java interface documentation)
@@ -66,5 +80,3 @@ Description: simple interprocess messaging system (Java interface documentation)
This package provides the documentation for the Java implementation of D-Bus.
.
See the dbus description for more information about D-Bus in general.
-
-
diff --git a/debian/copyright b/debian/copyright
index 3cca891..bb3a899 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -134,7 +134,7 @@ 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
+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.
@@ -169,4 +169,3 @@ 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.
-
diff --git a/debian/dbus-java-bin.install b/debian/dbus-java-bin.install
index 8a0c564..dc5672b 100644
--- a/debian/dbus-java-bin.install
+++ b/debian/dbus-java-bin.install
@@ -1,8 +1,8 @@
usr/bin
-usr/share/doc/libdbus-java/changelog usr/share/doc/dbus-java-bin/
usr/share/doc/libdbus-java/README usr/share/doc/dbus-java-bin/
+usr/share/doc/libdbus-java/changelog usr/share/doc/dbus-java-bin/
usr/share/java/dbus-bin-*.jar
-usr/share/java/dbus-viewer-*.jar
usr/share/java/dbus-bin.jar
+usr/share/java/dbus-viewer-*.jar
usr/share/java/dbus-viewer.jar
usr/share/man
diff --git a/debian/libdbus-java-doc.install b/debian/libdbus-java-doc.install
index 3b0b761..f64e5f5 100644
--- a/debian/libdbus-java-doc.install
+++ b/debian/libdbus-java-doc.install
@@ -1,7 +1,7 @@
-usr/share/doc/libdbus-java/changelog usr/share/doc/libdbus-java-doc/
usr/share/doc/libdbus-java/README usr/share/doc/libdbus-java-doc/
+usr/share/doc/libdbus-java/api
+usr/share/doc/libdbus-java/changelog usr/share/doc/libdbus-java-doc/
+usr/share/doc/libdbus-java/dbus-java
usr/share/doc/libdbus-java/dbus-java.dvi
-usr/share/doc/libdbus-java/dbus-java.ps
usr/share/doc/libdbus-java/dbus-java.pdf
-usr/share/doc/libdbus-java/dbus-java
-usr/share/doc/libdbus-java/api
+usr/share/doc/libdbus-java/dbus-java.ps
diff --git a/debian/libdbus-java.install b/debian/libdbus-java.install
index cfaa152..8f1d44b 100644
--- a/debian/libdbus-java.install
+++ b/debian/libdbus-java.install
@@ -1,4 +1,4 @@
-usr/share/doc/libdbus-java/changelog
usr/share/doc/libdbus-java/README
-usr/share/java/dbus.jar
+usr/share/doc/libdbus-java/changelog
usr/share/java/dbus-2.*.jar
+usr/share/java/dbus.jar
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/dbus-java.git
More information about the pkg-java-commits
mailing list