[Pkg-mysql-commits] r1087 - in branches/sid-5.0: . debian

[Monty Taylor]

Author: mtaylor-guest
Date: 2007-12-18 11:45:09 +0000 (Tue, 18 Dec 2007)
New Revision: 1087

Modified:
   branches/sid-5.0/
   branches/sid-5.0/debian/changelog
   branches/sid-5.0/debian/rules
Log:
* Added --with-system-type to set the version_compile_os field.
* Cleaned up some lintian warnings.


Property changes on: branches/sid-5.0
___________________________________________________________________
Name: bzr:revision-info
   + timestamp: 2007-12-18 09:44:02.279999971 -0200
committer: Monty Taylor <monty at inaugust.com>
properties: 
	branch-nick: sid-5.0

Name: bzr:file-ids
   + 
Name: bzr:revision-id:v3-trunk0
   + 573 monty at inaugust.com-20071218114402-ha62jkp6rkc8x4oy


Modified: branches/sid-5.0/debian/changelog
===================================================================
--- branches/sid-5.0/debian/changelog	2007-12-18 09:01:49 UTC (rev 1086)
+++ branches/sid-5.0/debian/changelog	2007-12-18 11:45:09 UTC (rev 1087)
@@ -1,3 +1,10 @@
+mysql-dfsg-5.0 (5.0.45-6) UNRELEASED; urgency=low
+
+  * Added --with-system-type to set the version_compile_os field.
+  * Cleaned up some lintian warnings.
+
+ -- Monty Taylor <monty at inaugust.com>  Tue, 18 Dec 2007 09:41:47 -0200
+
 mysql-dfsg-5.0 (5.0.45-5) unstable; urgency=high
 
   * SECURITY:

Modified: branches/sid-5.0/debian/rules
===================================================================
--- branches/sid-5.0/debian/rules	2007-12-18 09:01:49 UTC (rev 1086)
+++ branches/sid-5.0/debian/rules	2007-12-18 11:45:09 UTC (rev 1087)
@@ -6,8 +6,7 @@
 
 include /usr/share/dpatch/dpatch.make
 
-PWD=$(shell pwd)
-TMP=$(PWD)/debian/tmp/
+TMP=$(CURDIR)/debian/tmp/
 
 ARCH = $(shell dpkg-architecture -qDEB_BUILD_ARCH)
 ARCH_OS = $(shell dpkg-architecture -qDEB_BUILD_ARCH_OS)
@@ -72,6 +71,7 @@
 		\
 		--with-server-suffix="-$(DEBVERSION)" \
 		--with-comment="(Debian)" \
+                --with-system-type="debian-linux-gnu" \
 		\
 		--enable-shared \
 		--enable-static \
@@ -136,7 +136,7 @@
 	rm -f configure-stamp
 	rm -f build-stamp
 	
-	-make clean
+	[ ! -f Makefile ] || $(MAKE) clean
 
 	# We like to see how long this is neccessary
 	@echo "CRUFT BEGIN"