tags 485098 = patch
thanks
On Sun, 08 Jun 2008, Ludovic Brenta wrote:
> tags 485098 wontfix
> thanks
>
> libxmlada already uses quilt, therefore the new format costs effort
> for zero benefit. I am not planning any further work on this package
> for Lenny.
Please find attached a patch for this issue. It moves the patches
directory to debian/patches and refreshes the patches to be applicable
with -p1 instead of -p0.
Cheers,
--
Raphaël Hertzog
Le best-seller français mis à jour pour Debian Etch :
http://www.ouaza.com/livre/admin-debian/
reverted:
--- libxmlada-3.0/patches/xmlada-config.patch
+++ libxmlada-3.0.orig/patches/xmlada-config.patch
@@ -1,104 +0,0 @@
-Index: xmlada-config
-===================================================================
---- /dev/null
-+++ xmlada-config
-@@ -0,0 +1,99 @@
-+#!/bin/sh
-+# xmlada-config. Generated from xmlada-config.in by configure modified by
hand for debian purpose
-+
-+cflags="-aI/usr/share/ada/adainclude/xmlada -aO/usr/lib/ada/adalib/xmlada"
-+libs="-L/usr/lib -lxmlada"
-+static_libs="/usr/lib/libxmlada.a"
-+full_libs="-lxmlada"
-+static_full_libs="/usr/lib/libxmlada.a"
-+
-+MAJOR=3
-+MINOR=0
-+
-+usage()
-+{
-+ cat <<EOF
-+Usage: xmlada-config [OPTIONS]
-+Options:
-+ No option:
-+ Output all the flags (compiler and linker) required
-+ to compiler your program
-+ [--prefix]
-+ Output the directory in which XML/Ada is installed
-+ [--version|-v]
-+ Output the version of XML/Ada
-+ [--libs]
-+ Output the linker flags to use for XML/Ada
-+ [--cflags]
-+ Output the compiler flags to use for XML/Ada
-+ [--sax]
-+ Output all the flags to usr for XML/Ada, provided
-+ you are not using the DOM module.
-+ [--static]
-+ Output all the flags (compiler and linker) required to
-+ compile a static version of your program
-+ [--static-sax]
-+ Output all the flags (compiler and linker) required to
-+ compile a static version of your program, omitting the
-+ DOM module.
-+EOF
-+}
-+
-+# Can have the following values:
-+# 0 = none
-+# 1 = cflags
-+# 2 = libs
-+# 3 = sax
-+# 4 = full
-+# 5 = static
-+output_type=full
-+while test $# -gt 0; do
-+ case "$1" in
-+ -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
-+ *) optarg= ;;
-+ esac
-+
-+ case $1 in
-+ --help|-h)
-+ usage 1>&2
-+ exit 1
-+ ;;
-+ --prefix)
-+ echo $prefix
-+ output_type=none
-+ ;;
-+ --version|-v)
-+ echo XmlAda ${MAJOR}.${MINOR}
-+ exit 0
-+ ;;
-+ --libs)
-+ output_type=libs
-+ ;;
-+ --sax)
-+ output_type=sax
-+ ;;
-+ --cflags)
-+ output_type=cflags
-+ ;;
-+ --static)
-+ output_type=static
-+ ;;
-+ --static-sax)
-+ output_type=static_sax
-+ ;;
-+ *)
-+ usage 1>&2
-+ exit 1
-+ ;;
-+ esac
-+ shift
-+done
-+
-+case $output_type in
-+ cflags) echo $cflags ;;
-+ libs) echo $libs $full_libs;;
-+ sax) echo $cflags -largs $libs ;;
-+ full) echo $cflags -largs $libs $full_libs;;
-+ static) echo $cflags -largs $static_libs $static_full_libs;;
-+ static_sax) echo $cflags -largs $static_libs ;;
-+esac
reverted:
--- libxmlada-3.0/patches/series
+++ libxmlada-3.0.orig/patches/series
@@ -1,3 +0,0 @@
-GPL.patch -p0
-info-dir-section.patch -p0
-xmlada-config.patch -p0
reverted:
--- libxmlada-3.0/patches/info-dir-section.patch
+++ libxmlada-3.0.orig/patches/info-dir-section.patch
@@ -1,16 +0,0 @@
-Index: docs/xml.texi
-===================================================================
---- docs/xml.texi.orig
-+++ docs/xml.texi
-@@ -33,6 +33,11 @@
- @c ----------------------------------------- END MACRO
-
-
[EMAIL PROTECTED] GNU Ada tools
[EMAIL PROTECTED]
-+* XMLAda: (xmlada). XML/Ada version @value{XMLVersion}.
[EMAIL PROTECTED] direntry
-+
- @titlepage
-
- @title The Ada95 Unicode and XML Library
reverted:
--- libxmlada-3.0/patches/GPL.patch
+++ libxmlada-3.0.orig/patches/GPL.patch
@@ -1,43 +0,0 @@
-Index: README
-===================================================================
---- README.orig
-+++ README
-@@ -237,14 +237,6 @@
- ================
-
- This library is distributed under the GNAT-Modified GNU Public License.
--It has the following addition to the GPL:
--
--"As a special exception, if other files instantiate generics from
-- this unit, or you link this unit with other files to produce an
-- executable, this unit does not by itself cause the resulting
-- executable to be covered by the GNU General Public License. This
-- exception does not however invalidate any other reasons why the
-- executable file might be covered by the GNU Public License."
-
- IX - BUG REPORTS
- ================
-Index: docs/xml.texi
-===================================================================
---- docs/xml.texi.orig
-+++ docs/xml.texi
-@@ -48,10 +48,15 @@
-
- Copyright @copyright{} 2003-2006, AdaCore
-
--This document may be copied, in whole or in part, in any form or by any
--means, as is or with alterations, provided that (1) alterations are clearly
--marked as alterations and (2) this copyright notice is included
--unmodified in any copy.
-+This document is free: you can redistribute it and/or modify it under
-+the terms of the GNU General Public License as published by the Free
-+Software Foundation, either version 2 of the License, or (at your
-+option) any later version.
-+
-+This document is distributed in the hope that it will be useful, but
-+WITHOUT ANY WARRANTY; without even the implied warranty of
-+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+General Public License for more details.
-
- @end titlepage
-
diff -u libxmlada-3.0/debian/changelog libxmlada-3.0/debian/changelog
--- libxmlada-3.0/debian/changelog
+++ libxmlada-3.0/debian/changelog
@@ -1,3 +1,12 @@
+libxmlada (3.0-5.1) UNRELEASED; urgency=low
+
+ * Non-maintainer upload.
+ * Move patches directory to debian/patches and adjust build system
+ accordingly to be compatible with new source format 3.0 (quilt).
+ Closes: #485098
+
+ -- Raphael Hertzog <[EMAIL PROTECTED]> Mon, 16 Jun 2008 22:24:10 +0200
+
libxmlada (3.0-5) unstable; urgency=low
* Tighten build-dependency on gnat-4.3 due to bug fixes in libgnat that
diff -u libxmlada-3.0/debian/rules libxmlada-3.0/debian/rules
--- libxmlada-3.0/debian/rules
+++ libxmlada-3.0/debian/rules
@@ -32,10 +32,9 @@
file_to_spec := -e 's!.*/(.+)\.ads!\1!' -e 's!-!.!g'
-build: checks patch build-stamp
+include /usr/share/quilt/quilt.make
-patch:
- -quilt push -a
+build: checks patch build-stamp
build-stamp: libxmlada.a libxmlada.so.$(MAJOR) doc xmlada-config
touch build-stamp
@@ -67,10 +66,9 @@
checks:
dh_testdir
-clean:
+clean: unpatch
dh_testdir
dh_testroot
- -quilt pop -a
rm -f build-stamp libxmlada* build_xmlada.adb
rm -f $(foreach f,$(FORMATS),docs/xmlada.$(f))
rm -f $(foreach extension,pg ky tp vr fn log pdf,docs/xml.$(extension))
only in patch2:
unchanged:
--- libxmlada-3.0.orig/debian/patches/series
+++ libxmlada-3.0/debian/patches/series
@@ -0,0 +1,3 @@
+GPL.patch
+info-dir-section.patch
+xmlada-config.patch
only in patch2:
unchanged:
--- libxmlada-3.0.orig/debian/patches/xmlada-config.patch
+++ libxmlada-3.0/debian/patches/xmlada-config.patch
@@ -0,0 +1,102 @@
+--- /dev/null
++++ libxmlada-3.0/xmlada-config
+@@ -0,0 +1,99 @@
++#!/bin/sh
++# xmlada-config. Generated from xmlada-config.in by configure modified by
hand for debian purpose
++
++cflags="-aI/usr/share/ada/adainclude/xmlada -aO/usr/lib/ada/adalib/xmlada"
++libs="-L/usr/lib -lxmlada"
++static_libs="/usr/lib/libxmlada.a"
++full_libs="-lxmlada"
++static_full_libs="/usr/lib/libxmlada.a"
++
++MAJOR=3
++MINOR=0
++
++usage()
++{
++ cat <<EOF
++Usage: xmlada-config [OPTIONS]
++Options:
++ No option:
++ Output all the flags (compiler and linker) required
++ to compiler your program
++ [--prefix]
++ Output the directory in which XML/Ada is installed
++ [--version|-v]
++ Output the version of XML/Ada
++ [--libs]
++ Output the linker flags to use for XML/Ada
++ [--cflags]
++ Output the compiler flags to use for XML/Ada
++ [--sax]
++ Output all the flags to usr for XML/Ada, provided
++ you are not using the DOM module.
++ [--static]
++ Output all the flags (compiler and linker) required to
++ compile a static version of your program
++ [--static-sax]
++ Output all the flags (compiler and linker) required to
++ compile a static version of your program, omitting the
++ DOM module.
++EOF
++}
++
++# Can have the following values:
++# 0 = none
++# 1 = cflags
++# 2 = libs
++# 3 = sax
++# 4 = full
++# 5 = static
++output_type=full
++while test $# -gt 0; do
++ case "$1" in
++ -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
++ *) optarg= ;;
++ esac
++
++ case $1 in
++ --help|-h)
++ usage 1>&2
++ exit 1
++ ;;
++ --prefix)
++ echo $prefix
++ output_type=none
++ ;;
++ --version|-v)
++ echo XmlAda ${MAJOR}.${MINOR}
++ exit 0
++ ;;
++ --libs)
++ output_type=libs
++ ;;
++ --sax)
++ output_type=sax
++ ;;
++ --cflags)
++ output_type=cflags
++ ;;
++ --static)
++ output_type=static
++ ;;
++ --static-sax)
++ output_type=static_sax
++ ;;
++ *)
++ usage 1>&2
++ exit 1
++ ;;
++ esac
++ shift
++done
++
++case $output_type in
++ cflags) echo $cflags ;;
++ libs) echo $libs $full_libs;;
++ sax) echo $cflags -largs $libs ;;
++ full) echo $cflags -largs $libs $full_libs;;
++ static) echo $cflags -largs $static_libs $static_full_libs;;
++ static_sax) echo $cflags -largs $static_libs ;;
++esac
only in patch2:
unchanged:
--- libxmlada-3.0.orig/debian/patches/info-dir-section.patch
+++ libxmlada-3.0/debian/patches/info-dir-section.patch
@@ -0,0 +1,14 @@
+--- libxmlada-3.0.orig/docs/xml.texi
++++ libxmlada-3.0/docs/xml.texi
+@@ -33,6 +33,11 @@
+ @c ----------------------------------------- END MACRO
+
+
[EMAIL PROTECTED] GNU Ada tools
[EMAIL PROTECTED]
++* XMLAda: (xmlada). XML/Ada version @value{XMLVersion}.
[EMAIL PROTECTED] direntry
++
+ @titlepage
+
+ @title The Ada95 Unicode and XML Library
only in patch2:
unchanged:
--- libxmlada-3.0.orig/debian/patches/GPL.patch
+++ libxmlada-3.0/debian/patches/GPL.patch
@@ -0,0 +1,39 @@
+--- libxmlada-3.0.orig/README
++++ libxmlada-3.0/README
+@@ -237,14 +237,6 @@ VIII - LICENSING
+ ================
+
+ This library is distributed under the GNAT-Modified GNU Public License.
+-It has the following addition to the GPL:
+-
+-"As a special exception, if other files instantiate generics from
+- this unit, or you link this unit with other files to produce an
+- executable, this unit does not by itself cause the resulting
+- executable to be covered by the GNU General Public License. This
+- exception does not however invalidate any other reasons why the
+- executable file might be covered by the GNU Public License."
+
+ IX - BUG REPORTS
+ ================
+--- libxmlada-3.0.orig/docs/xml.texi
++++ libxmlada-3.0/docs/xml.texi
+@@ -48,10 +48,15 @@ Copyright @copyright{} 2000-2002, Emmanu
+
+ Copyright @copyright{} 2003-2006, AdaCore
+
+-This document may be copied, in whole or in part, in any form or by any
+-means, as is or with alterations, provided that (1) alterations are clearly
+-marked as alterations and (2) this copyright notice is included
+-unmodified in any copy.
++This document is free: you can redistribute it and/or modify it under
++the terms of the GNU General Public License as published by the Free
++Software Foundation, either version 2 of the License, or (at your
++option) any later version.
++
++This document is distributed in the hope that it will be useful, but
++WITHOUT ANY WARRANTY; without even the implied warranty of
++MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++General Public License for more details.
+
+ @end titlepage
+
