Author: twerner
Date: 2007-11-28 22:15:06 +0000 (Wed, 28 Nov 2007)
New Revision: 4891
Removed:
trunk/mockobjects/debian/dirs
trunk/mockobjects/debian/libmockobjects-java-doc.dirs
trunk/mockobjects/debian/libmockobjects-java.dirs
trunk/mockobjects/debian/libmockobjects-java.docs
trunk/mockobjects/debian/libmockobjects-java.links
trunk/mockobjects/debian/mockobjects.doc-base.EX
Modified:
trunk/mockobjects/debian/
trunk/mockobjects/debian/control
trunk/mockobjects/debian/rules
Log:
the package builds now
Property changes on: trunk/mockobjects/debian
___________________________________________________________________
Name: mergeWithUpstream
+ 1
Modified: trunk/mockobjects/debian/control
===================================================================
--- trunk/mockobjects/debian/control 2007-11-28 21:21:21 UTC (rev 4890)
+++ trunk/mockobjects/debian/control 2007-11-28 22:15:06 UTC (rev 4891)
@@ -1,16 +1,16 @@
Source: mockobjects
-Section: contrib/devel
+Section: devel
Priority: optional
Maintainer: Marcus Crafter <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>= 4.0.0), ant
-Build-Depends-Indep: ant-optional, j2sdk1.4 | j2sdk1.3 | java2-compiler, junit
-Standards-Version: 3.6.1.1
+Build-Depends: cdbs, debhelper (>= 5), ant
+Build-Depends-Indep: ant-optional, java-gcj-compat-dev, junit
+Standards-Version: 3.7.2
Package: libmockobjects-java
-Section: contrib/devel
+Section: devel
Priority: optional
Architecture: all
-Depends: ${misc:Depends}, java2-runtime | java1-runtime
+Depends: ${misc:Depends}, jave-gcj-compat | java2-runtime | java1-runtime
Description: Framework for developing and using mock objects
Mock Objects is a test-first driven framework for building
generic software and/or unit testing frameworks. It supports:
Deleted: trunk/mockobjects/debian/dirs
===================================================================
--- trunk/mockobjects/debian/dirs 2007-11-28 21:21:21 UTC (rev 4890)
+++ trunk/mockobjects/debian/dirs 2007-11-28 22:15:06 UTC (rev 4891)
@@ -1,2 +0,0 @@
-usr/bin
-usr/sbin
Deleted: trunk/mockobjects/debian/libmockobjects-java-doc.dirs
===================================================================
--- trunk/mockobjects/debian/libmockobjects-java-doc.dirs 2007-11-28
21:21:21 UTC (rev 4890)
+++ trunk/mockobjects/debian/libmockobjects-java-doc.dirs 2007-11-28
22:15:06 UTC (rev 4891)
@@ -1 +0,0 @@
-usr/share/doc/libmockobjects-java-doc
Deleted: trunk/mockobjects/debian/libmockobjects-java.dirs
===================================================================
--- trunk/mockobjects/debian/libmockobjects-java.dirs 2007-11-28 21:21:21 UTC
(rev 4890)
+++ trunk/mockobjects/debian/libmockobjects-java.dirs 2007-11-28 22:15:06 UTC
(rev 4891)
@@ -1 +0,0 @@
-usr/share/java/
Deleted: trunk/mockobjects/debian/libmockobjects-java.docs
===================================================================
--- trunk/mockobjects/debian/libmockobjects-java.docs 2007-11-28 21:21:21 UTC
(rev 4890)
+++ trunk/mockobjects/debian/libmockobjects-java.docs 2007-11-28 22:15:06 UTC
(rev 4891)
@@ -1 +0,0 @@
-doc/README
Deleted: trunk/mockobjects/debian/libmockobjects-java.links
===================================================================
--- trunk/mockobjects/debian/libmockobjects-java.links 2007-11-28 21:21:21 UTC
(rev 4890)
+++ trunk/mockobjects/debian/libmockobjects-java.links 2007-11-28 22:15:06 UTC
(rev 4891)
@@ -1,3 +0,0 @@
-/usr/share/java/mockobjects-alt-jdk1.4-0.09.jar
/usr/share/java/mockobjects-alt-jdk1.4.jar
-/usr/share/java/mockobjects-core-0.09.jar /usr/share/java/mockobjects-core.jar
-/usr/share/java/mockobjects-jdk1.4-0.09.jar
/usr/share/java/mockobjects-jdk1.4.jar
Deleted: trunk/mockobjects/debian/mockobjects.doc-base.EX
===================================================================
--- trunk/mockobjects/debian/mockobjects.doc-base.EX 2007-11-28 21:21:21 UTC
(rev 4890)
+++ trunk/mockobjects/debian/mockobjects.doc-base.EX 2007-11-28 22:15:06 UTC
(rev 4891)
@@ -1,22 +0,0 @@
-Document: mockobjects
-Title: Debian mockobjects Manual
-Author: <insert document author here>
-Abstract: This manual describes what mockobjects is
- and how it can be used to
- manage online manuals on Debian systems.
-Section: unknown
-
-Format: debiandoc-sgml
-Files: /usr/share/doc/mockobjects/mockobjects.sgml.gz
-
-Format: postscript
-Files: /usr/share/doc/mockobjects/mockobjects.ps.gz
-
-Format: text
-Files: /usr/share/doc/mockobjects/mockobjects.text.gz
-
-Format: HTML
-Index: /usr/share/doc/mockobjects/html/index.html
-Files: /usr/share/doc/mockobjects/html/*.html
-
-
Modified: trunk/mockobjects/debian/rules
===================================================================
--- trunk/mockobjects/debian/rules 2007-11-28 21:21:21 UTC (rev 4890)
+++ trunk/mockobjects/debian/rules 2007-11-28 22:15:06 UTC (rev 4891)
@@ -1,93 +1,15 @@
#!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+include /usr/share/cdbs/1/class/ant.mk
+include /usr/share/cdbs/1/rules/debhelper.mk
+JAVA_HOME := /usr/lib/jvm/java-gcj
+DEB_ANT_BUILD_TARGET := jar-core
+DEB_JARS := junit
-configure: configure-stamp
-configure-stamp:
- dh_testdir
- # Add here commands to configure the package.
+install/libmockobjects-java::
+ install -m644 -D out/mockobjects-core-*.jar
debian/libmockobjects-java/usr/share/java/mockobjects-core-$(DEB_UPSTREAM_VERSION).jar
+ dh_link -p libmockobjects-java
/usr/share/java/mockobjects-core-$(DEB_UPSTREAM_VERSION).jar
/usr/share/java/mockobjects-core.jar
- touch configure-stamp
-
-
-build: build-stamp
-
-build-stamp: configure-stamp
- dh_testdir
-
- # Add here commands to compile the package.
- #$(MAKE)
- #/usr/bin/docbook-to-man debian/mockobjects.sgml > mockobjects.1
-
- touch build-stamp
-
-clean:
- dh_testdir
- dh_testroot
- rm -f build-stamp configure-stamp
-
- # Add here commands to clean up after the build process.
- #-$(MAKE) clean
- -ant clean
- rm -rf dist
-
- dh_clean
-
-install: build
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs
-
- # Add here commands to install the package into debian/mockobjects.
- #$(MAKE) install DESTDIR=$(CURDIR)/debian/mockobjects
- CLASSPATH=/usr/share/java/junit.jar ant dist
-
- install -m 644 out/mockobjects-alt-jdk1.4-0.09.jar
$(CURDIR)/debian/libmockobjects-java/usr/share/java
- install -m 644 out/mockobjects-core-0.09.jar
$(CURDIR)/debian/libmockobjects-java/usr/share/java
- install -m 644 out/mockobjects-jdk1.4-0.09.jar
$(CURDIR)/debian/libmockobjects-java/usr/share/java
-
- mv out/doc/javadoc
$(CURDIR)/debian/libmockobjects-java-doc/usr/share/doc/libmockobjects-java-doc
-
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
- dh_testdir
- dh_testroot
- dh_installchangelogs
- dh_installdocs
- dh_installexamples
-# dh_install
-# dh_installmenu
-# dh_installdebconf
-# dh_installlogrotate
-# dh_installemacsen
-# dh_installpam
-# dh_installmime
-# dh_installinit
-# dh_installcron
-# dh_installinfo
- dh_installman
- dh_link
- dh_strip
- dh_compress
- dh_fixperms
-# dh_perl
-# dh_python
-# dh_makeshlibs
- dh_installdeb
-# dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
+get-orig-source:
+ -uscan --upstream-version 0 --rename
_______________________________________________
pkg-java-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
