The following commit has been merged in the master branch:
commit e550fa27f28e5c5c400885fcc582b829e8cd9ce7
Author: M. Hamish Bowman <hamis...@yahoo.com>
Date:   Sat Feb 25 16:05:14 2012 +1300

    adjust to current file list, try for fix of gui removal from core pkg

diff --git a/debian/fixscripts.sh b/debian/fixscripts.sh
index 188faa7..2e9a052 100755
--- a/debian/fixscripts.sh
+++ b/debian/fixscripts.sh
@@ -44,7 +44,8 @@ for x in etc/dm/cmd.tcl \
     etc/dm/menu.tcl \
     etc/dm/print.tcl \
     etc/dm/raster.tcl \
-    etc/dm/tool.tcl \
+    etc/dm/tool1.tcl \
+    etc/dm/tool2.tcl \
     etc/dm/tree.tcl \
     etc/dm/vector.tcl \
     etc/epsg_option.tcl \
@@ -70,15 +71,14 @@ for x in etc/dm/cmd.tcl \
     etc/nviz2.2/scripts/panel_lights.tcl \
     etc/nviz2.2/scripts/panel_main.tcl \
     etc/nviz2.2/scripts/panel_pos.tcl \
-    etc/nviz2.2/scripts/panel_query.tcl \
-    etc/nviz2.2/scripts/panel_query_orig.tcl \
-    etc/nviz2.2/scripts/panel_query_pg.tcl \
+    etc/nviz2.2/scripts/panel_rquery.tcl \
     etc/nviz2.2/scripts/panel_scale.tcl \
     etc/nviz2.2/scripts/panel_sdiff.tcl \
     etc/nviz2.2/scripts/panel_site.tcl \
     etc/nviz2.2/scripts/panel_surf.tcl \
     etc/nviz2.2/scripts/panel_tst.tcl \
     etc/nviz2.2/scripts/panel_vect.tcl \
+    etc/nviz2.2/scripts/panel_vquery.tcl \
     etc/nviz2.2/scripts/panel_vol.tcl \
     etc/nviz2.2/scripts/position_procs.tcl \
     etc/nviz2.2/scripts/queue.tcl \
diff --git a/debian/rules b/debian/rules
index ac43fec..90c70ac 100755
--- a/debian/rules
+++ b/debian/rules
@@ -164,19 +164,6 @@ install: build
        # delete extra license files
        rm -f debian/tmp/usr/lib/$(BASE_NAME)/bwidget/LICENSE.txt
 
-       # delete duplicated grass-gui stuff from grass-core package
-       for COMPONENT in bwidget \
-               etc/dm \
-               etc/form \
-               etc/gm \
-               etc/gtcltk \
-               etc/gui \
-               etc/nviz2.2 \
-               etc/v.digit \
-               etc/wxpython ; do
-               rm -rf debian/$(PKG_NAME)-core/usr/lib/$(BASE_NAME)/$COMPONENT
-       done
-
        # delete python compiled files
        rf -f debian/tmp/usr/lib/$(BASE_NAME)/etc/python/grass/lib/*.pyc
        # ..FIXME..: rebuild the .pyc anew in postinst
@@ -269,6 +256,18 @@ binary-arch: install
        dh_installdocs  -a
        dh_installexamples  -a
        dh_install -a
+       # delete duplicated grass-gui stuff from grass-core package
+       for COMPONENT in bwidget \
+               etc/dm \
+               etc/form \
+               etc/gm \
+               etc/gtcltk \
+               etc/gui \
+               etc/nviz2.2 \
+               etc/v.digit \
+               etc/wxpython ; do \
+               rm -rf 
debian/$(PKG_NAME)-core/usr/lib/$(BASE_NAME)/$$COMPONENT; \
+       done
        dh_installmenu -a
        dh_installman -p$(PKG_NAME) debian/$(BASE_NAME).1 -a
        dh_link -a

-- 
Geographic Resources Analysis Support System

_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

Reply via email to