[SCM] mac-widgets packaging branch, master, updated. upstream/0.9.5+svn369-dfsg1-4-g89607c6

[Gilles Filippini]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "mac-widgets packaging".

The branch, master has been updated
       via  89607c6a1cb1ce70a2a376aa09f6f01527b266d9 (commit)
      from  fb2b3fa24e090fa38ed6d8843da9e6a3c3ad7018 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 89607c6a1cb1ce70a2a376aa09f6f01527b266d9
Author: Gilles Filippini <pini at debian.org>
Date:   Sat Mar 26 19:28:47 2011 +0100

    Build and lintian clean

-----------------------------------------------------------------------

Summary of changes:
 debian/README.source               |    4 ++++
 debian/changelog                   |    4 ++--
 debian/control                     |    2 +-
 debian/libmac-widgets-doc.doc-base |    9 +++++++++
 debian/libmac-widgets-doc.install  |    1 +
 debian/orig-tar.exclude            |    1 +
 debian/orig-tar.sh                 |   18 ++++++++++++++++++
 debian/rules                       |    9 ++++++++-
 8 files changed, 44 insertions(+), 4 deletions(-)

diff --git a/debian/README.source b/debian/README.source
index 3b92b58..cc0b086 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -8,6 +8,10 @@ There is no source release from the Mac Widgets project. Hence the upstream
 source tarball is fetched from upstream's SVN repository at:
  http://macwidgets.googlecode.com/svn/trunk
 
+Then, files to exclude to be dfsg compliant are handled using
+debian/orig-tar.sh the same way uscan would proceed. Excluded paths are listed
+into debian/orig-tar.exclude.
+
 The SVN revision of the current source tarball is reported either into the
 upstream version or as a debian/changelog entry.
 
diff --git a/debian/changelog b/debian/changelog
index 86c8d92..ca7295b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,7 @@
-mac-widgets (0.9.5+svn369-1) UNRELEASED; urgency=low
+mac-widgets (0.9.5+svn369-dfsg1-1) UNRELEASED; urgency=low
 
   * Initial release. (Closes: #619327)
   * Starting from svn369 because this is the release used for building
     Sikuli X 1.0~rc2
 
- -- Gilles Filippini <pini at debian.org>  Thu, 24 Mar 2011 21:44:15 +0100
+ -- Gilles Filippini <pini at debian.org>  Fri, 25 Mar 2011 14:15:03 +0100
diff --git a/debian/control b/debian/control
index cc3ef8b..b748de1 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: extra
 Maintainer: Debian Java maintainers <pkg-java-maintainers at lists.alioth.org>
 Uploaders: Gilles Filippini <pini at debian.org>
 Build-Depends: debhelper (>= 7.0.50~), javahelper, default-jdk, libjgoodies-forms-java,
- libjgoodies-forms-java-doc
+ default-jdk-doc, libjgoodies-forms-java-doc
 Standards-Version: 3.9.1
 Homepage: http://code.google.com/p/macwidgets/
 Vcs-Git: git://git.debian.org/pkg-java/mac-widgets.git
diff --git a/debian/libmac-widgets-doc.doc-base b/debian/libmac-widgets-doc.doc-base
new file mode 100644
index 0000000..4c7bab7
--- /dev/null
+++ b/debian/libmac-widgets-doc.doc-base
@@ -0,0 +1,9 @@
+Document: libmac-widgets-java
+Title: Programmer API for Mac Widgets
+Author: Kenneth Orr <kenneth.orr at gmail.com>
+Abstract: Javadocs for Mac Widgets, a collection of Mac style widgets
+Section: Programming/Java
+
+Format: HTML
+Index: /usr/share/doc/libmac-widgets-java/api/index.html
+Files: /usr/share/doc/libmac-widgets-java/api/*.html
diff --git a/debian/libmac-widgets-doc.install b/debian/libmac-widgets-doc.install
new file mode 100644
index 0000000..6dee378
--- /dev/null
+++ b/debian/libmac-widgets-doc.install
@@ -0,0 +1 @@
+debian/_jh_build.javadoc/api usr/share/doc/libmac-widgets-java
diff --git a/debian/orig-tar.exclude b/debian/orig-tar.exclude
new file mode 100644
index 0000000..d392f0e
--- /dev/null
+++ b/debian/orig-tar.exclude
@@ -0,0 +1 @@
+*.jar
diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh
new file mode 100755
index 0000000..f824daf
--- /dev/null
+++ b/debian/orig-tar.sh
@@ -0,0 +1,18 @@
+#!/bin/sh -e
+
+# called by uscan with '--upstream-version' <version> <file>
+SOURCE_NAME=mac-widgets
+VERSION=$2
+DEBIAN_VERSION=$VERSION-dfsg1
+UPSTREAM_SOURCE_DIR=${SOURCE_NAME}-${VERSION}
+DEBIAN_SOURCE_DIR=${SOURCE_NAME}-$DEBIAN_VERSION
+TAR=${USCAN_DESTDIR:-.}/${SOURCE_NAME}_$DEBIAN_VERSION.orig.tar.bz2
+
+# clean up the upstream tarball
+tar xf $3
+# rename upstream source dir
+mv ${UPSTREAM_SOURCE_DIR} ${DEBIAN_SOURCE_DIR}
+# Remove excluded files
+tar -c -j -X debian/orig-tar.exclude -f $TAR ${DEBIAN_SOURCE_DIR}/
+rm -rf ${DEBIAN_SOURCE_DIR} $3
+echo "${SOURCE_NAME}: Applied DFSG removals and set up tarball to `basename ${TAR}`"
diff --git a/debian/rules b/debian/rules
index d7d5420..64bd8d1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,6 +12,13 @@ export DH_OPTIONS
 	dh $@ --with javahelper
 
 override_jh_build:
+	ln -s source/com com
+	ln -s $(CURDIR)/demo/com/explodingpixels/macwidgets/icons com/explodingpixels/macwidgets/icons
 	JAVA_HOME=/usr/lib/jvm/default-java \
 		CLASSPATH=/usr/share/java/forms.jar \
-		jh_build mac_widgets.jar source
+		JH_JAR_EXTRA="com/explodingpixels/macwidgets/images com/explodingpixels/widgets/images com/explodingpixels/macwidgets/icons" \
+		jh_build mac_widgets.jar source demo
+
+override_dh_auto_clean:
+	dh_auto_clean
+	rm -f mac_widgets.jar com/explodingpixels/macwidgets/icons com


hooks/post-receive
-- 
mac-widgets packaging