[pkg-tpctl-commits] r91 - thinkpad/trunk/debian

Sun Jul 30 19:03:15 UTC 2006

Author: madduck
Date: 2006-07-30 19:03:15 +0000 (Sun, 30 Jul 2006)
New Revision: 91

Added:
   thinkpad/trunk/debian/compat
Modified:
   thinkpad/trunk/debian/changelog
   thinkpad/trunk/debian/rules
   thinkpad/trunk/debian/rules.modules
Log:
move to 6.0 upstream code
try to clean up and fix up, but still does not properly build modules
see email to mailing list, calling out to blade for m-a help.


Modified: thinkpad/trunk/debian/changelog
===================================================================

--- thinkpad/trunk/debian/changelog	2006-07-30 16:53:25 UTC (rev 90)
+++ thinkpad/trunk/debian/changelog	2006-07-30 19:03:15 UTC (rev 91)
@@ -1,8 +1,9 @@
-thinkpad (5.9-3) UNRELEASED; urgency=low
+thinkpad (6.0-1) UNRELEASED; urgency=low
 
   [ martin f. krafft ]
   * Taking over the package, thanks Thomas for your work!
   * Acknowledging the NMU (closes: #364235).
+  * New upstream release.
   * Removing the suggestion by thinkpad-base for devfsd which is deprecated.
   * Changing the virtual package name used by modules packages to
     thinkpad5-modules.

Added: thinkpad/trunk/debian/compat
===================================================================
--- thinkpad/trunk/debian/compat	2006-07-30 16:53:25 UTC (rev 90)
+++ thinkpad/trunk/debian/compat	2006-07-30 19:03:15 UTC (rev 91)
@@ -0,0 +1 @@
+5

Modified: thinkpad/trunk/debian/rules
===================================================================
--- thinkpad/trunk/debian/rules	2006-07-30 16:53:25 UTC (rev 90)
+++ thinkpad/trunk/debian/rules	2006-07-30 19:03:15 UTC (rev 91)
@@ -4,8 +4,6 @@
 # Copyright (C) 2006 Martin F. Krafft <madduck at debian.org>
 # Distributable under the terms of the GNU GPL version 2 (or later).
 
-export DH_COMPAT=5
-
 DESTDIR_SRC=debian/thinkpad-source
 DESTDIR_BASE=debian/thinkpad-base
 MODULES_TREE=modules/thinkpad
@@ -34,6 +32,7 @@
 	install -m644 $(wildcard debian/thinkpad-modules.d/*.in) $(MODULES_TREE)/debian
 	install -m644 debian/copyright $(MODULES_TREE)/debian
 	install -m644 debian/changelog $(MODULES_TREE)/debian
+	install -m644 debian/compat $(MODULES_TREE)/debian
 	install -m755 debian/rules.modules $(MODULES_TREE)/debian/rules
 	chown root.src $(MODULES_TREE)
 

Modified: thinkpad/trunk/debian/rules.modules
===================================================================
--- thinkpad/trunk/debian/rules.modules	2006-07-30 16:53:25 UTC (rev 90)
+++ thinkpad/trunk/debian/rules.modules	2006-07-30 19:03:15 UTC (rev 91)
@@ -4,18 +4,19 @@
 # Copyright (C) 2006 Martin F. Krafft <madduck at debian.org>
 # Distributable under the terms of the GNU GPL version 2 (or later).
 
-#VERSION=$(shell dpkg-parsechangelog -ldebian/changelog.source | sed -ne 's,^Version: ,,p')
+# must be before MA magic included below
+KVERS ?= $(shell uname -r)
 
-PACKAGE := madwifi-ng-modules
+PACKAGE := thinkpad-modules
 MA_DIR ?= /usr/share/modass
 -include $(MA_DIR)/include/generic.make
 # don't use common-rules because stuff's whack.
 -include $(MA_DIR)/include/common-rules.make
 
-export DH_COMPAT=5
+KTYPE  = $(shell echo $(KVERS) | sed -re 's/^([2-9]\.[0-9]).*/\1/')
+MODSUF = $(shell [ $(subst .,,$(KTYPE)) -ge 25 ] && echo -n k)o
 
 CFLAGS = -Wall -g
-
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
 	CFLAGS += -O0
 else
@@ -25,38 +26,27 @@
 SCRIPT="s!\$$DEB_MAIL!$(DEB_MAIL)!; \
         s!\$$DEB_NAME!$(DEB_NAME)!; \
 			  s!\$$VERSION!$(VERSION)!; \
+			  s!\$$KVERS!$(KVERS)!; \
 			  s!\$$DEBDATE!$(shell date -R)!;"
 
-KTYPE=$(shell echo $(KVERS) | sed -e 's/^\([2-9].[0-9]\).*/\1/' )
-#ifeq ($(KTYPE),2.6)
-#	MODSUF := ko
-#else
-#	MODSUF := o
-#endif
-
 kdist_configure: configure-stamp
 kdist_config: configure-stamp
-configure-stamp: debian/control debian/postinst debian/postrm debian/changelog
-	sed -i -e $(SCRIPT) debian/control
+configure-stamp: debian/control debian/postinst debian/postrm
+# prepend -modules snippet to changelog
+	sed -e $(SCRIPT) debian/changelog.in > debian/changelog.tmp
+	sed -ne '/^thinkpad /,$$p' debian/changelog >> debian/changelog.tmp
+	mv debian/changelog.tmp debian/changelog
 	touch $@
 
 debian/%: debian/%.in
 	sed -e $(SCRIPT) < $< > $@
 
-debian/changelog.source:
-	mv debian/changelog $@
-
-debian/changelog: debian/changelog.source
-	sed -e $(SCRIPT) < debian/changelog.in > $@
-	cat $< >> $@
-
 kdist_build: build-stamp
-build-stamp: build-modules
+build-stamp: kdist_config
+	echo "$(KVERS) $(KTYPE) $(MODSUF)"
+	$(MAKE) -C $(KTYPE)/drivers
 	touch $@
 
-build-modules:
-	$(MAKE) -C $(KTYPE)/drivers
-
 kdist_image: kdist_build binary-modules
 
 binary-modules: DESTDIR=debian/thinkpad-modules-$(KVERS)
@@ -64,7 +54,7 @@
 	dh_testdir
 	dh_testroot
 	install -d $(DESTDIR)/lib/modules/$(KVERS)/thinkpad
-	install -c -m 0644 $(KTYPE)/drivers/*.{,k}o $(DESTDIR)/lib/modules/$(KVERS)/thinkpad
+	install -c -m 0644 $(KTYPE)/drivers/*.$(MODSUF) $(DESTDIR)/lib/modules/$(KVERS)/thinkpad
 	rm -f $(DESTDIR)/lib/modules/$(KVERS)/thinkpad/smapi_*.$(MODSUF)
 	dh_installdocs
 	dh_installchangelogs
@@ -80,13 +70,15 @@
 
 kdist_clean: kdist_configure
 	dh_clean
-	$(MAKE) $(MFLAGS) clean
+	$(MAKE) clean
 	rm -f configure-stamp build-stamp
-	mv debian/changelog.source debian/changelog
 	rm -f debian/control debian/postinst debian/postrm
+# remove -modules snippet from changelog
+	sed -ne '/^thinkpad /,$$p' debian/changelog > debian/changelog.tmp
+	mv debian/changelog.tmp debian/changelog
 
 #kdist_image: kdist_configure
-#	$(ROOT_CMD) $(MAKE) $(MFLAGS) -f debian/rules binary-modules
+#	$(ROOT_CMD) $(MAKE) $(MAKEFLAGS) -f debian/rules binary-modules
 #
 #kdist_changes: kdist_image
 #	dpkg-genchanges -b -e"$(KMAINT) <$(KEMAIL)>" -u"$(KSRC)/.." > $(CHFILE)


