Преглед изворни кода

- finish job of Removing old outdated Debian configuration files (https://trac.osgeo.org/grass/changeset/25027)
- can't checkout over the top of a dir already in svn control


git-svn-id: https://svn.osgeo.org/grass/grass/trunk@34020 15284696-431f-4ddb-bdfa-cd5b030d7da7

Hamish Bowman пре 16 година
родитељ
комит
3711dc160e
3 измењених фајлова са 5 додато и 24 уклоњено
  1. 5 2
      debian/README.debian
  2. 0 1
      debian/patches/00list
  3. 0 21
      debian/patches/htmlgen-fakeroot.dpatch

+ 5 - 2
debian/README.debian

@@ -1,14 +1,17 @@
 # For preparing GRASS Debian package run
 
-svn co svn://svn.debian.org/pkg-grass/packages/grass/branches/6.3/debian .
+svn co svn://svn.debian.org/pkg-grass/packages/grass/branches/6.3/debian debiangis
+mv debiangis/* .
 
 # in this directory. It will download latest debian configuration files
 # from debian Subversion server (http://svn.debian.org).
+# The grass debian/ dir is under SVN control so you can't just checkout over
+# the top of it from another repo. 
 
 # After that, you can build current version of GRASS with
 
 dpkg-buildpackage -rfakeroot
-  or
+#  or
 debuild binary
 
 # in main GRASS source directory. After the packages are generated, you can

+ 0 - 1
debian/patches/00list

@@ -1 +0,0 @@
-htmlgen-fakeroot

+ 0 - 21
debian/patches/htmlgen-fakeroot.dpatch

@@ -1,21 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## htmlgen-fakeroot.dpatch by  <debian@adkgis.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: use fakeroot to avoid weird stat/permission problem when
-## DP: building under pbuilder. This was preventing most man
-## DP: pages from being built.
-
-@DPATCH@
-diff -urNad grass-5.7.0+6.0.0beta2/include/Make/Html.make /tmp/dpep.bOaT9i/grass-5.7.0+6.0.0beta2/include/Make/Html.make
---- grass6/include/Make/Html.make	2007-10-05 13:14:23.000000000 +0200
-+++ grass6/include/Make/Html.make.new	2007-10-05 13:13:00.000000000 +0200
-@@ -34,7 +34,7 @@
- 	GISBASE=$(RUN_GISBASE) \
- 	PATH="$(BIN):$$PATH" \
- 	$(LD_LIBRARY_PATH_VAR)="$(BIN):$(ARCH_LIBDIR):$($(LD_LIBRARY_PATH_VAR))" \
--	LC_ALL=C $(1) --html-description < /dev/null | grep -v '</body>\|</html>' > $(PGM).tmp.html ; true
-+	LC_ALL=C fakeroot $(1) --html-description < /dev/null | grep -v '</body>\|</html>' > $(PGM).tmp.html ; true
- 
- $(HTMLDIR)/$(PGM).html: $(HTMLSRC)
- 	if [ "$(HTMLSRC)" != "" ] ; then $(call htmldesc,$<) ; fi