The following commit has been merged in the master branch:
commit e3a6f2a339f50de3d42e8b8d7aa0452fd5efb3fb
Author: Giovanni Mascellani <[email protected]>
Date: Fri May 24 22:57:48 2013 +0200
Start migrating build system to the new repository setup.
This work isn't complete yet. The common/ subdirectory alone compiles
correctly, but we still have to sort out from the dependencies mess
in the desktop/ subdirectory.
diff --git a/debian/control b/debian/control
index 9434cca..87c1815 100644
--- a/debian/control
+++ b/debian/control
@@ -24,7 +24,9 @@ Build-Depends:
libfreehep-graphicsio-emf-java (>= 2.1.1-emfplus+dfsg1-2),
libjfugue-java,
libjlatexmath-java,
- librhino-java (>= 1.7R3-5)
+ librhino-java (>= 1.7R3-5),
+ libjts-java,
+ libgwt-user-java
Standards-Version: 3.9.4
Homepage: http://www.geogebra.org/
Vcs-Git: git://git.debian.org/git/pkg-java/geogebra.git -b build
diff --git a/debian/docs b/debian/docs
deleted file mode 100644
index 5f222ff..0000000
--- a/debian/docs
+++ /dev/null
@@ -1 +0,0 @@
-_README.txt
diff --git a/debian/geogebra.install b/debian/geogebra.install
index edd8247..ef11661 100644
--- a/debian/geogebra.install
+++ b/debian/geogebra.install
@@ -1,15 +1,15 @@
geogebra.jar usr/share/geogebra
debian/geogebra.desktop usr/share/applications
-icons/hicolor/16x16/apps/geogebra.png usr/share/icons/hicolor/16x16/apps
-icons/hicolor/22x22/apps/geogebra.png usr/share/icons/hicolor/22x22/apps
-icons/hicolor/24x24/apps/geogebra.png usr/share/icons/hicolor/24x24/apps
-icons/hicolor/32x32/apps/geogebra.png usr/share/icons/hicolor/32x32/apps
-icons/hicolor/36x36/apps/geogebra.png usr/share/icons/hicolor/36x36/apps
-icons/hicolor/48x48/apps/geogebra.png usr/share/icons/hicolor/48x48/apps
-icons/hicolor/64x64/apps/geogebra.png usr/share/icons/hicolor/64x64/apps
-icons/hicolor/72x72/apps/geogebra.png usr/share/icons/hicolor/72x72/apps
-icons/hicolor/96x96/apps/geogebra.png usr/share/icons/hicolor/96x96/apps
-icons/hicolor/128x128/apps/geogebra.png usr/share/icons/hicolor/128x128/apps
-icons/hicolor/192x192/apps/geogebra.png usr/share/icons/hicolor/192x192/apps
-icons/hicolor/256x256/apps/geogebra.png usr/share/icons/hicolor/256x256/apps
-icons/hicolor/scalable/apps/geogebra.svgz usr/share/icons/hicolor/scalable/apps
+desktop/icons/hicolor/16x16/apps/geogebra.png
usr/share/icons/hicolor/16x16/apps
+desktop/icons/hicolor/22x22/apps/geogebra.png
usr/share/icons/hicolor/22x22/apps
+desktop/icons/hicolor/24x24/apps/geogebra.png
usr/share/icons/hicolor/24x24/apps
+desktop/icons/hicolor/32x32/apps/geogebra.png
usr/share/icons/hicolor/32x32/apps
+desktop/icons/hicolor/36x36/apps/geogebra.png
usr/share/icons/hicolor/36x36/apps
+desktop/icons/hicolor/48x48/apps/geogebra.png
usr/share/icons/hicolor/48x48/apps
+desktop/icons/hicolor/64x64/apps/geogebra.png
usr/share/icons/hicolor/64x64/apps
+desktop/icons/hicolor/72x72/apps/geogebra.png
usr/share/icons/hicolor/72x72/apps
+desktop/icons/hicolor/96x96/apps/geogebra.png
usr/share/icons/hicolor/96x96/apps
+desktop/icons/hicolor/128x128/apps/geogebra.png
usr/share/icons/hicolor/128x128/apps
+desktop/icons/hicolor/192x192/apps/geogebra.png
usr/share/icons/hicolor/192x192/apps
+desktop/icons/hicolor/256x256/apps/geogebra.png
usr/share/icons/hicolor/256x256/apps
+desktop/icons/hicolor/scalable/apps/geogebra.svgz
usr/share/icons/hicolor/scalable/apps
diff --git a/debian/rules b/debian/rules
index bc56c26..cd723a8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,7 +12,7 @@ TG_BRANCHES += patch/version
-include /usr/share/topgit/tg2quilt.mk
export JAVA_HOME=/usr/lib/jvm/default-java
-export
CLASSPATH=/usr/share/java/mathpiper.jar:/usr/share/java/commons-math.jar:/usr/share/java/freehep-xml.jar:/usr/share/java/freehep-util.jar:/usr/share/java/freehep-graphics2d.jar:/usr/share/java/freehep-io.jar:/usr/share/java/freehep-graphicsio.jar:/usr/share/java/freehep-graphicsio-svg.jar:/usr/share/java/freehep-graphicsio-pdf.jar:/usr/share/java/freehep-graphicsio-emf.jar:/usr/share/icedtea-web/plugin.jar:/usr/share/java/jlatexmath.jar:/usr/share/java/collections15.jar:/usr/share/java/jfugue.jar:/usr/share/java/js.jar
+export
CLASSPATH=/usr/share/java/mathpiper.jar:/usr/share/java/commons-math.jar:/usr/share/java/freehep-xml.jar:/usr/share/java/freehep-util.jar:/usr/share/java/freehep-graphics2d.jar:/usr/share/java/freehep-io.jar:/usr/share/java/freehep-graphicsio.jar:/usr/share/java/freehep-graphicsio-svg.jar:/usr/share/java/freehep-graphicsio-pdf.jar:/usr/share/java/freehep-graphicsio-emf.jar:/usr/share/icedtea-web/plugin.jar:/usr/share/java/jlatexmath.jar:/usr/share/java/collections15.jar:/usr/share/java/jfugue.jar:/usr/share/java/js.jar:/usr/share/java/jts.jar:/usr/share/java/gwt-user.jar
%:
dh $@ --with javahelper
@@ -24,28 +24,30 @@ XP = xsltproc -''-nonet -''-param
man.charmap.use.subset "0"
$(XP) $(DB2MAN) $<
override_dh_auto_configure:
- ./debian/create_debian_class.sh $$(dpkg-parsechangelog | grep ^Version:
| cut -d' ' -f2) > $(CURDIR)/geogebra/GeoGebraDebian.java
-
# Create a directory of hard links to separate sources from
# other files
mkdir src
- cp -rl geogebra edu src
+ cp -rl common/src/* src
+ cp -rl desktop/geogebra src
+ cp -rl desktop/edu src
+
+ # Create a hook class for the Debian package
+ ./debian/create_debian_class.sh $$(dpkg-parsechangelog | grep ^Version:
| cut -d' ' -f2) > src/geogebra/GeoGebraDebian.java
override_dh_auto_build:
- javacc -STATIC=false -OUTPUT_DIRECTORY=src/geogebra/kernel/parser/
src/geogebra/kernel/parser/Parser.jj
+ javacc -STATIC=false
-OUTPUT_DIRECTORY=src/geogebra/common/kernel/parser/
src/geogebra/common/kernel/parser/Parser.jj
override_jh_build: geogebra.1 ggthumb.1
jh_build -N -mgeogebra.GeoGebra -o'-encoding utf-8'
# Add resource files to JAR archive
- ( cd src/ ; find ! -name *.java -type f -print0 ) | xargs -0 jar uf
geogebra.jar -C src/
+ ( cd src/ ; find ! -name *.java -type f -print0 | xargs -0 jar vuf
../geogebra.jar )
override_dh_auto_install:
install -m 755 $(CURDIR)/debian/geogebra.sh
$(CURDIR)/debian/geogebra/usr/bin/geogebra
install -m 755 $(CURDIR)/debian/ggthumb.sh
$(CURDIR)/debian/geogebra-gnome/usr/bin/ggthumb
override_dh_auto_clean:
- rm -f $(CURDIR)/geogebra/GeoGebraDebian.java
rm -fr src
rm -f *.1
--
GeoGebra: Dynamic mathematics software for education
_______________________________________________
pkg-java-commits mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
