[DebianGIS-dev] r1068 - packages/grass/trunk/debian

[frankie at alioth.debian.org]

Author: frankie
Date: 2007-09-10 11:24:16 +0000 (Mon, 10 Sep 2007)
New Revision: 1068

Modified:
   packages/grass/trunk/debian/changelog
   packages/grass/trunk/debian/rules
Log:
Fixes for 6.2.2-2


Modified: packages/grass/trunk/debian/changelog
===================================================================
--- packages/grass/trunk/debian/changelog	2007-09-10 09:03:14 UTC (rev 1067)
+++ packages/grass/trunk/debian/changelog	2007-09-10 11:24:16 UTC (rev 1068)
@@ -1,8 +1,14 @@
-grass (6.2.2-2) UNRELEASED; urgency=low
+grass (6.2.2-2) unstable; urgency=medium
 
   * Moved priority to optional. Thanks Ganneff.
+  * Removed --with-glw in debian/rules because GLw is not used.
+    (closes: #439506)
+  * Obsolete postgresql-dev build-dep has been removed.
+    (closes: #429969)
+  * Fixed handling of nostrip option in DEB_BUILD_OPTIONS
+    (closes: #437105)
 
- -- Francesco Paolo Lovergine <frankie at debian.org>  Mon, 23 Jul 2007 17:54:46 +0200
+ -- Francesco Paolo Lovergine <frankie at debian.org>  Mon, 10 Sep 2007 13:06:08 +0200
 
 grass (6.2.2-1) unstable; urgency=low
 

Modified: packages/grass/trunk/debian/rules
===================================================================
--- packages/grass/trunk/debian/rules	2007-09-10 09:03:14 UTC (rev 1067)
+++ packages/grass/trunk/debian/rules	2007-09-10 11:24:16 UTC (rev 1068)
@@ -17,7 +17,9 @@
 	CFLAGS += -O2
 endif
 ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-	INSTALL_PROGRAM += -s
+	STRIP = 
+else
+	STRIP = strip
 endif
 
 include /usr/share/dpatch/dpatch.make
@@ -40,7 +42,6 @@
                     --with-motif \
                     --with-readline \
                     --with-nls \
-                    --with-glw \
                     --with-odbc \
 		    --with-sqlite \
 		    --enable-largefile \
@@ -121,7 +122,7 @@
 	dh_installdirs
 
 	# install grass core into debian/tmp
-	$(MAKE) strip
+	$(MAKE) $(STRIP)
 	$(MAKE) install INST_DIR=$(CURDIR)/debian/tmp/usr/lib/grass \
 		PREFIX=$(CURDIR)/debian/tmp/usr/lib/grass \
 		BINDIR=$(CURDIR)/debian/tmp/usr/bin