[jakarta-ecs] 08/14: Removed the files related to log4j in the debian directory Changed the watch file to check ecs instead of log4j
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Thu Mar 6 22:42:55 UTC 2014
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository jakarta-ecs.
commit 059e30fb4bb6c1d3d4a512ce5f729be83c74e374
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Thu Mar 6 18:18:22 2014 +0100
Removed the files related to log4j in the debian directory
Changed the watch file to check ecs instead of log4j
---
debian/README.Debian | 70 ------------------------------------
debian/README.Debian-source | 8 -----
debian/changelog | 2 ++
debian/liblog4j1.2-java-doc.doc-base | 10 ------
debian/liblog4j1.2-java-doc.docs | 1 -
debian/orig-tar.sh | 6 ++--
debian/watch | 2 +-
7 files changed, 6 insertions(+), 93 deletions(-)
diff --git a/debian/README.Debian b/debian/README.Debian
deleted file mode 100644
index 2204c21..0000000
--- a/debian/README.Debian
+++ /dev/null
@@ -1,70 +0,0 @@
-jakarta-log4j1.2 for Debian
-------------------------
-
-This is the jakarta logging library version 1.2. If your package depends on it
-please use the /usr/share/java/log4j-1.2.jar symlink.
-
-Some information from the INSTALL documentation:
-
-You can now test your installation by first compiling the following
-simple program.
-
- import org.apache.log4j.Logger;
- import org.apache.log4j.BasicConfigurator;
-
- public class Hello {
-
- static Logger logger = Logger.getLogger(Hello.class);
-
- public
- static
- void main(String argv[]) {
- BasicConfigurator.configure();
- logger.debug("Hello world.");
- logger.info("What a beautiful day.");
- }
- }
-
- After compilation, try it out by issuing the command
-
- java Hello
-
- You should see log statements appearing on the console.
-
-Refer to the javadoc documentation and the user manual on how to
-include log statements in your own code.
-
-
-==================
-log4j dependencies
-==================
-
-Log4j is based on JDK 1.1 with the following additional requirements:
-
- ----------------------------
- Package org.apache.log4j.xml
- ----------------------------
-
- The DOMConfigurator is based on the DOM Level 1 API. The
- DOMConfigurator.configure(Element) method will work with any
- XML parser that will pass it a DOM tree.
-
- The DOMConfigurator.configure(String filename) method and its variants
- require a JAXP compatible XMLparser, for example the Apache Xerces
- parser. Compiling the DOMConfigurator requires the presence of a
- JAXP parser in the classpath.
-
- ------------
- SMTPAppender
- ------------
-
- The SMTPAppender relies on the JavaMail API. It has been tested with
- JavaMail API version 1.2. The JavaMail API requires the
- JavaBeans Activation Framework package. You can download the
- JavaMail API at:
-
- http://java.sun.com/products/javamail/
-
- or just apt-get install libgnumail-java in Debian :-)
-
- -- Benoit Joly <benoit at kaitain.dune.local>, Sat Apr 12 18:36:10 2003
diff --git a/debian/README.Debian-source b/debian/README.Debian-source
deleted file mode 100644
index 535d85f..0000000
--- a/debian/README.Debian-source
+++ /dev/null
@@ -1,8 +0,0 @@
-jakarta-log4j1.2
-----------------
-
-The package includes jars and a Windows binary DLL, which are not be
-included in the original tarball. The orig-tar.sh in this directory is
-used to recreate a clean tarball by removing the jar and DLL.
-
- -- Kumar Appaiah <akumar at ee.iitm.ac.in>, Wed, 26 Sep 2007 13:03:52 +0530
diff --git a/debian/changelog b/debian/changelog
index 142af49..97b0f77 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ jakarta-ecs (1.4.2-3) UNRELEASED; urgency=medium
* Team upload.
* Package adopted by the Java Team (Closes: #640778)
+ * Removed the files related to log4j in the debian directory
+ * Changed the watch file to check ecs instead of log4j
* Switch to source format 3.0 (quilt)
* debian/control:
- Removed the runtime dependency on the JRE
diff --git a/debian/liblog4j1.2-java-doc.doc-base b/debian/liblog4j1.2-java-doc.doc-base
deleted file mode 100644
index 890cd0b..0000000
--- a/debian/liblog4j1.2-java-doc.doc-base
+++ /dev/null
@@ -1,10 +0,0 @@
-Document: liblog4j1.2-java-doc
-Title: Documenation for log4j 1.2
-Author: The Apache log4j team
-Abstract: This is the documentation for log4j, a logging library
- for java. The documentation includes the javadoc API.
-Section: Programming
-
-Format: HTML
-Index: /usr/share/doc/liblog4j1.2-java-doc/docs/api/index.html
-Files: /usr/share/doc/liblog4j1.2-java-doc/docs/api/*.html
diff --git a/debian/liblog4j1.2-java-doc.docs b/debian/liblog4j1.2-java-doc.docs
deleted file mode 100644
index d8f8d46..0000000
--- a/debian/liblog4j1.2-java-doc.docs
+++ /dev/null
@@ -1 +0,0 @@
-docs
diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh
index dca9663..539f2bd 100644
--- a/debian/orig-tar.sh
+++ b/debian/orig-tar.sh
@@ -1,13 +1,13 @@
#!/bin/sh -e
# called by uscan with '--upstream-version' <version> <file>
-TAR=../apache-log4j-$2.tar.gz
-DIR=jakarta-log4j-$2.orig
+TAR=../jakarta-ecs_$2.tar.gz
+DIR=jakarta-ecs-$2.orig
# clean up the upstream tarball
mv $TAR $3
tar zxf $3
-mv apache-log4j-$2 $DIR
+mv jakarta-ecs-$2 $DIR
GZIP=--best tar czf $3 --exclude '*jar' --exclude 'site' --exclude '*dll' $DIR
rm -rf $TAR $DIR
diff --git a/debian/watch b/debian/watch
index 09cca86..72c4f91 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,2 @@
version=3
-http://www.apache.org/dist/logging/log4j/(1.2.[\d]+)/apache-log4j-(1.2.[\d]+).tar.gz debian debian/orig-tar.sh
+http://archive.apache.org/dist/jakarta/ecs/source/ecs-([\d\.]+)-src.tar.gz debian debian/orig-tar.sh
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jakarta-ecs.git
More information about the pkg-java-commits
mailing list