ViewMTN: Diff from [d3e224e3..] to [e03ca797..]

ViewMTN : Branches | Tags | Help | About
Revision [d3e224e3..]: Info | Browse Files | Download (tar)
The unified diff between revisions [d3e224e3..] and [e03ca797..] is displayed below. It can also be downloaded as a raw diff.
#
#
# delete "debian/README.source"
#
# rename "debian/DEV_PKG.install"
#     to "debian/ALDH.DEV_PKG.install"
#
# rename "debian/DEV_PKG.links"
#     to "debian/ALDH.DEV_PKG.links"
#
# rename "debian/DOC_PKG.doc-base.refmanual"
#     to "debian/ALDH.DOC_PKG.doc-base.refmanual"
#
# rename "debian/DOC_PKG.doc-base.usermanual"
#     to "debian/ALDH.DOC_PKG.doc-base.usermanual"
#
# rename "debian/DOC_PKG.docs"
#     to "debian/ALDH.DOC_PKG.docs"
#
# rename "debian/DOC_PKG.examples"
#     to "debian/ALDH.DOC_PKG.examples"
#
# rename "debian/LIB_PKG.docs"
#     to "debian/ALDH.LIB_PKG.docs"
#
# rename "debian/LIB_PKG.install"
#     to "debian/ALDH.LIB_PKG.install"
#
# rename "debian/README.Debian"
#     to "debian/ALDH.README.Debian"
#
# rename "debian/texttools.gpr"
#     to "debian/ALDH.LIB_NAME.gpr"
#
# add_dir "debian/source"
#
# add_file "debian/source/format"
#  content [1064dc0ce263680c076a1005f35ec906a5cf5a32]
#
# patch "debian/ALDH.LIB_NAME.gpr"
#  from [d57c604aaa5398a39a297de2915a6ef794f037f4]
#    to [f3278f3f65f7a958d5324e4ccea713d30d07ce71]
#
# patch "debian/ALDH.README.Debian"
#  from [c2e77598f4922cfa60dbf0dd27305ca876bc0e2f]
#    to [1988b0db90479494b7c9413b507c2b9583846a32]
#
# patch "debian/changelog"
#  from [987c95d336004c1c0929ee228860793b4760de0a]
#    to [c22a78011325d05966b4d612f04aa1fc8db2b84c]
#
# patch "debian/control"
#  from [02bafa6b834984cf7e5256463fa7aaf1aabca312]
#    to [a1b50e202946a9774eb6f51a73c668ec9796081f]
#
# patch "debian/rules"
#  from [e4e7db208aea62f61f16f43139a1e3a2839857fa]
#    to [81e1c706f45063369866f5cec433cad204f46b57]
#
============================================================
--- debian/source/format	1064dc0ce263680c076a1005f35ec906a5cf5a32
+++ debian/source/format	1064dc0ce263680c076a1005f35ec906a5cf5a32
@@ -0,0 +1 @@
+3.0 (quilt)
============================================================
--- debian/texttools.gpr	d57c604aaa5398a39a297de2915a6ef794f037f4
+++ debian/ALDH.LIB_NAME.gpr	f3278f3f65f7a958d5324e4ccea713d30d07ce71
@@ -1,5 +1,6 @@
---  Texttools project file for use with GCC 4.4
+--  LIB_NAME project file for use with GCC 4.4
 --  Copyright (c) 2004, 2006, 2008 Ludovic Brenta <lbrenta@debian.org>
+--  Copyright (c) 2010 Nicolas Boulenguez <nicolas.boulenguez@free.fr>
 --
 --  This program is free software; you can redistribute it and/or modify
 --  it under the terms of the GNU General Public License as published by
@@ -12,20 +13,20 @@
 --  GNU General Public License for more details.
 --
 --  This project file is designed to help build applications that use
---  Texttools.  Here is an example of how to use this project file:
+--  LIB_NAME.  Here is an example of how to use this project file:
 --
