[ogdi-dfsg] 03/19: Add DEP3 patch headers using dpatch descriptions.

Sebastiaan Couwenberg sebastic at moszumanska.debian.org
Sun Apr 3 00:13:17 UTC 2016 

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository ogdi-dfsg.

commit 3c1586ecb2270a6c7a6ae2e940169e93068a1810
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sat Apr 2 21:13:17 2016 +0200

    Add DEP3 patch headers using dpatch descriptions.
---
 debian/changelog         |  1 +
 debian/patches/endianess | 13 ++++++++-----
 debian/patches/hurd      | 33 ++++++++++++++-------------------
 debian/patches/makefile  | 27 ++++++++++++---------------
 debian/patches/shared    | 37 ++++++++++++++++++-------------------
 5 files changed, 53 insertions(+), 58 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8657d69..5750168 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,7 @@ ogdi-dfsg (3.2.0~beta2-8) UNRELEASED; urgency=medium
 
   [ Bas Couwenberg ]
   * Add gbp.conf to use pristine-tar by default.
+  * Add DEP3 patch headers using dpatch descriptions.
 
  -- Bas Couwenberg <sebastic at debian.org>  Sat, 02 Apr 2016 21:13:49 +0200
 
diff --git a/debian/patches/endianess b/debian/patches/endianess
index 058cab8..fe0e0a9 100644
--- a/debian/patches/endianess
+++ b/debian/patches/endianess
@@ -1,8 +1,11 @@
-Index: ogdi-dfsg/vpflib/include/machine.h
-===================================================================
---- ogdi-dfsg.orig/vpflib/include/machine.h	2011-05-13 16:38:03.000000000 +0200
-+++ ogdi-dfsg/vpflib/include/machine.h	2011-05-13 16:51:44.000000000 +0200
-@@ -15,10 +15,11 @@
+Description: Fix endianess definition.
+ This is a Linux specific patch.
+ A better fix would check endianess at configuration time.
+Author: Francesco Paolo Lovergine <frankie at debian.org>
+
+--- a/vpflib/include/machine.h
++++ b/vpflib/include/machine.h
+@@ -15,10 +15,11 @@ typedef struct
      long            output;
  } xBYTE_ORDER;
  
diff --git a/debian/patches/hurd b/debian/patches/hurd
index 30a5bfc..1c7841a 100644
--- a/debian/patches/hurd
+++ b/debian/patches/hurd
@@ -1,7 +1,8 @@
-Index: ogdi-dfsg/config/GNU.mak
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ ogdi-dfsg/config/GNU.mak	2011-05-13 16:52:13.000000000 +0200
+Description: Support the GNU Hurd too.
+Author: Francesco Paolo Lovergine <frankie at debian.org>
+
+--- /dev/null
++++ b/config/GNU.mak
 @@ -0,0 +1,109 @@
 +# Copyright (C) 2001 Her Majesty the Queen in Right of Canada.
 +# Permission to use, copy, modify and distribute this software and
@@ -112,11 +113,9 @@ Index: ogdi-dfsg/config/GNU.mak
 +endif
 +
 +
-Index: ogdi-dfsg/config/common.mak.in
-===================================================================
---- ogdi-dfsg.orig/config/common.mak.in	2011-05-13 16:38:03.000000000 +0200
-+++ ogdi-dfsg/config/common.mak.in	2011-05-13 16:52:13.000000000 +0200
-@@ -55,6 +55,9 @@
+--- a/config/common.mak.in
++++ b/config/common.mak.in
+@@ -55,6 +55,9 @@ TARGET = $(shell uname)
  ifeq ($(TARGET), GNU/kFreeBSD)
  TARGET = Linux
  endif
@@ -126,11 +125,9 @@ Index: ogdi-dfsg/config/common.mak.in
  endif
  
  #
-Index: ogdi-dfsg/configure
-===================================================================
---- ogdi-dfsg.orig/configure	2011-05-13 16:38:03.000000000 +0200
-+++ ogdi-dfsg/configure	2011-05-13 16:52:13.000000000 +0200
-@@ -5879,4 +5879,7 @@
+--- a/configure
++++ b/configure
+@@ -5879,4 +5879,7 @@ target=`uname`
  if test "$target" = "GNU/kFreeBSD" ; then
    target=Linux
  fi
@@ -138,11 +135,9 @@ Index: ogdi-dfsg/configure
 +  target=Linux
 +fi
  mv config/generic.mak config/$target.mak
-Index: ogdi-dfsg/configure.in
-===================================================================
---- ogdi-dfsg.orig/configure.in	2011-05-13 16:38:03.000000000 +0200
-+++ ogdi-dfsg/configure.in	2011-05-13 16:52:13.000000000 +0200
-@@ -352,4 +352,7 @@
+--- a/configure.in
++++ b/configure.in
+@@ -352,4 +352,7 @@ target=`uname`
  if test "$target" = "GNU/kFreeBSD" ; then
    target=Linux
  fi
diff --git a/debian/patches/makefile b/debian/patches/makefile
index 05dd6d9..faa2c07 100644
--- a/debian/patches/makefile
+++ b/debian/patches/makefile
@@ -1,8 +1,9 @@
-Index: ogdi-dfsg/config/generic.mak.in
-===================================================================
---- ogdi-dfsg.orig/config/generic.mak.in	2011-05-13 16:38:03.000000000 +0200
-+++ ogdi-dfsg/config/generic.mak.in	2011-05-13 16:50:19.000000000 +0200
-@@ -44,7 +44,7 @@
+Description: Removing the external/ directory which is not present in dfsg tarball.
+Author: Francesco Paolo Lovergine <frankie at debian.org>
+
+--- a/config/generic.mak.in
++++ b/config/generic.mak.in
+@@ -44,7 +44,7 @@ RPC_INCLUDES = @RPC_INCLUDES@
  
  UCB_STATICLIB = 
  
