[Pkg-mol-commits] r133 - in mol-drivers-macosx/trunk/debian: . patches

[gaudenz at alioth.debian.org]

Author: gaudenz
Date: 2007-07-25 22:22:20 +0000 (Wed, 25 Jul 2007)
New Revision: 133

Added:
   mol-drivers-macosx/trunk/debian/mol-drivers-macosx.install
   mol-drivers-macosx/trunk/debian/patches/
   mol-drivers-macosx/trunk/debian/patches/00list
   mol-drivers-macosx/trunk/debian/patches/Makefile.dpatch
Modified:
   mol-drivers-macosx/trunk/debian/changelog
   mol-drivers-macosx/trunk/debian/control
   mol-drivers-macosx/trunk/debian/dirs
   mol-drivers-macosx/trunk/debian/rules
Log:
  * New upstream version
  * Build bootx from source
  * Move disk images with drivers for Mac OS X from package mol
    to this package



Modified: mol-drivers-macosx/trunk/debian/changelog
===================================================================
--- mol-drivers-macosx/trunk/debian/changelog	2007-07-25 22:19:34 UTC (rev 132)
+++ mol-drivers-macosx/trunk/debian/changelog	2007-07-25 22:22:20 UTC (rev 133)
@@ -1,9 +1,13 @@
-mol-drivers-macosx (0.9.71-2) UNRELEASED; urgency=low
+mol-drivers-macosx (0.9.72-1) UNRELEASED; urgency=low
 
   * NOT RELEASED YET
-  * Add XS-Vcs-Field 
+  * New upstream version
+  * Add XS-Vcs-Field
+  * Build bootx from source
+  * Move disk images with drivers for Mac OS X from package mol
+    to this package
 
- -- Gaudenz Steinlin <gaudenz at debian.org>  Sat,  7 Oct 2006 16:17:15 +0200
+ -- Gaudenz Steinlin <gaudenz at debian.org>  Mon, 25 Jun 2007 11:51:27 +0200
 
 mol-drivers-macosx (0.9.71-1) unstable; urgency=low
 

Modified: mol-drivers-macosx/trunk/debian/control
===================================================================
--- mol-drivers-macosx/trunk/debian/control	2007-07-25 22:19:34 UTC (rev 132)
+++ mol-drivers-macosx/trunk/debian/control	2007-07-25 22:22:20 UTC (rev 133)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: MOL Packaging Team <pkg-mol-devel at lists.alioth.debian.org>
 Uploaders: Gaudenz Steinlin <gaudenz at debian.org>, Aurélien GÉRÔME <ag at roxor.cx>
-Build-Depends: debhelper (>= 5)
+Build-Depends: debhelper (>= 5), dpatch, m4, zlib1g-dev, libncurses5-dev
 Standards-Version: 3.7.2
 XS-Vcs-Svn: svn://svn.debian.org/pkg-mol/mol-drivers-macosx/trunk
 
@@ -11,7 +11,7 @@
 Architecture: powerpc
 Provides: mol-drivers
 Depends: mol (>= 0.9.68+20030225-1)
-Conflicts: mol (<< 0.9.68+20030225-1)
+Conflicts: mol (<< 0.9.72~dfsg-1)
 Description: The Mac-on-Linux emulator - drivers for Mac OS X
  .
  Mac-on-Linux is a virtual machine capable of running

Modified: mol-drivers-macosx/trunk/debian/dirs
===================================================================
--- mol-drivers-macosx/trunk/debian/dirs	2007-07-25 22:19:34 UTC (rev 132)
+++ mol-drivers-macosx/trunk/debian/dirs	2007-07-25 22:22:20 UTC (rev 133)
@@ -1,2 +1 @@
-usr/share/mol/drivers
 usr/share/lintian/overrides

Added: mol-drivers-macosx/trunk/debian/mol-drivers-macosx.install
===================================================================
--- mol-drivers-macosx/trunk/debian/mol-drivers-macosx.install	                        (rev 0)
+++ mol-drivers-macosx/trunk/debian/mol-drivers-macosx.install	2007-07-25 22:22:20 UTC (rev 133)
@@ -0,0 +1 @@
+mollib/* usr/share/mol

Added: mol-drivers-macosx/trunk/debian/patches/00list
===================================================================
--- mol-drivers-macosx/trunk/debian/patches/00list	                        (rev 0)
+++ mol-drivers-macosx/trunk/debian/patches/00list	2007-07-25 22:22:20 UTC (rev 133)
@@ -0,0 +1 @@
+Makefile

Added: mol-drivers-macosx/trunk/debian/patches/Makefile.dpatch
===================================================================
--- mol-drivers-macosx/trunk/debian/patches/Makefile.dpatch	                        (rev 0)
+++ mol-drivers-macosx/trunk/debian/patches/Makefile.dpatch	2007-07-25 22:22:20 UTC (rev 133)
@@ -0,0 +1,20 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## Makefile.dpatch by  <gaudenz at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: only build bootx
+
+ at DPATCH@
+diff -urNad mol-0.9.72~dfsg~/Makefile mol-0.9.72~dfsg/Makefile
+--- mol-0.9.72~dfsg~/Makefile	2007-03-03 04:49:10.000000000 +0100
++++ mol-0.9.72~dfsg/Makefile	2007-05-05 16:20:23.000000000 +0200
+@@ -7,7 +7,7 @@
+ include		config/Makefile.top
+ include		config/Makefile.master
+ 
+-SUBDIRS		= . scripts src util/img bootx
++SUBDIRS		= . bootx
+ MAKE		+= -s
+ 
+ $(OINC)/cpu: $(OINC)/.dir
+


Property changes on: mol-drivers-macosx/trunk/debian/patches/Makefile.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Modified: mol-drivers-macosx/trunk/debian/rules
===================================================================
--- mol-drivers-macosx/trunk/debian/rules	2007-07-25 22:19:34 UTC (rev 132)
+++ mol-drivers-macosx/trunk/debian/rules	2007-07-25 22:22:20 UTC (rev 133)
@@ -5,6 +5,9 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+# include dpatch rules
+include /usr/share/dpatch/dpatch.make
+
 INSTALL_DATA	= /usr/bin/install -c -m 644
 
 ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
@@ -15,9 +18,12 @@
 endif
 
 configure: configure-stamp
-configure-stamp:
+configure-stamp: patch
 	dh_testdir
 
+	CFLAGS="$$CFLAGS -D_FILE_OFFSET_BITS=64" ./configure --disable-png
+	yes '' | make config
+
 	touch configure-stamp
 
 
@@ -26,9 +32,12 @@
 build-stamp: configure-stamp 
 	dh_testdir
 
+	$(MAKE)
+
 	touch build-stamp
 
-clean:
+clean: clean-patched unpatch
+clean-patched:
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp configure-stamp
@@ -40,8 +49,8 @@
 	dh_testroot
 	dh_clean -k
 	dh_installdirs
+	dh_install
 
-	$(INSTALL_DATA) mollib/drivers/* $(CURDIR)/debian/mol-drivers-macosx/usr/share/mol/drivers
 	$(INSTALL_DATA) debian/lintian.overrides $(CURDIR)/debian/mol-drivers-macosx/usr/share/lintian/overrides/mol-drivers-macosx
 
 # Build architecture-independent files here.