[suitesparse] 01/01: Regenerate debian/control from the clean rule (instead of using a dedicated target).

Sébastien Villemot sebastien at debian.org
Tue Mar 25 19:26:02 UTC 2014


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

sebastien pushed a commit to branch master
in repository suitesparse.

commit df8047431fa1a02b673ae6fae19b743780eee96a
Author: Sébastien Villemot <sebastien at debian.org>
Date:   Tue Mar 25 20:23:01 2014 +0100

    Regenerate debian/control from the clean rule (instead of using a dedicated target).
    
    This seems acceptable, since it's done in gnome-pkg-tools.
---
 debian/changelog |  8 ++++++++
 debian/control   |  5 +++++
 debian/rules     | 19 +++++++++++++------
 3 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b320737..47920e7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+suitesparse (1:4.2.1-4) UNRELEASED; urgency=medium
+
+  * Regenerate debian/control from the clean rule (instead of using a
+    dedicated target). This seems acceptable, since it's done in
+    gnome-pkg-tools.
+
+ -- Sébastien Villemot <sebastien at debian.org>  Tue, 25 Mar 2014 20:22:11 +0100
+
 suitesparse (1:4.2.1-3) unstable; urgency=low
 
   * Upload to unstable.
diff --git a/debian/control b/debian/control
index bdfec68..53242c4 100644
--- a/debian/control
+++ b/debian/control
@@ -1,3 +1,8 @@
+# This file is autogenerated. DO NOT EDIT!
+#
+# Modifications should be made to debian/control.in instead.
+# This file is regenerated automatically in the clean target.
+
 Source: suitesparse
 Section: math
 Priority: optional
diff --git a/debian/rules b/debian/rules
index 9f44a91..d9fd007 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,12 +18,6 @@ $(foreach lib, $(LIBRARIES), $(eval $(lib) = $(shell perl debian/library-soname.
 # Lists of lib*.install files
 INSTALL_FILES = $(foreach lib, $(LIBRARIES), debian/$($(lib)).install)
 
-# Rule for regenerating debian/control from debian/control.in
-# Note that this should not be automatized, see http://ftp-master.debian.org/REJECT-FAQ.html
-generate-debian-control: debian/control.in debian/library-soname.pl
-	sed "$(foreach lib, $(LIBRARIES), s/@$(lib)@/$($(lib))/g;)" < debian/control.in > debian/control
-.PHONY: generate-debian-control
-
 # Generate rules for debian/lib*.install
 $(foreach lib, $(LIBRARIES), $(eval debian/$($(lib)).%: debian/%/$(lib) ; cp $$< $$@))
 
@@ -74,6 +68,19 @@ clean::
 	-find $(DEB_BUILDDIR) -name "*.oo" | xargs rm
 	rm -f $(INSTALL_FILES)
 
+	# Regenerate debian/control from debian/control.in. Note that this
+	# should not be automatized during the build (see
+	# http://ftp-master.debian.org/REJECT-FAQ.html), but doing it in the
+	# clean rule seems ok (this is done by gnome-pkg-tools).
+	{ \
+	  echo "# This file is autogenerated. DO NOT EDIT!" ; \
+	  echo "#" ; \
+	  echo "# Modifications should be made to debian/control.in instead." ; \
+	  echo "# This file is regenerated automatically in the clean target." ; \
+	  echo ; \
+	  sed "$(foreach lib, $(LIBRARIES), s/@$(lib)@/$($(lib))/g;)" debian/control.in ; } \
+	> debian/control
+
 get-orig-source:
 	uscan --force-download --rename --destdir .
 .PHONY: get-orig-source

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/suitesparse.git



More information about the debian-science-commits mailing list