[pkg-java] r14062 - in trunk/gnome-split/debian: . patches

[Guillaume Mazoyer]

Author: gmazoyer-guest
Date: 2011-08-07 17:56:17 +0000 (Sun, 07 Aug 2011)
New Revision: 14062

Added:
   trunk/gnome-split/debian/patches/02_makefile.patch
Removed:
   trunk/gnome-split/debian/patches/02_manpage.patch
Modified:
   trunk/gnome-split/debian/changelog
   trunk/gnome-split/debian/control
   trunk/gnome-split/debian/patches/series
   trunk/gnome-split/debian/rules
Log:
gnome-split: New upstream release + bug fixes.

Modified: trunk/gnome-split/debian/changelog
===================================================================
--- trunk/gnome-split/debian/changelog	2011-08-07 16:59:52 UTC (rev 14061)
+++ trunk/gnome-split/debian/changelog	2011-08-07 17:56:17 UTC (rev 14062)
@@ -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)

Modified: trunk/gnome-split/debian/control
===================================================================
--- trunk/gnome-split/debian/control	2011-08-07 16:59:52 UTC (rev 14061)
+++ trunk/gnome-split/debian/control	2011-08-07 17:56:17 UTC (rev 14062)
@@ -3,11 +3,10 @@
 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 @@
 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

Added: trunk/gnome-split/debian/patches/02_makefile.patch
===================================================================
--- trunk/gnome-split/debian/patches/02_makefile.patch	                        (rev 0)
+++ trunk/gnome-split/debian/patches/02_makefile.patch	2011-08-07 17:56:17 UTC (rev 14062)
@@ -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

Deleted: trunk/gnome-split/debian/patches/02_manpage.patch
===================================================================
--- trunk/gnome-split/debian/patches/02_manpage.patch	2011-08-07 16:59:52 UTC (rev 14061)
+++ trunk/gnome-split/debian/patches/02_manpage.patch	2011-08-07 17:56:17 UTC (rev 14062)
@@ -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

Modified: trunk/gnome-split/debian/patches/series
===================================================================
--- trunk/gnome-split/debian/patches/series	2011-08-07 16:59:52 UTC (rev 14061)
+++ trunk/gnome-split/debian/patches/series	2011-08-07 17:56:17 UTC (rev 14062)
@@ -1,2 +1,2 @@
 01_manifest_main_class.patch
-02_manpage.patch
+02_makefile.patch

Modified: trunk/gnome-split/debian/rules
===================================================================
--- trunk/gnome-split/debian/rules	2011-08-07 16:59:52 UTC (rev 14061)
+++ trunk/gnome-split/debian/rules	2011-08-07 17:56:17 UTC (rev 14062)
@@ -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 $@