@@ -11,11 +12,9 @@ Index: ogdi-dfsg/config/generic.mak.in
  TCL_LINKLIB =
  
  #
-Index: ogdi-dfsg/makefile
-===================================================================
---- ogdi-dfsg.orig/makefile	2011-05-13 16:38:03.000000000 +0200
-+++ ogdi-dfsg/makefile	2011-05-13 16:50:19.000000000 +0200
-@@ -17,7 +17,7 @@
+--- a/makefile
++++ b/makefile
+@@ -17,7 +17,7 @@ include $(TOPDIR)/config/common.mak
  #
  # Sub-directories that need to be built
  #
@@ -24,11 +23,9 @@ Index: ogdi-dfsg/makefile
  
  ifneq ($(PROJ_SETTING),external)
  subdirs := proj $(subdirs) 
-Index: ogdi-dfsg/ogdi/makefile
-===================================================================
---- ogdi-dfsg.orig/ogdi/makefile	2011-05-13 16:38:03.000000000 +0200
-+++ ogdi-dfsg/ogdi/makefile	2011-05-13 16:50:19.000000000 +0200
-@@ -15,7 +15,7 @@
+--- a/ogdi/makefile
++++ b/ogdi/makefile
+@@ -15,7 +15,7 @@ include $(TOPDIR)/config/common.mak
  #
  # Sub-directories that need to be built
  #
diff --git a/debian/patches/shared b/debian/patches/shared
index bb3f4ed..65b1058 100644
--- a/debian/patches/shared
+++ b/debian/patches/shared
@@ -1,8 +1,13 @@
-Index: ogdi-dfsg/config/unix.mak
-===================================================================
---- ogdi-dfsg.orig/config/unix.mak	2011-05-13 16:38:03.000000000 +0200
-+++ ogdi-dfsg/config/unix.mak	2011-05-13 16:51:02.000000000 +0200
-@@ -22,9 +22,9 @@
+Description: Use SHRDGEN target on Linux arch instead of default DYNAGEN.
+ It would be better changing the building system in order to
+ generate both shared and static libraries.
+ Also changed a bit SHRDGEN target to generate standard sonames/solibs.
+ Note that upstream follows a soname libogdi.so.MAJOR.MINOR scheme.
+Author: Francesco Paolo Lovergine <frankie at debian.org>
+
+--- a/config/unix.mak
++++ b/config/unix.mak
+@@ -22,9 +22,9 @@ UNIX_DEFINE	= -Dunix
  #
  # Standard tools
  #
@@ -15,7 +20,7 @@ Index: ogdi-dfsg/config/unix.mak
  AR		= ar cr
  RM		= rm
  RMALL		= rm -rf
-@@ -93,9 +93,9 @@
+@@ -93,9 +93,9 @@ $(PROGGEN): $(OBJECTS)
  
  $(SHRDGEN): $(OBJECTS)
  	@echo Making shared library: $@
@@ -28,11 +33,9 @@ Index: ogdi-dfsg/config/unix.mak
  	@echo $@ made successfully ...
  
  $(DYNAGEN): $(OBJECTS)
-Index: ogdi-dfsg/contrib/makefile
-===================================================================
---- ogdi-dfsg.orig/contrib/makefile	2011-05-13 16:38:03.000000000 +0200
-+++ ogdi-dfsg/contrib/makefile	2011-05-13 16:51:02.000000000 +0200
-@@ -16,7 +16,7 @@
+--- a/contrib/makefile
++++ b/contrib/makefile
+@@ -16,7 +16,7 @@ include $(TOPDIR)/config/common.mak
  #
  # Sub-directories that need to be built
  #
@@ -41,10 +44,8 @@ Index: ogdi-dfsg/contrib/makefile
  
  #
  # Default target to build everything in all sub-directories
-Index: ogdi-dfsg/ogdi/c-api/makefile
-===================================================================
---- ogdi-dfsg.orig/ogdi/c-api/makefile	2011-05-13 16:38:03.000000000 +0200
-+++ ogdi-dfsg/ogdi/c-api/makefile	2011-05-13 16:51:02.000000000 +0200
+--- a/ogdi/c-api/makefile
++++ b/ogdi/c-api/makefile
 @@ -13,11 +13,7 @@
  
  TOBEGEN	= ogdi
@@ -57,10 +58,8 @@ Index: ogdi-dfsg/ogdi/c-api/makefile
  
  SOURCES = ecs_dyna.c ecsregex.c ecssplit.c \
            ecsassoc.c ecshash.c ecstile.c server.c ecsdist.c \
-Index: ogdi-dfsg/vpflib/makefile
-===================================================================
---- ogdi-dfsg.orig/vpflib/makefile	2011-05-13 16:38:03.000000000 +0200
-+++ ogdi-dfsg/vpflib/makefile	2011-05-13 16:51:02.000000000 +0200
+--- a/vpflib/makefile
++++ b/vpflib/makefile
 @@ -7,7 +7,7 @@
  #
  

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/ogdi-dfsg.git

More information about the Pkg-grass-devel mailing list