[Pkg-fedora-ds-maintainers] 389-ds-console: Changes to 'debian-unstable'

Thu Jun 28 07:49:20 UTC 2012

debian/389-ds-console.lintian-overrides |    1 +
 debian/changelog                        |    2 +-
 debian/control                          |   15 ++++++++++++++-
 debian/copyright                        |   17 +++--------------
 debian/rules                            |    8 ++++----
 debian/watch                            |    2 +-
 6 files changed, 24 insertions(+), 21 deletions(-)

New commits:
commit 35a4cebbfe076bf092530ef2e7e4c0e5d1933050
Author: Timo Aaltonen <tjaalton at ubuntu.com>
Date:   Thu Jun 28 10:48:20 2012 +0300

    fix the watch url

diff --git a/debian/watch b/debian/watch
index 39259c9..7ece425 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,3 @@
 version=3
-http://directory.fedoraproject.org/sources/389-ds-console-(.*)\.tar\.bz2
+http://directory.fedoraproject.org/wiki/Source .*/389-ds-console-(.*)\.tar\.bz2
 

commit c4eb5e303578b9e503dc75834d78071ac6094ca2
Author: Timo Aaltonen <tjaalton at ubuntu.com>
Date:   Thu Mar 15 20:01:15 2012 +0200

    bump standards-version, no changes

diff --git a/debian/control b/debian/control
index bbc4413..1308118 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Build-Depends: debhelper (>= 8.0.0),
  ant,
  libldap-java,
  libidm-console-framework-java, 
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3
 Homepage: http://directory.fedoraproject.org
 Vcs-Git: git://git.debian.org/git/pkg-fedora-ds/389-ds-console.git
 Vcs-Browser: http://git.debian.org/?p=pkg-fedora-ds/389-ds-console.git;a=summary

commit 80c4fa2f01a6319329382137a28415cdc6292d29
Author: Timo Aaltonen <tjaalton at ubuntu.com>
Date:   Thu Mar 15 19:57:10 2012 +0200

    fill ITP bugnum

diff --git a/debian/changelog b/debian/changelog
index eb8b2e7..150fffd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,5 @@
 389-ds-console (1.2.6-1) UNRELEASED; urgency=low
 
