-omnibook (1:2.20060809) unstable; urgency=low
+omnibook (2:2.20060809-2) unstable; urgency=low
- * New bugfix version
+ * Include copyright and Debian changelog in omnibook-module
+ * Fix Makefile issue in a more elegant way
- -- Mathieu Bérard <math_b@users.sourceforge.net> Wed, 9 Aug 2006 18:54:17 +0200
+ -- Julien Valroff <julien@kirya.net> Thu, 10 Aug 2006 10:16:47 +0200
-omnibook (1:2.20060806) unstable; urgency=low
+omnibook (2:2.20060809-1) unstable; urgency=low
- * New major version (see changelog.gz for details).
+ * New upstream release:
+ + Addeed autodetection of the Toshiba Satellite M40X laptop
- -- Mathieu Bérard <math_b@users.sourceforge.net> Sun, 6 Aug 2006 23:26:00 +0200
+ -- Julien Valroff <julien@kirya.net> Thu, 10 Aug 2006 09:40:45 +0200
+
+omnibook (2:2.20060806-1) unstable; urgency=low
+
+ * New upstream branch - Mathieu Bérard launched new project
+ * Added myself as co-maintainer
+ * Bumped upstream version and use epoch to ensure upgrades
+ * [debian/rules]:
+ + Clean-ups
+ + Recommends linux-image or kernel-image
+ * [debian/control] Improved long description
+ * [debian/post*.modules.in] Fixed bashisms
+ * Added patch to fix install target in Makefile
+
+ -- Julien Valroff <julien@kirya.net> Thu, 10 Aug 2006 01:35:38 +0200
omnibook (20060126-1) unstable; urgency=low
#!/usr/bin/make -f
# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
-#
-# This version is for a hypothetical package that can build a kernel modules
-# architecture-dependant package via make-kpkg, as well as an
-# architecture-independent module source package, and other packages
-# either dep/indep for things like common files or userspace components
-# needed for the kernel modules.
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
+include /usr/share/dpatch/dpatch.make
+
CFLAGS = -Wall -g
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
CFLAGS += -O2
endif
-# some default definitions, important!
-#
# Name of the source package
psource := omnibook-source
# The short upstream name, used for the module source directory
sname := omnibook
-### KERNEL SETUP
-### Setup the stuff needed for making kernel module packages
-### taken from /usr/share/kernel-package/sample.module.rules
-
# prefix of the target package name
PACKAGE=omnibook-module
-# modifieable for experiments or debugging m-a
-MA_DIR ?= /usr/share/modass
-# load generic variable handling
--include $(MA_DIR)/include/generic.make
-# load default rules, including kdist, kdist_image, ...
--include $(MA_DIR)/include/common-rules.make
-
-# module assistant calculates all needed things for us and sets
-# following variables:
-# KSRC (kernel source directory), KVERS (kernel version string), KDREV
-# (revision of the Debian kernel-image package), CC (the correct
-# compiler), VERSION (the final package version string), PKGNAME (full
-# package name with KVERS included), DEB_DESTDIR (path to store DEBs)
-
-# The kdist_configure target is called by make-kpkg modules_config and
-# by kdist* rules by dependency. It should configure the module so it is
-# ready for compilation (mostly useful for calling configure).
-# prep-deb-files from module-assistant creates the neccessary debian/ files
-kdist_config: prep-deb-files
-
-# the kdist_clean target is called by make-kpkg modules_clean and from
-# kdist* rules. It is responsible for cleaning up any changes that have
-# been made by the other kdist_commands (except for the .deb files created)
-kdist_clean:
- -$(MAKE) KSRC=$(KSRC) clean
- dh_clean
-#
+
### end KERNEL SETUP
configure: configure-stamp
dh_testdir
touch build-arch-stamp
-#k = $(shell echo $(KVERS) | grep -q ^2.6 && echo k)
-
-# the binary-modules rule is invoked by module-assistant while processing the
-# kdist* targets. It is called by module-assistant or make-kpkg and *not*
-# during a normal build
-binary-modules: prep-deb-files
- dh_testroot
- dh_clean -k
- dh_installdirs lib/modules/$(KVERS)/extra
-
- # Build the module
- #$(MAKE) -C drivers KERNEL_DIR=$(KSRC) KVERS=$(KVERS)
- $(MAKE) KSRC=$(KSRC) KVERS=$(KVERS)
-
- # Install the module
- $(MAKE) install KSRC=$(KSRC) DESTDIR=$(CURDIR)/debian/$(PKGNAME) INSTDIR=extra DEPMOD=""
-
- dh_installdocs
- dh_installchangelogs
- dh_compress
- dh_fixperms
- dh_installdeb
- dh_gencontrol -- -v$(VERSION)
- dh_md5sums
- dh_builddeb --destdir=$(DEB_DESTDIR)
- dh_clean -k
-
-build-indep: configure-stamp build-indep-stamp
+build-indep: patch configure-stamp build-indep-stamp
build-indep-stamp:
dh_testdir
touch build-indep-stamp
-build: build-arch build-indep
+build: patch build-arch build-indep
-clean:
+clean: unpatch
dh_testdir
- #dh_testroot
rm -f build-arch-stamp build-indep-stamp configure-stamp
dh_clean
install: DH_OPTIONS=
-install: build
+install: patch build
dh_testdir
dh_testroot
dh_clean -k
# Create the directories to install the source into
dh_installdirs -p$(psource) usr/src/modules/$(sname)/debian
-
cp debian/compat debian/rules debian/changelog \
- debian/copyright debian/control \
+ debian/control debian/copyright debian/*.modules.in \
debian/$(psource)/usr/src/modules/$(sname)/debian
- cp debian/*.modules.in debian/$(psource)/usr/src/modules/$(sname)/debian
+ cp Makefile *.c *.h *.lds debian/$(psource)/usr/src/modules/$(sname)
- cp Makefile *.c *.h *.lds debian/$(psource)/usr/src/modules/$(sname)/
-
cd debian/$(psource)/usr/src && tar c modules | gzip -9 > $(sname).tar.gz && rm -rf modules
-
dh_install
# Build architecture-independent files here.
dh_installchangelogs -i doc/ChangeLog
dh_installdocs -i
dh_installexamples -i
-# dh_install -i
-# dh_installmenu -i
-# dh_installdebconf -i
-# dh_installlogrotate -i
-# dh_installemacsen -i
-# dh_installpam -i
-# dh_installmime -i
-# dh_installinit -i
-# dh_installcron -i
-# dh_installinfo -i
dh_installman -i
dh_link -i
dh_compress -i
dh_fixperms -i
dh_installdeb -i
-# dh_perl -i
-# dh_python -i
-# dh_makeshlibs -i
dh_installdeb -i
dh_shlibdeps -i
dh_gencontrol -i
dh_md5sums -i
dh_builddeb -i
-
+
# Build architecture-dependent files here.
binary-arch: build install
+# modifieable for experiments or debugging m-a
+MA_DIR ?= /usr/share/modass
+# load generic variable handling
+-include $(MA_DIR)/include/generic.make
+# load default rules, including kdist, kdist_image, ...
+-include $(MA_DIR)/include/common-rules.make
+
+ifndef KPKG_STEM
+STEM:=kernel
+else
+STEM:=${KPKG_STEM}
+endif
+
+kdist_clean: prep-deb-files
+ -$(MAKE) KSRC=$(KSRC) clean
+ dh_clean
+
+kdist_config: prep-deb-files
+ sed -i -e 's/_STEM_/$(STEM)/g' debian/control
+
+binary-modules: kdist_config prep-deb-files
+ dh_testroot
+ dh_clean -k
+ dh_installdirs lib/modules/$(KVERS)/extra
+
+ # Build the module
+ $(MAKE) KSRC=$(KSRC) KVERS=$(KVERS)
+
+ # Install the module
+ $(MAKE) install KSRC=$(KSRC) DESTDIR=$(CURDIR)/debian/$(PKGNAME) INSTDIR=extra DEPMOD=""
+
+ dh_installdocs
+ dh_compress
+ dh_installchangelogs
+ dh_fixperms
+ dh_installdeb
+ dh_gencontrol -- -v$(VERSION)
+ dh_md5sums
+ dh_builddeb --destdir=$(DEB_DESTDIR)
+ dh_clean -k
+
binary: binary-indep binary-arch
.PHONY: build clean binary-indep binary-arch binary install configure binary-modules kdist kdist_config kdist_image kdist_clean
git://gitweb.devoid-pointer.net / omnibook.git / commitdiff