---  with "texttools";
+--  with "LIB_NAME";
 --  project Example is
 --     for Object_Dir use "obj";
 --     for Exec_Dir use ".";
 --     for Main use ("example");
 --  end Example;

-project Texttools is
-   for Source_Dirs use ("/usr/share/ada/adainclude/texttools");
-   for Library_Name use "texttools";
+project LIB_NAME is
+   for Source_Dirs use ("/usr/share/ada/adainclude/LIB_NAME");
+   for Library_Name use "LIB_NAME";
    for Library_Kind use "dynamic";
-   for Library_ALI_Dir use "/usr/lib/ada/adalib/texttools";
+   for Library_ALI_Dir use "/usr/lib/ada/adalib/LIB_NAME";
    for Library_Dir use "/usr/lib";
    for Externally_Built use "true";
-end Texttools;
+end LIB_NAME;
============================================================
--- debian/README.Debian	c2e77598f4922cfa60dbf0dd27305ca876bc0e2f
+++ debian/ALDH.README.Debian	1988b0db90479494b7c9413b507c2b9583846a32
@@ -4,31 +4,31 @@ Debian.
 This package follows the convention for Ada library packages in
 Debian.

-The separate libtexttools-dev package provide tools for
+The separate DEV_PKG package provide tools for
 programmers writing software using the library.

-The Ada source files are in /usr/share/ada/adainclude/texttools.
+The Ada source files are in /usr/share/ada/adainclude/LIB_NAME.

 The Ada library information files are in
-/usr/lib/ada/adalib/texttools.
+/usr/lib/ada/adalib/LIB_NAME.

 There is, in addition, a GNAT project file in
-/usr/share/ada/adainclude/texttools.gpr.
+/usr/share/ada/adainclude/LIB_NAME.gpr.

-Thus, there are two ways to use texttools in your programs:
+Thus, there are two ways to use LIB_NAME in your programs:

-1. gnatmake -aI/usr/share/ada/adainclude/texttools \
-            -aO/usr/lib/ada/adalib/texttools \
+1. gnatmake -aI/usr/share/ada/adainclude/LIB_NAME \
+            -aO/usr/lib/ada/adalib/LIB_NAME \
             your_main_program.adb \
-            -largs -ltexttools
+            -largs -lLIB_NAME

 2. Write a project file for your program.  Use the project file for
-   texttools as explained in the comments in the project file.
+   LIB_NAME as explained in the comments in the project file.

-The documentation and examples are provided by libtexttools-doc
-package in /usr/share/doc/libtexttools-doc.
+The documentation and examples are provided by DOC_PKG
+package in /usr/share/doc/DOC_PKG.

-The runtime debug symbols are provided by libtexttools-dbg package.
+The runtime debug symbols are provided by DBG_PKG package.

  -- Ludovic Brenta <ludovic.brenta@insalien.org>, Tue, 23 Mar 2004 08:05:13 +0100
- -- Nicolas Boulenguez <nicolas.boulenguez>, 2009/11/22
+ -- Nicolas Boulenguez <nicolas.boulenguez>, 2010/02/09
============================================================
--- debian/changelog	987c95d336004c1c0929ee228860793b4760de0a
+++ debian/changelog	c22a78011325d05966b4d612f04aa1fc8db2b84c
@@ -12,14 +12,16 @@ libtexttools (2.0.6-1) unstable; urgency
     (Vcs-Browser) used official URL.
     (Section) removed binary section inherited from source
     (Description) given each binary a distinct description
+    (Standards-Version) Updated to 3.8.4.0, no changes needed.
   * build.gpr;rules: documented -fstack-check removal
   * watch: added.
   * copyright: GPL-3 instead of GPL.
-  * rules: separated debhelper files to ease readability.
+  * rules:
+    Generated separated debhelper files: more readability, less overloadings.
     Used upstream build process, with a patch to transmit soversion.
-  * DOC_PKG.doc-base.*: added.
+  * Switch to dpkg-source 3.0 (quilt) format

