[gnome-split] 03/15: gnome-split: New upstream release + bug fixes.

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository gnome-split.

commit bcb4b3ae6457d493f542be1f0fb05ad3f4549004
Author: Guillaume Mazoyer <respawneral at gmail.com>
Date:   Sun Aug 7 17:56:17 2011 +0000

    gnome-split: New upstream release + bug fixes.
---
 debian/changelog                 |  9 +++++++++
 debian/control                   |  7 +++----
 debian/patches/02_makefile.patch | 18 ++++++++++++++++++
 debian/patches/02_manpage.patch  | 29 -----------------------------
 debian/patches/series            |  2 +-
 debian/rules                     |  4 +++-
 6 files changed, 34 insertions(+), 35 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 930080c..2ad947e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+gnome-split (1.1-1) unstable; urgency=low
+
+  * New upstream release.
+  * Build against java-gnome 4.1.1.
+  * debian/rules: Fix launcher script to use /usr/lib/jni.
+  * debian/patches/02_makefile.patch: Fix makefile rule for mime type.
+
+ -- Guillaume Mazoyer <respawneral at gmail.com>  Sun, 07 Aug 2011 18:26:09 +0200
+
 gnome-split (0.7-1) unstable; urgency=low
 
   * Initial release (Closes: #636253)
diff --git a/debian/control b/debian/control
index 655ce25..68c062c 100644
--- a/debian/control
+++ b/debian/control
@@ -3,11 +3,10 @@ Section: gnome
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Guillaume Mazoyer <respawneral at gmail.com>
-Build-Depends: autotools-dev,
-               debhelper (>= 7),
+Build-Depends: debhelper (>= 7.0.50~),
                default-jdk,
                libdbus-java,
-               libjava-gnome-java (>= 4.0.15)
+               libjava-gnome-java (>= 4.1.1)
 Standards-Version: 3.9.2
 Homepage: http://gnome-split.org/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/gnome-split/
@@ -16,7 +15,7 @@ Package: gnome-split
 Architecture: all
 Depends: default-jre | java6-runtime,
          libdbus-java,
-         libjava-gnome-java (>= 4.0.15),
+         libjava-gnome-java (>= 4.1.1),
          ${misc:Depends}
 Description: GNOME Split - File splitter for GNOME desktop
  Tool that allows you to split files and merge them back. It is written in Java
diff --git a/debian/patches/02_makefile.patch b/debian/patches/02_makefile.patch
new file mode 100644
index 0000000..5737183
--- /dev/null
+++ b/debian/patches/02_makefile.patch
@@ -0,0 +1,18 @@
+## Description: add some description
+## Origin/Author: add some origin or author
+## Bug: bug URL
+Index: gnome-split-1.1/Makefile
+===================================================================
+--- gnome-split-1.1.orig/Makefile	2011-08-07 19:44:07.470699167 +0200
++++ gnome-split-1.1/Makefile	2011-08-07 19:44:05.906691418 +0200
+@@ -97,6 +97,10 @@
+ 	@/bin/echo -e "MKDIR\t$@/"
+ 	-mkdir -p $@
+ 
++$(DESTDIR)$(PREFIX)/share/mime/packages:
++	@/bin/echo -e "MKDIR\t$@/"
++	-mkdir -p $@
++
+ $(DESTDIR)$(PREFIX)/bin/gnome-split: \
+ 		$(DESTDIR)$(PREFIX)/bin \
+ 		tmp/launcher/gnome-split-install
diff --git a/debian/patches/02_manpage.patch b/debian/patches/02_manpage.patch
deleted file mode 100644
index 292bb3c..0000000
--- a/debian/patches/02_manpage.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-## Description: add some description
-## Origin/Author: add some origin or author
-## Bug: bug URL
-Index: gnome-split-0.7/gnome-split.1
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gnome-split-0.7/gnome-split.1	2011-08-02 21:26:29.233121415 +0200
-@@ -0,0 +1,21 @@
-+.TH man 1 "August 2011" "GNOME Split 0.7" "GNOME Split manpage"
-+.SH NAME
-+GNOME Split \- File splitter for GNOME desktop
-+.SH SYNOPSIS
-+gnome-split [OPTION] [FILE]
-+.SH DESCRIPTION
-+GNOME Split is a tool that allows you to split files and merge them back. It is
-+written in Java and uses a GTK+ user interface (thanks to the java-gnome
-+project). The goal is to offer a native implementation of similar projects which
-+can handle multiple file formats (e.g. Xtremsplit).
-+.SH OPTIONS
-+.TP
-+\fB\-s\fR, \fB\-\-split\fR
-+display the split view
-+.TP
-+\fB\-m\fR, \fB\-\-merge\fR
-+display the merge view
-+.SH BUGS
-+Oh right, just go check them https://bugs.launchpad.net/gnome-split
-+.SH AUTHOR
-+Written by Guillaume Mazoyer
diff --git a/debian/patches/series b/debian/patches/series
index cec8e15..519a0e6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,2 @@
 01_manifest_main_class.patch
-02_manpage.patch
+02_makefile.patch
diff --git a/debian/rules b/debian/rules
index 4d6cada..16fbb87 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,8 @@
 #!/usr/bin/make -f
 
-DEB_CONFIGURE_EXTRA_FLAGS += --libdir=/usr/lib/jni jardir=/usr/share/java
+
+override_dh_auto_configure:
+	./configure prefix=/usr libdir=/usr/lib/jni jardir=/usr/share/java
 
 %:
 	dh $@

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