[Pkg-mol-commits] r152 - in mol/trunk/debian: . debian.mol-source

jo-guest at alioth.debian.org jo-guest at alioth.debian.org
Tue Sep 25 13:51:54 UTC 2007 

Author: jo-guest
Date: 2007-09-25 13:51:54 +0000 (Tue, 25 Sep 2007)
New Revision: 152

Added:
   mol/trunk/debian/debian.mol-source/changelog.m4
Removed:
   mol/trunk/debian/debian.mol-source/changelog.m4.m4
   mol/trunk/debian/mol-source.dirs
Modified:
   mol/trunk/debian/Makefile.mol-source
   mol/trunk/debian/control
   mol/trunk/debian/debian.mol-source/rules
   mol/trunk/debian/mol.dirs
   mol/trunk/debian/mol.menu
   mol/trunk/debian/rules
Log:
?\226?\128?\162 debian/control
  ?\194?\183 Removed m4 from the build dependencies; it's replaced by sed.

?\226?\128?\162 debian/mol-source.dirs
  ?\194?\183 Removed. It's not necessary.

?\226?\128?\162 debian/mol.dirs
  ?\194?\183 Removed all directories they aren't necessary. Most of them are created by
    other debhelpers.

?\226?\128?\162 debian/mol.menu
  ?\194?\183 Adapted to the new menu scheme.

?\226?\128?\162 debian/rules
  ?\194?\183 Added -g to the CFLAGS because policy section 10.1 suggests to build with
    debugging symbols and strip them later

  ?\194?\183 Added support for DEB_BUILD_OPTIONS=noopt as suggested by policy
    section?\194?\16010.1.

  ?\194?\183 Rearranged the targets in the file: clean, build, binary.

  ?\194?\183 clean:
    + Removed the dh_testroot. clean doesn't need root previleges.

    + Put the unpatch target into the command sequence, because it's more
      intuitive.

    + Removed debian/tmp from the dh_clean call. It's not needed.

    + Call ?\226?\128?\156dpatch apply Makefile?\226?\128?\157 before running make distclean, because it
      fails due to the missing bootx directory.

  ?\194?\183 Merged the configure and the build targets.

  ?\194?\183 Use make defconf instead of yes '' | make conf to create the
    configuration.

  ?\194?\183 binary-arch:
    + Added a -a to every dh_* call, because we build the arch specific
      packages.

    + No need to fix manually the permission of mol.symbols

    + Replaced the m4 call by an sed call. This saves a build dependency. The
      file should get renamed, because sed can edit inplace.

  ?\194?\183 Added the get-orig-source target that fetches the upstream tar.bz2 and
    creates the .orig.tar.gz. This is what policy suggests in section 4.9.

?\226?\128?\162 debian/Makefile.mol-source
  ?\194?\183 Made the make calls in build and install targets sensible for the exit
    code. Fixes #412756

?\226?\128?\162 debian/debian.mol-source/changelog.m4 debian/debian.mol-source/changelog.m4.m4
  ?\194?\183 Rename changelog.m4.m4 to changelog.m4 after the switch from m4 to sed in
    debian/rules.

?\226?\128?\162 debian/debian.mol-source/rules
  ?\194?\183 Made the build of files from m4 files more generic?\226?\128?\148it's make.

  ?\194?\183 Removed the targets kdist_changes, source and diff, because they do
    nothing except telling to don't use them.


Modified: mol/trunk/debian/Makefile.mol-source
===================================================================
--- mol/trunk/debian/Makefile.mol-source	2007-09-24 08:13:08 UTC (rev 151)
+++ mol/trunk/debian/Makefile.mol-source	2007-09-25 13:51:54 UTC (rev 152)
@@ -32,13 +32,13 @@
 .PHONY:	$(SUBDIRS)
 build:	$(SUBDIRS)
 $(SUBDIRS):