- -- Nicolas Boulenguez <nicolas.boulenguez@free.fr>  Fri, 05 Feb 2010 13:03:42 +0100
+ -- Nicolas Boulenguez <nicolas.boulenguez@free.fr>  Wed, 10 Feb 2010 00:54:33 +0100

 libtexttools (2.0.5-2) unstable; urgency=low

============================================================
--- debian/control	02bafa6b834984cf7e5256463fa7aaf1aabca312
+++ debian/control	a1b50e202946a9774eb6f51a73c668ec9796081f
@@ -3,8 +3,8 @@ Uploaders: Ludovic Brenta <lbrenta@debia
 Priority: extra
 Maintainer: Nicolas Boulenguez <nicolas.boulenguez@free.fr>
 Uploaders: Ludovic Brenta <lbrenta@debian.org>
-Build-Depends: debhelper (>= 7.0.50~), ncurses-dev, gnat, gnat-4.4, quilt
-Standards-Version: 3.8.3
+Build-Depends: debhelper (>= 7.0.50~), ncurses-dev, gnat, gnat-4.4
+Standards-Version: 3.8.4.0
 Vcs-Browser: http://ada-france.org:8081/branch/changes/org.debian.texttools
 Homepage: http://www.pegasoft.ca/tt.html

============================================================
--- debian/rules	e4e7db208aea62f61f16f43139a1e3a2839857fa
+++ debian/rules	81e1c706f45063369866f5cec433cad204f46b57
@@ -57,24 +57,24 @@ DOC_PKG := lib$(LIB_NAME)-doc
 # This a trick to use debhelper automation with external files,
 # even if their names must match the package version.

-# Each file named debian/LIB_PKG.* is copied to debian/$(LIB_PKG).*
-# before any build or install (idem for DEV DOC DBG). The copy is
-# removed before any clean.  It is preprocessed in a minimalistic way:
-# each macro listed in $(ALDH_macros) is expanded.
-ALDH_macros := LIB_NAME ALIVERSION SOVERSION
+# Each file named debian/ALDH.oldname is preprocessed and renamed
+# according to these macros, before any build or install.  The
+# preprocessed file is removed before any clean.
+ALDH_macros := LIB_NAME ALIVERSION SOVERSION SONAME LIB_PKG DBG_PKG DEV_PKG DOC_PKG

+ALDH_sed := sed $(foreach macro,$(ALDH_macros),-e s/$(macro)/$($(macro))/g)
+
 define ALDH_template
 ALDH_targets += $(2)
 $(2): $(1)
-	sed $(foreach macro,$(ALDH_macros),-e s/$(macro)/$($(macro))/g) $(1) > $(2)
+	$(ALDH_sed) $(1) > $(2)
 endef # ALDH_template

 ALDH_targets :=
-$(foreach kind, LIB DEV DBG DOC, \
-  $(foreach template, $(wildcard debian/$(kind)_PKG.*), \
-    $(eval $(call ALDH_template, \
-      $(template), \
-      $(patsubst debian/$(kind)_PKG.%,debian/$($(kind)_PKG).%,$(template))))))
+$(foreach template,$(wildcard debian/ALDH.*),\
+  $(eval $(call ALDH_template,\
+    $(template),\
+    $(shell echo $(template) | $(ALDH_sed) -e s/ALDH.//))))

 build binary binary-arch binary-indep install: $(ALDH_targets)

@@ -90,9 +90,9 @@ ALDH_clean:
 # Uncomment this to turn on verbose mode.
 # export DH_VERBOSE=1

-.PHONY: patch build binary binary-arch binary-indep clean install
-patch build binary binary-arch binary-indep clean install:
-	dh --with quilt $@
+.PHONY: build binary binary-arch binary-indep clean install
+build binary binary-arch binary-indep clean install:
+	dh $@

 override_dh_compress:
 	dh_compress --all --exclude=.ads --exclude=.adb --exclude=Makefile --exclude=.c --exclude=.h --exclude=.cpp