[pkg-java] r11336 - in trunk/libtablelayout-java: . debian debian/patches

[Torsten Werner]

Author: twerner
Date: 2010-01-09 20:51:59 +0000 (Sat, 09 Jan 2010)
New Revision: 11336

Added:
   trunk/libtablelayout-java/debian/patches/series
Modified:
   trunk/libtablelayout-java/build.properties
   trunk/libtablelayout-java/build.xml
   trunk/libtablelayout-java/debian/orig-tar.sh
   trunk/libtablelayout-java/debian/patches/0001-change-package-namespace.patch
Log:
fix the build process for this crappy package


Modified: trunk/libtablelayout-java/build.properties
===================================================================
--- trunk/libtablelayout-java/build.properties	2010-01-09 20:21:04 UTC (rev 11335)
+++ trunk/libtablelayout-java/build.properties	2010-01-09 20:51:59 UTC (rev 11336)
@@ -1,4 +1,4 @@
 class.dir=build
 doc.dir=doc
-source.dir=.
+source.dir=src
 jar.name=tablelayout.jar

Modified: trunk/libtablelayout-java/build.xml
===================================================================
--- trunk/libtablelayout-java/build.xml	2010-01-09 20:21:04 UTC (rev 11335)
+++ trunk/libtablelayout-java/build.xml	2010-01-09 20:51:59 UTC (rev 11336)
@@ -16,7 +16,7 @@
 
   <target name="javadoc" description="Creates Javadoc documentation">
     <mkdir dir="${doc.dir}"/>
-    <javadoc packagenames="info.clearthought.layout.*"
+    <javadoc packagenames="org.debian.tablelayout.*"
       sourcepath="${source.dir}" destdir="${doc.dir}"/>
   </target>
 

Modified: trunk/libtablelayout-java/debian/orig-tar.sh
===================================================================
--- trunk/libtablelayout-java/debian/orig-tar.sh	2010-01-09 20:21:04 UTC (rev 11335)
+++ trunk/libtablelayout-java/debian/orig-tar.sh	2010-01-09 20:51:59 UTC (rev 11336)
@@ -6,8 +6,10 @@
 TAR=../libtablelayout-java_$2.orig.tar.gz
 
 # clean up the upstream tarball
-mkdir $DIR
+mkdir -p $DIR/src/org/debian/tablelayout
 (cd $DIR && jar xf ../$3)
+mv $DIR/info/clearthought/layout/* $DIR/src/org/debian/tablelayout/
+rm -rf $DIR/info/
 tar -c -z -f $TAR $DIR
 rm -rf $DIR
 rm -rf $3

Modified: trunk/libtablelayout-java/debian/patches/0001-change-package-namespace.patch
===================================================================
--- trunk/libtablelayout-java/debian/patches/0001-change-package-namespace.patch	2010-01-09 20:21:04 UTC (rev 11335)
+++ trunk/libtablelayout-java/debian/patches/0001-change-package-namespace.patch	2010-01-09 20:51:59 UTC (rev 11336)
@@ -4,16 +4,16 @@
 Subject: [PATCH] change package namespace
 
 ---
- info/clearthought/layout/SingleFiledLayout.java    |    2 +-
- info/clearthought/layout/TableLayout.java          |    4 ++--
- info/clearthought/layout/TableLayoutConstants.java |    2 +-
- .../layout/TableLayoutConstraints.java             |    2 +-
+ src/org/debian/tablelayout/SingleFiledLayout.java    |    2 +-
+ src/org/debian/tablelayout/TableLayout.java          |    4 ++--
+ src/org/debian/tablelayout/TableLayoutConstants.java |    2 +-
+ .../tablelayout/TableLayoutConstraints.java          |    2 +-
  4 files changed, 5 insertions(+), 5 deletions(-)
 
-diff --git a/info/clearthought/layout/SingleFiledLayout.java b/info/clearthought/layout/SingleFiledLayout.java
+diff --git a/src/org/debian/tablelayout/SingleFiledLayout.java b/src/org/debian/tablelayout/SingleFiledLayout.java
 index 9859446..0a680eb 100644
---- a/info/clearthought/layout/SingleFiledLayout.java
-+++ b/info/clearthought/layout/SingleFiledLayout.java
+--- a/src/org/debian/tablelayout/SingleFiledLayout.java
++++ b/src/org/debian/tablelayout/SingleFiledLayout.java
 @@ -114,7 +114,7 @@
   * ====================================================================
   */
@@ -23,10 +23,10 @@
  
  
  
-diff --git a/info/clearthought/layout/TableLayout.java b/info/clearthought/layout/TableLayout.java
+diff --git a/src/org/debian/tablelayout/TableLayout.java b/src/org/debian/tablelayout/TableLayout.java
 index 4f5dbed..e19f8eb 100644
---- a/info/clearthought/layout/TableLayout.java
-+++ b/info/clearthought/layout/TableLayout.java
+--- a/src/org/debian/tablelayout/TableLayout.java
++++ b/src/org/debian/tablelayout/TableLayout.java
 @@ -114,7 +114,7 @@
   * ====================================================================
   */
@@ -45,10 +45,10 @@
  {
  
  
-diff --git a/info/clearthought/layout/TableLayoutConstants.java b/info/clearthought/layout/TableLayoutConstants.java
+diff --git a/src/org/debian/tablelayout/TableLayoutConstants.java b/src/org/debian/tablelayout/TableLayoutConstants.java
 index bea9f8a..d6e1f79 100644
---- a/info/clearthought/layout/TableLayoutConstants.java
-+++ b/info/clearthought/layout/TableLayoutConstants.java
+--- a/src/org/debian/tablelayout/TableLayoutConstants.java
++++ b/src/org/debian/tablelayout/TableLayoutConstants.java
 @@ -114,7 +114,7 @@
   * ====================================================================
   */
@@ -58,10 +58,10 @@
  
  
  
-diff --git a/info/clearthought/layout/TableLayoutConstraints.java b/info/clearthought/layout/TableLayoutConstraints.java
+diff --git a/src/org/debian/tablelayout/TableLayoutConstraints.java b/src/org/debian/tablelayout/TableLayoutConstraints.java
 index 4b43ddb..951b82f 100644
---- a/info/clearthought/layout/TableLayoutConstraints.java
-+++ b/info/clearthought/layout/TableLayoutConstraints.java
+--- a/src/org/debian/tablelayout/TableLayoutConstraints.java
++++ b/src/org/debian/tablelayout/TableLayoutConstraints.java
 @@ -114,7 +114,7 @@
   * ====================================================================
   */

Added: trunk/libtablelayout-java/debian/patches/series
===================================================================
--- trunk/libtablelayout-java/debian/patches/series	                        (rev 0)
+++ trunk/libtablelayout-java/debian/patches/series	2010-01-09 20:51:59 UTC (rev 11336)
@@ -0,0 +1 @@
+0001-change-package-namespace.patch