-	-$(MAKE) -C $(KSRC) M=`pwd`/$@
+	$(MAKE) -C $(KSRC) M=`pwd`/$@
 
 # descend into subdirectories and install the modules
 .PHONY: $(SUBDIRS:=-install)
 install: build $(SUBDIRS:=-install)
 $(SUBDIRS:=-install): 
-	-$(MAKE) INSTALL_MOD_PATH=$(DESTDIR) -C $(KSRC) M=`pwd`/$(subst -install,,$@) modules_install
+	$(MAKE) INSTALL_MOD_PATH=$(DESTDIR) -C $(KSRC) M=`pwd`/$(subst -install,,$@) modules_install
 
 # descend into subdirectories and clean up
 .PHONY:	$(SUBDIRS:=-clean)

Modified: mol/trunk/debian/control
===================================================================
--- mol/trunk/debian/control	2007-09-24 08:13:08 UTC (rev 151)
+++ mol/trunk/debian/control	2007-09-25 13:51:54 UTC (rev 152)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: MOL Packaging Team <pkg-mol-devel at lists.alioth.debian.org>
 Uploaders: Sven Luther <luther at debian.org>, Otavio Salvador <otavio at debian.org>, Gaudenz Steinlin <gaudenz at debian.org>, Aurélien GÉRÔME <ag at roxor.cx>
-Build-Depends: debhelper (>= 5), binutils-dev, bison, docbook-to-man, flex, imagemagick, libasound2-dev, libesd0-dev, libncurses5-dev, po-debconf, libxt-dev, libxxf86dga-dev, dpatch, bzip2, m4, zlib1g-dev, autoconf
+Build-Depends: debhelper (>= 5), binutils-dev, bison, docbook-to-man, flex, imagemagick, libasound2-dev, libesd0-dev, libncurses5-dev, po-debconf, libxt-dev, libxxf86dga-dev, dpatch, bzip2, zlib1g-dev, autoconf
 Standards-Version: 3.7.2
 XS-Vcs-Svn: svn://svn.debian.org/pkg-mol/mol/trunk
 XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-mol/mol/trunk

Copied: mol/trunk/debian/debian.mol-source/changelog.m4 (from rev 151, mol/trunk/debian/debian.mol-source/changelog.m4.m4)
===================================================================
--- mol/trunk/debian/debian.mol-source/changelog.m4	                        (rev 0)
+++ mol/trunk/debian/debian.mol-source/changelog.m4	2007-09-25 13:51:54 UTC (rev 152)
@@ -0,0 +1,6 @@
+mol-modules-KVERS (MOL_VERSION+KDREV) unstable; urgency=low
+
+  * Built from the mol-modules-source package.
+
+ -- KMAINT <KEMAIL>  DEBDATE
+

Deleted: mol/trunk/debian/debian.mol-source/changelog.m4.m4
===================================================================
--- mol/trunk/debian/debian.mol-source/changelog.m4.m4	2007-09-24 08:13:08 UTC (rev 151)
+++ mol/trunk/debian/debian.mol-source/changelog.m4.m4	2007-09-25 13:51:54 UTC (rev 152)
@@ -1,6 +0,0 @@
-mol-modules-KVERS (MOL_VERSION+KDREV) unstable; urgency=low
-
-  * Built from the mol-modules-source package.
-
- -- KMAINT <KEMAIL>  DEBDATE
-

Modified: mol/trunk/debian/debian.mol-source/rules
===================================================================
--- mol/trunk/debian/debian.mol-source/rules	2007-09-24 08:13:08 UTC (rev 151)
+++ mol/trunk/debian/debian.mol-source/rules	2007-09-25 13:51:54 UTC (rev 152)
@@ -42,7 +42,7 @@
 
 	$(MAKE) clean
 
-	-dh_clean
+	dh_clean
 	rm -f debian/control debian/changelog
 	rm -f configure-stamp build-stamp install-stamp
 
@@ -57,10 +57,8 @@
 
 	touch $@
 
-debian/control: debian/control.m4
+debian/%: debian/%.m4
 	$(M4) $(M4DEFINES) $< > $@
