[gle-graphics] 05/23: Import Debian changes 4.2.2-3

[Christian T. Steigies]

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

cts pushed a commit to branch master
in repository gle-graphics.

commit 11c1414e25bc8907f7c318e11f570c36643a0a00
Author: Christian T. Steigies <cts at debian.org>
Date:   Mon Apr 5 21:36:40 2010 +0200

    Import Debian changes 4.2.2-3
    
    gle-graphics (4.2.2-3) unstable; urgency=low
    
      * run "autoreconf -vfi" as pre-configure action instead of
        "aclocal && autoconf" as configure action (closes: #571296)
      * remove autogenerated aclocal.m4 and configure in clean target
---
 debian/changelog => changelog | 8 ++++++++
 debian/changelog              | 8 ++++++++
 debian/rules                  | 9 +++++++--
 debian/rules => rules         | 9 +++++++--
 4 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/changelog
similarity index 87%
copy from debian/changelog
copy to changelog
index dea754b..49eef7e 100644
--- a/debian/changelog
+++ b/changelog
@@ -1,3 +1,11 @@
+gle-graphics (4.2.2-3) unstable; urgency=low
+
+  * run "autoreconf -vfi" as pre-configure action instead of 
+    "aclocal && autoconf" as configure action (closes: #571296)
+  * remove autogenerated aclocal.m4 and configure in clean target
+  
+ -- Christian T. Steigies <cts at debian.org>  Mon, 05 Apr 2010 21:36:40 +0200
+
 gle-graphics (4.2.2-2) unstable; urgency=low
 
   * upload to unstable
diff --git a/debian/changelog b/debian/changelog
index dea754b..49eef7e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+gle-graphics (4.2.2-3) unstable; urgency=low
+
+  * run "autoreconf -vfi" as pre-configure action instead of 
+    "aclocal && autoconf" as configure action (closes: #571296)
+  * remove autogenerated aclocal.m4 and configure in clean target
+  
+ -- Christian T. Steigies <cts at debian.org>  Mon, 05 Apr 2010 21:36:40 +0200
+
 gle-graphics (4.2.2-2) unstable; urgency=low
 
   * upload to unstable
diff --git a/debian/rules b/debian/rules
index b48abe3..4efdb4b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,8 +7,12 @@ include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
+# To add pre-configure actions (ignore warnings):
+makebuilddir/gle-graphics::
+	-autoreconf -vfi
+
 configure/gle-graphics::
-	aclocal && autoconf && ./configure --docdir=/usr/share/doc/gle-graphics/ --with-rpath=no
+	./configure --docdir=/usr/share/doc/gle-graphics/ --with-rpath=no
 
 build/gle-graphics::
 	make doc
@@ -22,7 +26,8 @@ clean::
 	-rm src/font/*.fmt
 	-rm src/font/*.fve
 	-rm src/font/movefonts
-#	aclocal.m4
+# remove files which are updated by autoreconf:
+	-rm aclocal.m4 configure
 
 install/gle-graphics::
 	cp debian/qgle.1 debian/gle-graphics/usr/share/man/man1/
diff --git a/debian/rules b/rules
old mode 100755
new mode 100644
similarity index 73%
copy from debian/rules
copy to rules
index b48abe3..4efdb4b
--- a/debian/rules
+++ b/rules
@@ -7,8 +7,12 @@ include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
+# To add pre-configure actions (ignore warnings):
+makebuilddir/gle-graphics::
+	-autoreconf -vfi
+
 configure/gle-graphics::
-	aclocal && autoconf && ./configure --docdir=/usr/share/doc/gle-graphics/ --with-rpath=no
+	./configure --docdir=/usr/share/doc/gle-graphics/ --with-rpath=no
 
 build/gle-graphics::
 	make doc
@@ -22,7 +26,8 @@ clean::
 	-rm src/font/*.fmt
 	-rm src/font/*.fve
 	-rm src/font/movefonts
-#	aclocal.m4
+# remove files which are updated by autoreconf:
+	-rm aclocal.m4 configure
 
 install/gle-graphics::
 	cp debian/qgle.1 debian/gle-graphics/usr/share/man/man1/

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