[libcommons-net-java] 23/31: Reuse the original libcommons-net-java package for the new releases

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository libcommons-net-java.

commit 2affeab413b78ef9e29d10acdd6375c2191aae51
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue Dec 16 17:32:13 2014 +0100

    Reuse the original libcommons-net-java package for the new releases
---
 debian/README.Debian                                     |  2 +-
 debian/changelog                                         |  3 ++-
 debian/control                                           | 16 ++++++++--------
 ...ava-doc.doc-base => libcommons-net-java-doc.doc-base} |  6 +++---
 debian/libcommons-net-java-doc.install                   |  1 +
 ...ibcommons-net2-java.poms => libcommons-net-java.poms} |  0
 debian/libcommons-net2-java-doc.install                  |  1 -
 debian/orig-tar.sh                                       |  2 +-
 debian/rules                                             |  2 +-
 9 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/debian/README.Debian b/debian/README.Debian
index 6faa180..5513c93 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -1,4 +1,4 @@
-libcommons-net2-java for Debian
+libcommons-net-java for Debian
 ------------------------------
 
 Commons Net has switch its build process to Maven, but I'm not using Maven 
diff --git a/debian/changelog b/debian/changelog
index 3be42c6..ce7cc28 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
-libcommons-net2-java (2.2-3) UNRELEASED; urgency=medium
+libcommons-net-java (2.2-3) UNRELEASED; urgency=medium
 
+  * Reuse the original libcommons-net-java package for the new releases
   * debian/control:
     - Improved the package description
     - Standards-Version updated to 3.9.5 (no changes)
diff --git a/debian/control b/debian/control
index cdba8a6..ef6561d 100644
--- a/debian/control
+++ b/debian/control
@@ -1,4 +1,4 @@
-Source: libcommons-net2-java
+Source: libcommons-net-java
 Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
@@ -6,14 +6,14 @@ Uploaders: Ludovic Claude <ludovic.claude at laposte.net>, Emmanuel Bourg <ebourg at a
 Build-Depends: debhelper (>= 9), cdbs, default-jdk
 Build-Depends-Indep: ant, ant-optional, maven-ant-helper, maven-repo-helper, default-jdk-doc, junit
 Standards-Version: 3.9.5
-Vcs-Git: git://anonscm.debian.org/pkg-java/libcommons-net2-java.git
-Vcs-Browser: http://anonscm.debian.org/cgit/pkg-java/libcommons-net2-java.git
+Vcs-Git: git://anonscm.debian.org/pkg-java/libcommons-net-java.git
+Vcs-Browser: http://anonscm.debian.org/cgit/pkg-java/libcommons-net-java.git
 Homepage: http://commons.apache.org/net/
 
-Package: libcommons-net2-java
+Package: libcommons-net-java
 Architecture: all
 Depends: ${misc:Depends}
-Suggests: libcommons-net2-java-doc
+Suggests: libcommons-net-java-doc
 Description: Apache Commons Net - Java client API for basic Internet protocols
  The Apache Commons Net library implements the client side of many basic
  Internet protocols. The purpose of the library is to provide fundamental
@@ -42,12 +42,12 @@ Description: Apache Commons Net - Java client API for basic Internet protocols
   * Discard
   * NTP/SNTP
 
-Package: libcommons-net2-java-doc
+Package: libcommons-net-java-doc
 Section: doc
 Architecture: all
 Depends: ${misc:Depends}
 Recommends: default-jdk-doc
-Suggests: libcommons-net2-java
+Suggests: libcommons-net-java
 Description: Apache Commons Net (API documentation)
  The Apache Commons Net library implements the client side of many basic
  Internet protocols. The purpose of the library is to provide fundamental
@@ -59,4 +59,4 @@ Description: Apache Commons Net (API documentation)
  his own custom implementations (e.g, the TFTP packet classes and the TFTP
  packet send and receive methods are exposed).
  .
- This package contains the API documentation for libcommons-net2-java.
+ This package contains the API documentation for libcommons-net-java.
diff --git a/debian/libcommons-net2-java-doc.doc-base b/debian/libcommons-net-java-doc.doc-base
similarity index 59%
rename from debian/libcommons-net2-java-doc.doc-base
rename to debian/libcommons-net-java-doc.doc-base
index 8ded2e3..c83c67b 100644
--- a/debian/libcommons-net2-java-doc.doc-base
+++ b/debian/libcommons-net-java-doc.doc-base
@@ -1,4 +1,4 @@
-Document: libcommons-net2-java
+Document: libcommons-net-java
 Title: Programmer API for Commons Net
 Author: Apache Commons Net developers
 Abstract: Jakarta Commons Net implements the client side of many basic
@@ -6,5 +6,5 @@ Abstract: Jakarta Commons Net implements the client side of many basic
 Section: Programming
 
 Format: HTML
-Index: /usr/share/doc/libcommons-net2-java/api/index.html
-Files: /usr/share/doc/libcommons-net2-java/api/*
+Index: /usr/share/doc/libcommons-net-java/api/index.html
+Files: /usr/share/doc/libcommons-net-java/api/*
diff --git a/debian/libcommons-net-java-doc.install b/debian/libcommons-net-java-doc.install
new file mode 100644
index 0000000..83dc6d8
--- /dev/null
+++ b/debian/libcommons-net-java-doc.install
@@ -0,0 +1 @@
+build/docs/api usr/share/doc/libcommons-net-java/
diff --git a/debian/libcommons-net2-java.poms b/debian/libcommons-net-java.poms
similarity index 100%
rename from debian/libcommons-net2-java.poms
rename to debian/libcommons-net-java.poms
diff --git a/debian/libcommons-net2-java-doc.install b/debian/libcommons-net2-java-doc.install
deleted file mode 100644
index 328deba..0000000
--- a/debian/libcommons-net2-java-doc.install
+++ /dev/null
@@ -1 +0,0 @@
-build/docs/api usr/share/doc/libcommons-net2-java/
diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh
index 60c77a6..71561ff 100755
--- a/debian/orig-tar.sh
+++ b/debian/orig-tar.sh
@@ -3,7 +3,7 @@
 set -e
 
 VERSION=$2
-TAR=../libcommons-net2-java_$VERSION.orig.tar.xz
+TAR=../libcommons-net-java_$VERSION.orig.tar.xz
 DIR=commons-net-$VERSION
 TAG=$(echo "NET_$VERSION" | sed -re's,\.,_,')
 
diff --git a/debian/rules b/debian/rules
index 4653f3f..d7a2acf 100755
--- a/debian/rules
+++ b/debian/rules
@@ -23,7 +23,7 @@ makebuilddir/$(PACKAGE)::
 
 binary-post-install/$(PACKAGE)::
 	mh_installpoms -p$(PACKAGE)
-	mh_installjar -p$(PACKAGE) -l --usj-name=commons-net2 pom.xml build/commons-net-$(VERSION).jar
+	mh_installjar -p$(PACKAGE) -l --usj-name=commons-net pom.xml build/commons-net-$(VERSION).jar
 
 clean::
 	rm -fr debian/.mh/

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