-debian/changelog: debian/changelog.m4
-	$(M4) $(M4DEFINES) $< > $@
 
 binary-mol-modules: install-stamp
 	dh_testdir
@@ -81,9 +79,6 @@
 
 kdist_configure: configure-stamp
 
-kdist_changes:
-	@echo >&2 'Note: kdist_changes is obsolete'
-
 kdist_clean: clean
 
 kdist_image:
@@ -102,7 +97,4 @@
 binary binary-arch:
 	@echo >&2 'Use make-kpkg to compile this module' && false
 
-source diff:
-	@echo >&2 'source and diff are obsolete - use dpkg-source -b'; false
-
 .PHONY: binary binary-arch source diff

Deleted: mol/trunk/debian/mol-source.dirs
===================================================================
--- mol/trunk/debian/mol-source.dirs	2007-09-24 08:13:08 UTC (rev 151)
+++ mol/trunk/debian/mol-source.dirs	2007-09-25 13:51:54 UTC (rev 152)
@@ -1 +0,0 @@
-usr/src

Modified: mol/trunk/debian/mol.dirs
===================================================================
--- mol/trunk/debian/mol.dirs	2007-09-24 08:13:08 UTC (rev 151)
+++ mol/trunk/debian/mol.dirs	2007-09-25 13:51:54 UTC (rev 152)
@@ -1,11 +1,3 @@
-etc/mol
-usr/bin
-usr/lib/mol
-usr/share/doc/mol
 usr/share/lintian/overrides
-usr/share/man/man1
-usr/share/man/man5
-usr/share/man/man7
 usr/share/pixmaps
-var/lib/mol
 var/state/mol

Modified: mol/trunk/debian/mol.menu
===================================================================
--- mol/trunk/debian/mol.menu	2007-09-24 08:13:08 UTC (rev 151)
+++ mol/trunk/debian/mol.menu	2007-09-25 13:51:54 UTC (rev 152)
@@ -1,12 +1,12 @@
 ?package(mol): \
 	needs="text" \
 	command="startmol" \
-	section="Apps/Emulators" \
+	section="Applications/Emulators" \
 	title="Mac-on-Linux (Mac OS 9 and earlier)" \
 	icon="/usr/share/pixmaps/mol.xpm"
 ?package(mol):	\
 	needs="text" \
 	command="startmol -X" \
-	section="Apps/Emulators" \
+	section="Applications/Emulators" \
 	title="Mac-on-Linux (Mac OS X)" \
 	icon="/usr/share/pixmaps/mol.xpm"

Modified: mol/trunk/debian/rules
===================================================================
--- mol/trunk/debian/rules	2007-09-24 08:13:08 UTC (rev 151)
+++ mol/trunk/debian/rules	2007-09-25 13:51:54 UTC (rev 152)
@@ -8,148 +8,140 @@
 # include dpatch rules
 include /usr/share/dpatch/dpatch.make
 
-# Debian specific flags to make,, mostly installation directories
-DEBIANFLAGS=\
-prefix=/usr \
-datadir=/usr/share/mol \
-libdir=/usr/lib/mol \
-docdir=/usr/share/doc/mol
+# the values from configure aren't used by the Makefile so we have to pass
+# them to every make call
+DEBIANFLAGS=prefix=/usr datadir=/usr/share/mol libdir=/usr/lib/mol \
+  docdir=/usr/share/doc/mol
 
+CFLAGS += -g -D_FILE_OFFSET_BITS=64
+
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+	CFLAGS += -O0
+else
+	CFLAGS += -O2
+endif
+
 # Debian package version
 VERSION=$(shell dpkg-parsechangelog | grep Version: | cut -d " " -f 2)