-  * Initial release (Closes: #nnnn)
+  * Initial release (Closes: #664119)
 
  -- Timo Aaltonen <tjaalton at ubuntu.com>  Wed, 12 Oct 2011 01:05:43 +0300

commit 2296b3e0bf0edf4d1ea209f4906cfccaa29b7ae6
Author: Timo Aaltonen <tjaalton at ubuntu.com>
Date:   Thu Mar 15 19:56:47 2012 +0200

    fix -doc package section

diff --git a/debian/control b/debian/control
index 8e0eb61..bbc4413 100644
--- a/debian/control
+++ b/debian/control
@@ -26,6 +26,7 @@ Description: 389 Directory Server Management Console
 
 Package: 389-ds-console-doc
 Architecture: all
+Section: doc
 Depends: ${misc:Depends},
 Description: 389 Directory Server Management Console -- documentation
  A Java based remote management console used for managing 389

commit 845bc38e06684104b03ec341cf69ebf984742fad
Author: Timo Aaltonen <tjaalton at ubuntu.com>
Date:   Thu Mar 15 19:30:56 2012 +0200

    add lintian overrides

diff --git a/debian/389-ds-console.lintian-overrides b/debian/389-ds-console.lintian-overrides
new file mode 100644
index 0000000..abb3924
--- /dev/null
+++ b/debian/389-ds-console.lintian-overrides
@@ -0,0 +1 @@
+codeless-jar usr/share/dirsrv/html/java/389-ds-*_en.jar

commit 3dcfe45b89030173c1efe9793eaeaaf6da5d2113
Author: Timo Aaltonen <tjaalton at ubuntu.com>
Date:   Thu Mar 15 19:29:19 2012 +0200

    fix copyright

diff --git a/debian/copyright b/debian/copyright
index 9960670..530500f 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -9,19 +9,8 @@ License: GPL-2
 
 Files: debian/*
 Copyright: 2011 Timo Aaltonen <tjaalton at ubuntu.com>
-License: GPL-2+
- This package is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
- .
- This package is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
- .
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>
- .
+License: GPL-2
+
+License: GPL-2
  On Debian systems, the complete text of the GNU General
  Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".

commit 031329bde5bc1a2a824051597baca95c7fb6cbcb
Author: Timo Aaltonen <tjaalton at ubuntu.com>
Date:   Thu Mar 15 19:27:40 2012 +0200

    add java depends

diff --git a/debian/control b/debian/control
index bfeeecf..8e0eb61 100644
--- a/debian/control
+++ b/debian/control
@@ -18,6 +18,7 @@ Package: 389-ds-console
 Architecture: all
 Depends: ${misc:Depends},
  389-admin,
+ openjdk-6-jre | java2-runtime,
 Recommends: 389-ds-console-doc
 Description: 389 Directory Server Management Console
  A Java based remote management console used for managing 389

commit 4232a9ab79fff47cae63e87e1b842d926bb9f453
Author: Timo Aaltonen <tjaalton at ubuntu.com>
Date:   Thu Mar 15 19:27:06 2012 +0200

    split -doc

diff --git a/debian/control b/debian/control
index 2390b2b..bfeeecf 100644
--- a/debian/control
+++ b/debian/control
@@ -18,6 +18,16 @@ Package: 389-ds-console
 Architecture: all
 Depends: ${misc:Depends},
  389-admin,
+Recommends: 389-ds-console-doc
 Description: 389 Directory Server Management Console
  A Java based remote management console used for managing 389
  Directory Server.
+
+Package: 389-ds-console-doc
+Architecture: all
+Depends: ${misc:Depends},
+Description: 389 Directory Server Management Console -- documentation
+ A Java based remote management console used for managing 389
+ Directory Server.
+ .
+ This package includes the html documentation for 389-ds-console.
diff --git a/debian/rules b/debian/rules
index ffd5878..c40841c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -30,10 +30,10 @@ override_dh_auto_install:
 	dh_link usr/share/dirsrv/html/java/$(PKGSHORT)-$(UPSTREAM_VERSION)_$(CONSOLELANG).jar \
 		usr/share/dirsrv/html/java/$(PKGSHORT)_$(CONSOLELANG).jar
 
-	mkdir -p $(CURDIR)/debian/$(PKG)/usr/share/dirsrv/manual/en/slapd/help
-	install -m 644 help/en/*.html $(CURDIR)/debian/$(PKG)/usr/share/dirsrv/manual/en/slapd
-	install -m 644 help/en/tokens.map $(CURDIR)/debian/$(PKG)/usr/share/dirsrv/manual/en/slapd
-	install -m 644 help/en/help/*.html $(CURDIR)/debian/$(PKG)/usr/share/dirsrv/manual/en/slapd/help
+	mkdir -p $(CURDIR)/debian/$(PKG)-doc/usr/share/dirsrv/manual/en/slapd/help
+	install -m 644 help/en/*.html $(CURDIR)/debian/$(PKG)-doc/usr/share/dirsrv/manual/en/slapd
+	install -m 644 help/en/tokens.map $(CURDIR)/debian/$(PKG)-doc/usr/share/dirsrv/manual/en/slapd
+	install -m 644 help/en/help/*.html $(CURDIR)/debian/$(PKG)-doc/usr/share/dirsrv/manual/en/slapd/help
 
 %:
 	dh $@ --with quilt

commit 0783a90f3cd0fd2ba17fb677cf8de11a7c051c96
Author: Timo Aaltonen <tjaalton at ubuntu.com>
Date:   Thu Mar 15 19:18:33 2012 +0200

    add myself as uploader

diff --git a/debian/control b/debian/control
index 3b52e66..2390b2b 100644
--- a/debian/control
+++ b/debian/control
@@ -2,6 +2,7 @@ Source: 389-ds-console
 Section: java
 Priority: extra
 Maintainer: Debian 389ds Team <pkg-fedora-ds-maintainers at lists.alioth.debian.org>
+Uploaders: Timo Aaltonen <tjaalton at ubuntu.com>
 Build-Depends: debhelper (>= 8.0.0),
  default-jdk,
  quilt,

