The following commit has been merged in the master branch:
commit 02a1fe56bb113c464d990c87eb34b03b988c2de1
Author: Pirmin Kalberer <p...@sourcepole.ch>
Date:   Mon Jul 9 23:37:58 2012 +0200

    Build updates for upstream version 1.0.0

diff --git a/debian/changelog b/debian/changelog
index b65a806..1b03afd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+tinyows (1.0.0-1) unstable; urgency=low
+
+  * New upstream release
+  * Updated patches for 1.0.0 
+  * Use of quilt instead of simple-patchsys
+
+ -- Pirmin Kalberer <pi_...@sourcepole.ch>  Mon, 09 Jul 2012 21:55:42 +0200
+
 tinyows (0.9.0-4) unstable; urgency=low
 
   * Set Vcs-* fields.
diff --git a/debian/patches/01_update_makefile_in.diff 
b/debian/patches/01_update_makefile_in.diff
deleted file mode 100644
index e643d6a..0000000
--- a/debian/patches/01_update_makefile_in.diff
+++ /dev/null
@@ -1,51 +0,0 @@
---- tinyows-0.7.1.orig/Makefile.in
-+++ tinyows-0.7.1/Makefile.in
-@@ -11,7 +11,12 @@
- XML2_LIB=@XML2_LIB@
- XMLFLAGS=$(XML2_INC) $(XML2_LIB)
- # install path
--PREFIX=@prefix@
-+#PREFIX=@prefix@
-+PREFIX=$(DESTDIR)
-+SHARE_PREFIX=/usr/share/tinyows
-+BIN_PREFIX=/usr/lib/cgi-bin
-+CONF_PREFIX=/etc
-+CONF_FILE=$(CONF_PREFIX)/tinyows.xml
- 
- SRC = $(wildcard src/*/*.c)
- 
-@@ -30,25 +35,22 @@
-       @rm -f test/config.xml test/install.sh
- 
- install:
--      @echo "-----"
--      @echo "TinyOWS Schema install dir in $(PREFIX)/tinyows/schema"
--      mkdir -p $(PREFIX)/tinyows
--      cp -rf schema $(PREFIX)/tinyows/
--      @echo "-----"
--      @echo "Now:"
--      @echo " 1) copy 'tinyows' binary to cgi-bin directory"
--      @echo " 2) - put a workable config.xml file in $(PREFIX) dir"
--      @echo "    - OR launch 'make install-demo' as a superuser"
-+      mkdir -p $(PREFIX)/$(SHARE_PREFIX)
-+      cp -rf schema $(PREFIX)/$(SHARE_PREFIX)
-+      cp -f tinyows $(PREFIX)/$(BIN_PREFIX)
-+#     copy config.xml file to /etc/tinyows.xml
-+      mkdir -p $(PREFIX)/$(CONF_PREFIX)
-+      cp -f demo/config.xml $(PREFIX)/$(CONF_FILE)
- 
- install-demo:
-       @chmod +x demo/install.sh
-       @demo/install.sh
--      cp -i demo/config.xml $(PREFIX)/tinyows
-+      cp -i demo/config.xml $(CONF_FILE)
- 
- install-test:
-       @chmod +x test/install.sh
-       @test/install.sh
--      cp -i test/config.xml $(PREFIX)/tinyows
-+      cp -i test/config.xml $(CONF_FILE)
- 
- doc-clean:
-       @rm -rf doc/doxygen
-
diff --git a/debian/patches/02_update_ows_define_h_for_config_xml_path.diff 
b/debian/patches/02_update_ows_define_h_for_config_xml_path.diff
deleted file mode 100644
index 2421dd5..0000000
--- a/debian/patches/02_update_ows_define_h_for_config_xml_path.diff
+++ /dev/null
@@ -1,12 +0,0 @@
---- tinyows-0.7.1.orig/src/ows_define.h.in
-+++ tinyows-0.7.1/src/ows_define.h.in
-@@ -30,7 +30,7 @@
- #define OWS_DEBUG
- #endif
- 
--#define OWS_CONFIG_FILE_PATH        "@prefix@/tinyows/config.xml"
-+#define OWS_CONFIG_FILE_PATH        "/etc/tinyows.xml"
- 
- #define WFS_SCHEMA_100_BASIC        "wfs/1.0.0/WFS-basic.xsd"
- #define WFS_SCHEMA_100_TRANS        "wfs/1.0.0/WFS-transaction.xsd"
-
diff --git a/debian/patches/03_update_demo_config_xml.diff 
b/debian/patches/03_update_demo_config_xml.diff
deleted file mode 100644
index b284856..0000000
--- a/debian/patches/03_update_demo_config_xml.diff
+++ /dev/null
@@ -1,10 +0,0 @@
---- tinyows-0.7.1.orig/demo/config.xml.in
-+++ tinyows-0.7.1/demo/config.xml.in
-@@ -1,5 +1,5 @@
- <tinyows online_resource="http://127.0.0.1/cgi-bin/tinyows";
--       schema_dir="@prefix@/tinyows/schema/">
-+       schema_dir="/usr/share/tinyows/schema/">
- 
-   <pg host="127.0.0.1" user="postgres" password="postgres" 
dbname="tinyows_demo" port="5432"/>
-
-
diff --git a/debian/patches/04_update_test_config_xml.diff 
b/debian/patches/04_update_test_config_xml.diff
deleted file mode 100644
index b285f42..0000000
--- a/debian/patches/04_update_test_config_xml.diff
+++ /dev/null
@@ -1,12 +0,0 @@
---- tinyows-0.7.1.orig/test/config.xml.in
-+++ tinyows-0.7.1/test/config.xml.in
-@@ -3,7 +3,7 @@
- <!-- BEGIN configuration -->
- <tinyows
-   online_resource="http://127.0.0.1/cgi-bin/tinyows";
--  schema_dir="@prefix@/tinyows/schema/">
-+  schema_dir="/usr/share/tinyows/schema/">
- 
-   <pg 
-     host="127.0.0.1" 
-
diff --git a/debian/patches/liborder b/debian/patches/liborder
new file mode 100644
index 0000000..1b2908e
--- /dev/null
+++ b/debian/patches/liborder
@@ -0,0 +1,13 @@
+Index: tinyows-1.0.0/Makefile.in
+===================================================================
+--- tinyows-1.0.0.orig/Makefile.in     2012-07-09 23:28:55.889273987 +0200
++++ tinyows-1.0.0/Makefile.in  2012-07-09 23:29:43.477275074 +0200
+@@ -25,7 +25,7 @@
+ SRC=src/fe/fe_comparison_ops.c src/fe/fe_error.c src/fe/fe_filter.c 
src/fe/fe_filter_capabilities.c src/fe/fe_function.c src/fe/fe_logical_ops.c 
src/fe/fe_spatial_ops.c src/mapfile/mapfile.c src/ows/ows_bbox.c src/ows/ows.c 
src/ows/ows_config.c src/ows/ows_error.c src/ows/ows_geobbox.c 
src/ows/ows_get_capabilities.c src/ows/ows_layer.c src/ows/ows_metadata.c 
src/ows/ows_psql.c src/ows/ows_request.c src/ows/ows_srs.c 
src/ows/ows_storage.c src/ows/ows_version.c src/struct/alist.c 
src/struct/array.c src/struct/buffer.c src/struct/cgi_request.c 
src/struct/list.c src/struct/mlist.c src/struct/regexp.c src/wfs/wfs_describe.c 
src/wfs/wfs_error.c src/wfs/wfs_get_capabilities.c src/wfs/wfs_get_feature.c 
src/wfs/wfs_request.c src/wfs/wfs_transaction.c src/ows/ows_libxml.c
+ 
+ all:
+-      $(CC) $(CFLAGS) $(PGFLAGS) $(XMLFLAGS) $(FCGIFLAGS) $(SVN_FLAGS) $(SRC) 
-o tinyows -lfl
++      $(CC) $(CFLAGS) $(POSTGIS_INC) $(XML2_INC) $(FCGI_INC) $(SVN_FLAGS) 
$(SRC) -o tinyows -lfl $(POSTGIS_LIB) $(XML2_LIB) $(FCGI_LIB)
+       @rm -rf tinyows.dSYM
+ 
+ flex:
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..fd1b72b
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+liborder
diff --git a/debian/rules b/debian/rules
index d1fb605..c7eb1b6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,7 +3,7 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/quilt/quilt.make
 
 PACKAGE := $(shell dpkg-parsechangelog | sed -n 's/^Source: //p')
 VERSION := $(shell dpkg-parsechangelog | sed -ne 's/^Version: \(.*\)-.*/\1/p')
@@ -16,13 +16,14 @@ configure: configure-stamp
 configure-stamp:
        dh_testdir
 #      Add here commands to configure the package.
-       autoconf -o $(CURDIR)/configure $(CURDIR)/configure.in && 
$(CURDIR)/configure
+       autoconf -o $(CURDIR)/configure $(CURDIR)/configure.in
+       $(CURDIR)/configure --prefix=/usr 
--with-shp2pgsql=/usr/lib/postgresql/9.1/bin/shp2pgsql
        touch configure-stamp
 
 
 build: build-stamp
 
-build-stamp: configure-stamp  
+build-stamp:$(QUILT_STAMPFN) configure-stamp
        dh_testdir
 
 #      Add here commands to compile the package.
@@ -31,7 +32,7 @@ build-stamp: configure-stamp
 
        touch $@
 
-clean::
+clean: unpatch
        dh_testdir
        dh_testroot
        rm -f build-stamp configure-stamp
@@ -48,7 +49,11 @@ install: build
        dh_installdirs
 
 #      Add here commands to install the package into debian/tinyows.
-       $(MAKE) DESTDIR=$(CURDIR)/debian/tinyows install
+       #make install does almost nothing, so we do it here
+       #$(MAKE) DESTDIR=$(CURDIR)/debian/tinyows install
+       cp $(CURDIR)/tinyows $(CURDIR)/debian/tinyows/usr/lib/cgi-bin/
+       mkdir -p $(CURDIR)/debian/tinyows/usr/share/tinyows
+       cp -rf schema $(CURDIR)/debian/tinyows/usr/share/tinyows/
 #      copy demo & test files
        cp -r $(CURDIR)/demo/ $(CURDIR)/debian/tinyows/usr/share/tinyows/
        cp -r $(CURDIR)/test/ $(CURDIR)/debian/tinyows/usr/share/tinyows/

-- 
A simple WFS-T server

_______________________________________________
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