+UPSTREAM_VERSION=$(shell echo $(VERSION) | sed s/~dfsg.*//)
 
-configure: configure-stamp
-configure-stamp: patch
+clean:
 	dh_testdir
+	dh_clean
+	rm -f build-stamp
 
-# configure the package.
-	CFLAGS="$$CFLAGS -D_FILE_OFFSET_BITS=64" ./configure --disable-png
-	yes '' | make config
+# remove the manpages
+	rm -f debian/*.[17] mol.tar.bz2
 
-	touch configure-stamp
+	dpatch apply Makefile
+	$(MAKE) distclean
 
-build: configure build-stamp
-build-stamp:
+# upstream bug: distclean does not remove these files
+	rm -rf obj-ppc config/configure
+	rm -f .config* util/img/mol-img
+
+	$(MAKE) -f debian/rules unpatch
+
+build: build-stamp
+build-stamp: patch
 	dh_testdir
 
 # build the Debian specific manpages
 	(cd debian; \
 		for man in mol.7 moldeb.1 molrcget.1 strip_nwrom.1; \
-		do docbook-to-man `echo $$man|sed 's/[17]/sgml/'` >$$man; \
+		do docbook-to-man $${man%?}sgml >$$man; \
 	done)
 
+	./configure --disable-png CFLAGS="$(CFLAGS)"
+	make defconfig
+
 # build the package
 	$(MAKE) BUILD_MODS=n NETDRIVER=n $(DEBIANFLAGS)
 
 # setup the build structure for the kernel modules
-	KERNEL_SOURCE=/lib/modules/`uname -r`/build  $(MAKE) -C src/kmod/Linux/ setup-common
+	$(MAKE) -C src/kmod/Linux/ KERNEL_SOURCE=/lib/modules/`uname -r`/source \
+	    setup-common
 	$(MAKE) -C src/netdriver/ setup-tree-common
 
-	touch build-stamp
+	touch $@
 
-clean: clean-patched unpatch
-clean-patched:
-	dh_testdir
-	dh_testroot
-	rm -f configure-stamp build-stamp
+# Build architecture-independent files here.
+binary-indep:
+# We have nothing to do by default.
 
-# remove the manpages
-	rm -f debian/*.[17]
-
-# clean the package, including auto-generated stuff that distclean overlooks
-	-$(MAKE) clean
-	rm -rf obj-ppc
-	rm -f .config*
-	rm -rf config/configure
-
-#	cd src/vconfig; rm -f modes-y.c modes-y.h modes-l.c
-#	rm -f src/shared/config.h.in
-#	rm -f src/kmod/mpc107/Makefile src/cpu/mpc107/Makefile src/cpu/ppc/asm_offsets.h
-#	rm -f mollib/mol.symbols
-#	cd config/kconfig; rm -rf zconf-y.c zconf-y.h zconf-l.c .autoinclude
-
-# remove the modules source directory and tarball
-	rm -rf modules
-	rm -f mol.tar.bz2
-
-	dh_clean debian/tmp
-
-install: build
+# Build architecture-dependent files here.
+binary-arch: build
 	dh_testdir
 	dh_testroot
-	dh_clean -k
-	dh_installdirs
 
+	dh_installdirs -a
+
 # install the overrides file for lintian
-	install -o root -g root -m 644 debian/lintian.overrides `pwd`/debian/mol/usr/share/lintian/overrides/mol
+	install -o root -g root -m 644 debian/lintian.overrides \
+	    debian/mol/usr/share/lintian/overrides/mol
 
 # install the Mac-on-Linux emulator into mol.
 	$(MAKE) DESTDIR=`pwd`/debian/mol $(DEBIANFLAGS) install
 
-# fix permissions
-	chmod 644 `pwd`/debian/mol/usr/lib/mol/mol.symbols
+	rm debian/mol/usr/share/doc/mol/COPYING
 
-# remove gratious GPL license text
-	rm `pwd`/debian/mol/usr/share/doc/mol/COPYING
+	convert -depth 8 -size 100x122 -frame 14x3 -mattecolor '#ffffce' \
+	    -scale 25% rgb:`pwd`/mollib/graphics/bootlogo.raw \
+	    debian/mol/usr/share/pixmaps/mol.xpm
 
-# extract a 32x32 XPM menu logo from the raw boot logo
-	convert -depth 8 -size 100x122 -frame 14x3 -mattecolor '#ffffce' -scale 25% rgb:`pwd`/mollib/graphics/bootlogo.raw `pwd`/debian/mol/usr/share/pixmaps/mol.xpm
-
 # put together the mol-source package by copying the relevant code
-	mkdir -p modules/mol/kmod modules/mol/netdriver
-	-cp -L obj-ppc/build/src/kmod/* modules/mol/kmod
-	-cp -L obj-ppc/build/src/netdriver/* modules/mol/netdriver
+	mkdir -p modules/mol
+# the directory is full of symlinks
+	cp -prL obj-ppc/build/src/kmod obj-ppc/build/src/netdriver \
+	    modules/mol
 
 # add the Debian directory and the top-level Makefile
 	cp -pr debian/debian.mol-source modules/mol/debian
-	m4 -DMOL_VERSION=$(VERSION) < modules/mol/debian/changelog.m4.m4 > modules/mol/debian/changelog.m4
+	sed -i '1s/MOL_VERSION/$(VERSION)/' modules/mol/debian/changelog.m4
 	rm modules/mol/debian/changelog.m4.m4
 	cp -p debian/Makefile.mol-source modules/mol/Makefile
 
 # set correct permissions
 	chmod u+x modules/mol/debian/rules
-	chown -R root.src modules
+	chown -R root:src modules
 	chmod -R u+w,go-w,a+rX modules
 
-# create a tarball
 	tar jcf mol.tar.bz2 modules
+	rm -r modules
+	dh_install -pmol-source mol.tar.bz2 usr/src
 
-# install the source tarball into mol-source
-	install -o root -g root -m 644 mol.tar.bz2 `pwd`/debian/mol-source/usr/src
+	dh_installdebconf -a
+	dh_installdocs -a
+	dh_installexamples -a
+	dh_installman -a
+	dh_installmenu -a
+	dh_installmodules -a
+	dh_installchangelogs -a CHANGELOG
+	dh_link -a
+	dh_strip -a
+	dh_compress -a
+	dh_fixperms -a
+	dh_installdeb -a
+	dh_shlibdeps -a -Xlib/modules
+	dh_gencontrol -a
+	dh_md5sums -a
+	dh_builddeb -a
 
-# create the mol-modules packages by moving the installed modules
-#	dh_movefiles --sourcedir=debian/mol
-# remove the now empty directory
-#	rm -rf `pwd`/debian/mol/lib
+binary: binary-indep binary-arch
 
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
+TAR_NAME=mol-$(UPSTREAM_VERSION).tar.bz2
+MOL_DIR_NAME=mol-$(shell echo $(VERSION) | sed s/-.*//)
 
-# Build architecture-dependent files here.
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_installdebconf	
-	dh_installdocs
-	dh_installexamples
-	dh_installman
-	dh_installmenu
-	dh_installmodules
-	dh_installchangelogs CHANGELOG
-	dh_link
-	dh_strip
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_shlibdeps -Xlib/modules
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
+get-orig-source:
+	wget http://dfn.dl.sourceforge.net/sourceforge/mac-on-linux/$(TAR_NAME)
+	tar -xf $(TAR_NAME)
+	rm $(TAR_NAME)
 
-# Any other binary targets build just one binary package at a time.
-binary-%: build install
-        make -f debian/rules binary-common DH_OPTIONS=-p$*
+	mv $(TAR_NAME:.tar.bz2=) $(MOL_DIR_NAME)
+	cd $(MOL_DIR_NAME) && rm -r bootx mollib/drivers \
+	    mollib/images/moldisk.dmg mollib/images/moldiskX.dmg
 
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
+	tar -czf $(MOL_DIR_NAME).orig.tar.gz $(MOL_DIR_NAME)
+	rm -r $(MOL_DIR_NAME)
+
+.PHONY: build clean binary-indep binary-arch binary get-orig-source

More information about the Pkg-mol-commits mailing list