Author: rockclimb-guest
Date: 2011-01-18 20:46:34 +0000 (Tue, 18 Jan 2011)
New Revision: 13228
Modified:
trunk/trident/debian/rules
Log:
Updated debian/rules
Modified: trunk/trident/debian/rules
===================================================================
--- trunk/trident/debian/rules 2011-01-18 20:42:11 UTC (rev 13227)
+++ trunk/trident/debian/rules 2011-01-18 20:46:34 UTC (rev 13228)
@@ -1,5 +1,6 @@
#!/usr/bin/make -f
+# Get definition of $(DEB_SRCDIR)
include /usr/share/cdbs/1/rules/buildvars.mk
JAVA_HOME=/usr/lib/jvm/default-java
@@ -7,10 +8,6 @@
export JH_JAR_EXTRA=META-INF/trident-plugin.properties
-get-orig-source:
- uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download
--rename
-
-
%:
dh $@ --with javahelper
@@ -18,16 +15,19 @@
# Don't use the packages own build system.
override_dh_auto_build::
-# Move "android" folder out the way first
+# Link META-INF. Changing JH_JAR_EXTRA above instead results in the
+# files being in the wrong place in the resulting jar.
override_jh_build:
- echo $(JH_JAR_EXTRA)
ln -s $(DEB_SRCDIR)/src/META-INF $(DEB_SRCDIR)/META-INF
jh_build
-# If things haven't been moved back, do so now.
+# Clean up our symlink
override_dh_clean:
rm -f $(DEB_SRCDIR)/META-INF
dh_clean
+get-orig-source:
+ uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download
--rename
+
_______________________________________________
pkg-java-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
