[pkg-java] r6444 - in trunk/java-gnome: . debian debian/patches
tgg at alioth.debian.org
tgg at alioth.debian.org
Sat May 10 09:16:40 UTC 2008
Author: tgg
Date: 2008-05-10 09:16:38 +0000 (Sat, 10 May 2008)
New Revision: 6444
Added:
trunk/java-gnome/debian/patches/
trunk/java-gnome/debian/patches/01_change_jni_library_location.diff
trunk/java-gnome/debian/patches/02_dont_export_pango_backend_funcs.diff
trunk/java-gnome/debian/patches/series
Removed:
trunk/java-gnome/Makefile
trunk/java-gnome/src/
Modified:
trunk/java-gnome/debian/
trunk/java-gnome/debian/changelog
trunk/java-gnome/debian/control
trunk/java-gnome/debian/rules
Log:
update to 4.0.7 using Manu work. Switch to quilt. Remove mergeWithUpstream prop.
Deleted: trunk/java-gnome/Makefile
===================================================================
--- trunk/java-gnome/Makefile 2008-05-10 05:53:16 UTC (rev 6443)
+++ trunk/java-gnome/Makefile 2008-05-10 09:16:38 UTC (rev 6444)
@@ -1,169 +0,0 @@
-#
-# Makefile, part of Equivalence
-#
-# Copyright (c) 2006-2007 Operational Dynamics Consulting Pty Ltd
-#
-# The code in this file, and the library it is a part of, are made available
-# to you by the authors under the terms of the "GNU General Public Licence,
-# version 2". See the LICENCE file for the terms governing usage and
-# redistribution.
-#
-
-ifdef V
-else
-MAKEFLAGS=-s
-REDIRECT=>/dev/null
-endif
-
--include .config
-
-ifdef GCJ
-all: build-java build-native
-else
-all: build-java
-endif
-
-.PHONY: test demo doc clean distlcean install
-
-
-# --------------------------------------------------------------------
-# Source compilation
-# --------------------------------------------------------------------
-
-build-java:
- build/faster
-
-build-native: .config tmp/gtk-$(APIVERSION).jar
- make -f build/gcj.make
-
-# --------------------------------------------------------------------
-# Install (run as root, or specify DESTDIR on Make command line)
-# --------------------------------------------------------------------
-
-ifdef GCJ
-install: build-java build-native install-dirs install-java install-native
-else
-install: build-java install-dirs install-java
-endif
- rm $(DESTDIR)$(PREFIX)/.java-gnome-install-dirs
-
-install-dirs: $(DESTDIR)$(PREFIX)/.java-gnome-install-dirs
-$(DESTDIR)$(PREFIX)/.java-gnome-install-dirs:
- @test -d $(DESTDIR)$(PREFIX)/share/java || echo -e "MKDIR\tinstallation directories"
- -mkdir -p $(DESTDIR)$(PREFIX)
- -touch $@ 2>/dev/null
- test -w $@ || ( echo -e "\nYou don't seem to have write permissions to $(DESDIR)$(PREFIX)\nPerhaps you need to be root?\n" && exit 7 )
- mkdir -p $(DESTDIR)$(PREFIX)/share/java
- mkdir -p $(DESTDIR)$(PREFIX)/lib/jni
-
-install-java: build-java \
- $(DESTDIR)$(PREFIX)/share/java/gtk-$(APIVERSION).jar \
- $(DESTDIR)$(PREFIX)/lib/jni/libgtkjni-$(APIVERSION).so
-
-install-native: build-native install-java \
- $(DESTDIR)$(PREFIX)/lib/libgtkjava-$(APIVERSION).so
-
-$(DESTDIR)$(PREFIX)/share/java/gtk-$(APIVERSION).jar: tmp/gtk-$(APIVERSION).jar
- @echo -e "INSTALL\t$@"
- cp -f $< $@
- @echo -e "SYMLINK\t$(@D)/gtk.jar -> gtk-$(APIVERSION).jar"
- cd $(@D) && rm -f gtk.jar && ln -s gtk-$(APIVERSION).jar gtk.jar
-
-$(DESTDIR)$(PREFIX)/lib/jni/libgtkjni-$(APIVERSION).so: tmp/libgtkjni-$(APIVERSION).so
- @echo -e "INSTALL\t$@"
- cp -f $< $@
-
-$(DESTDIR)$(PREFIX)/lib/libgtkjava-$(APIVERSION).so: tmp/libgtkjava-$(APIVERSION).so
- @echo -e "INSTALL\t$@"
- cp -f $< $@
-
-
-# --------------------------------------------------------------------
-# Tests
-# --------------------------------------------------------------------
-
-test:
- build/faster test
-
-demo:
- build/faster demo
-
-# --------------------------------------------------------------------
-# Documentation generation
-# --------------------------------------------------------------------
-
-ifdef V
-else
-JAVADOC:=$(JAVADOC) -quiet
-endif
-
-doc:
- @echo "$(JAVADOC_CMD) doc/api/*.html"
- $(JAVADOC) \
- -d doc/api \
- -classpath tmp/bindings \
- -public \
- -nodeprecated \
- -source 1.4 \
- -notree \
- -noindex \
- -nohelp \
- -version \
- -author \
- -windowtitle "java-gnome $(APIVERSION) API Documentation" \
- -doctitle "<h1>java-gnome $(APIVERSION) API Documentation</h1>" \
- -header "java-gnome version $(VERSION)" \
- -footer "<img src=\"/images/java-gnome_JavaDocLogo.png\" style=\"padding-right:25px;\"><br> <span style=\"font-family: Arial; font-style: normal; font-size: large;\">java-gnome</span>" \
- -breakiterator \
- -stylesheetfile src/bindings/stylesheet.css \
- -overview src/bindings/overview.html \
- -sourcepath src/bindings \
- -subpackages org \
- -exclude "org.freedesktop.bindings" \
- $(REDIRECT)
-
-
-#
-# Remember that if you bump the version number you need to commit the change
-# and re-./configure before being able to run this! On the other hand, we
-# don't have to distclean before calling this.
-#
-dist: all
- @echo -e "CHECK\tfully committed state"
- bzr diff > /dev/null || ( echo -e "\nYou need to commit all changes before running make dist\n" ; exit 4 )
- @echo -e "EXPORT\ttmp/java-gnome-$(VERSION)"
- -rm -rf tmp/java-gnome-$(VERSION)
- bzr export --format=dir tmp/java-gnome-$(VERSION)
- @echo -e "RM\tnon essential files"
- rm -r tmp/java-gnome-$(VERSION)/web
- rm tmp/java-gnome-$(VERSION)/.aspell.en.pws
- @echo -e "TAR\tjava-gnome-$(VERSION).tar.bz2"
- tar cjf java-gnome-$(VERSION).tar.bz2 -C tmp java-gnome-$(VERSION)
- rm -r tmp/java-gnome-$(VERSION)
-
-clean:
- @echo -e "RM\tgenerated code"
- rm -rf generated/bindings/*
- @echo -e "RM\tcompiled output"
- rm -rf tmp/generator/* tmp/bindings/* tmp/tests/*
- rm -rf tmp/include/* tmp/native/* tmp/objects/*
- @echo -e "RM\ttemporary files"
- rm -rf tmp/stamp/*
- rm -f hs_err_*
- @echo -e "RM\tbuilt .jar and .so"
- rm -f tmp/gtk-*.jar \
- tmp/libgtkjni-*.so \
- tmp/libgtkjava-*.so
-
-distclean: clean
- @echo -e "RM\tbuild configuration information"
- -rm -f .config .config.tmp
- @echo -e "RM\tgenerated documentation"
- -rm -rf doc/api/*
- -rm -f java-gnome-*.tar.bz2
- @echo -e "RM\ttemporary directories"
- -rm -rf tmp generated
- @echo -e "RM\tglade cruft"
- find . -name '*.glade.bak' -o -name '*.gladep*' -type f | xargs rm -f
-
-# vim: set filetype=make textwidth=78 nowrap:
Property changes on: trunk/java-gnome/debian
___________________________________________________________________
Name: mergeWithUpstream
- 1
Modified: trunk/java-gnome/debian/changelog
===================================================================
--- trunk/java-gnome/debian/changelog 2008-05-10 05:53:16 UTC (rev 6443)
+++ trunk/java-gnome/debian/changelog 2008-05-10 09:16:38 UTC (rev 6444)
@@ -1,3 +1,19 @@
+java-gnome (4.0.7-1) unstable; urgency=low
+
+ [ Manu Mahajan ]
+ * Upgraded to upstream version 4.0.7
+ * Changed build dependency from java-gcj-compat-dev to default-jdk-builddep
+ Closes: #477867
+
+ [ Thomas Girard ]
+ * Switch to quilt for patch management
+ * Add Vcs-*: fields to debian/control
+ * Add Homepage: field to debian/control
+ * Apply patch to prevent export of Cairo backend functions. Thanks to
+ Loïc Minier for his invaluable help on this FTBFS bug. Closes: #476295
+
+ -- Thomas Girard <thomas.g.girard at free.fr> Sat, 10 May 2008 09:23:38 +0000
+
java-gnome (4.0.6-1) unstable; urgency=low
[ Manu Mahajan ]
Modified: trunk/java-gnome/debian/control
===================================================================
--- trunk/java-gnome/debian/control 2008-05-10 05:53:16 UTC (rev 6443)
+++ trunk/java-gnome/debian/control 2008-05-10 09:16:38 UTC (rev 6444)
@@ -2,9 +2,12 @@
Priority: optional
Maintainer: Debian Java maintainers <pkg-java-maintainers at lists.alioth.debian.org>
Uploaders: Manu Mahajan <manu at codepencil.com>, Thomas Girard <thomas.g.girard at free.fr>
-Build-Depends: debhelper (>= 5), libgtk2.0-dev, junit, libglade2-dev, libgnome2-0, java-gcj-compat-dev
+Build-Depends: debhelper (>= 5), libgtk2.0-dev, junit, libglade2-dev, libgnome2-0, default-jdk-builddep, quilt
Standards-Version: 3.7.3
Section: libs
+Homepage: http://java-gnome.sourceforge.net/
+Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/java-gnome
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/java-gnome
Package: libjava-gnome-java
Section: libs
Added: trunk/java-gnome/debian/patches/01_change_jni_library_location.diff
===================================================================
--- trunk/java-gnome/debian/patches/01_change_jni_library_location.diff (rev 0)
+++ trunk/java-gnome/debian/patches/01_change_jni_library_location.diff 2008-05-10 09:16:38 UTC (rev 6444)
@@ -0,0 +1,11 @@
+--- orig/configure
++++ mod/configure
+@@ -1767,7 +1767,7 @@
+ }
+ print CONFIG "PREFIX=$prefix\n";
+ if (!$libdir) {
+- $libdir = "$prefix/lib";
++ $libdir = "$prefix/lib/jni";
+ }
+ print CONFIG "LIBDIR=$libdir\n";
+
Added: trunk/java-gnome/debian/patches/02_dont_export_pango_backend_funcs.diff
===================================================================
--- trunk/java-gnome/debian/patches/02_dont_export_pango_backend_funcs.diff (rev 0)
+++ trunk/java-gnome/debian/patches/02_dont_export_pango_backend_funcs.diff 2008-05-10 09:16:38 UTC (rev 6444)
@@ -0,0 +1,40 @@
+--- orig/src/defs/PangoFontMap.defs
++++ mod/src/defs/PangoFontMap.defs
+@@ -36,12 +36,6 @@
+ )
+ )
+
+-(define-method get_shape_engine_type
+- (of-object "PangoFontMap")
+- (c-name "pango_font_map_get_shape_engine_type")
+- (return-type "const-char*")
+-)
+-
+ (define-virtual load_font
+ (of-object "PangoFontMap")
+ (return-type "PangoFont*")
+--- orig/src/defs/PangoContext.defs
++++ mod/src/defs/PangoContext.defs
+@@ -5,22 +5,6 @@
+ (gtype-id "PANGO_TYPE_CONTEXT")
+ )
+
+-(define-function pango_context_new
+- (is-constructor-of "PangoContext")
+- (c-name "pango_context_new")
+- (caller-owns-return #t)
+- (return-type "PangoContext*")
+-)
+-
+-(define-method add_font_map
+- (of-object "PangoContext")
+- (c-name "pango_context_set_font_map")
+- (return-type "none")
+- (parameters
+- '("PangoFontMap*" "font_map")
+- )
+-)
+-
+ (define-method get_font_map
+ (of-object "PangoContext")
+ (c-name "pango_context_get_font_map")
Added: trunk/java-gnome/debian/patches/series
===================================================================
--- trunk/java-gnome/debian/patches/series (rev 0)
+++ trunk/java-gnome/debian/patches/series 2008-05-10 09:16:38 UTC (rev 6444)
@@ -0,0 +1,2 @@
+01_change_jni_library_location.diff
+02_dont_export_pango_backend_funcs.diff
Modified: trunk/java-gnome/debian/rules
===================================================================
--- trunk/java-gnome/debian/rules 2008-05-10 05:53:16 UTC (rev 6443)
+++ trunk/java-gnome/debian/rules 2008-05-10 09:16:38 UTC (rev 6444)
@@ -6,16 +6,16 @@
# dh-make output file, you may use that output file without restriction.
# This special exception was added by Craig Small in version 0.37 of dh-make.
+QUILT_STAMPFN = patch-stamp
+include /usr/share/quilt/quilt.make
-#configure
-.config:
+.config: patch-stamp
dh_testdir
# Add here commands to configure the package.
- ./configure --prefix=/usr jdk=/usr/lib/jvm/java-gcj compiler=ecj
+ ./configure --prefix=/usr jdk=/usr/lib/jvm/default-java compiler=ecj
-
build: build-stamp
-build-stamp: .config
+build-stamp: .config
dh_testdir
# Add here commands to compile the package.
@@ -31,6 +31,8 @@
# Add here commands to clean up after the build process.
$(MAKE) distclean
+ -test -f patch-stamp && $(MAKE) -f debian/rules unpatch
+
dh_clean
install: build
@@ -67,4 +69,4 @@
dh_builddeb
binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
+.PHONY: build clean binary-indep binary-arch binary install patch unpatch
More information about the pkg-java-commits
mailing list