[DRE-commits] r1610 - in packages/librmagick-ruby/trunk/debian: . patches

[lucas at alioth.debian.org]

Author: lucas
Date: 2007-05-22 07:34:35 +0000 (Tue, 22 May 2007)
New Revision: 1610

Added:
   packages/librmagick-ruby/trunk/debian/patches/remove-config.status-on-distclean.dpatch
Modified:
   packages/librmagick-ruby/trunk/debian/changelog
   packages/librmagick-ruby/trunk/debian/patches/00list
   packages/librmagick-ruby/trunk/debian/rules
Log:
librmagick-ruby updates:

* new upstream release
* fixed double build bug
* dropped change integrated upstream



Modified: packages/librmagick-ruby/trunk/debian/changelog
===================================================================
--- packages/librmagick-ruby/trunk/debian/changelog	2007-05-20 20:04:22 UTC (rev 1609)
+++ packages/librmagick-ruby/trunk/debian/changelog	2007-05-22 07:34:35 UTC (rev 1610)
@@ -1,8 +1,11 @@
-librmagick-ruby (1.15.5-2) UNRELEASED; urgency=low
+librmagick-ruby (1.15.6-1) unstable; urgency=low
 
-  * NOT RELEASED YET
+  * New upstream release.
+  * Dropped the patch to make example scripts not executable (integrated
+    upstream!)
+  * Remove config.status during 'make distclean' (Closes: #424534).
 
- -- Lucas Nussbaum <lucas at lucas-nussbaum.net>  Sat, 14 Apr 2007 23:28:19 +0200
+ -- Lucas Nussbaum <lucas at lucas-nussbaum.net>  Tue, 22 May 2007 09:31:20 +0200
 
 librmagick-ruby (1.15.5-1) unstable; urgency=low
 

Modified: packages/librmagick-ruby/trunk/debian/patches/00list
===================================================================
--- packages/librmagick-ruby/trunk/debian/patches/00list	2007-05-20 20:04:22 UTC (rev 1609)
+++ packages/librmagick-ruby/trunk/debian/patches/00list	2007-05-22 07:34:35 UTC (rev 1610)
@@ -1,2 +1,3 @@
 pkg-config.dpatch
 fail-on-doc-failure.dpatch
+remove-config.status-on-distclean.dpatch

Added: packages/librmagick-ruby/trunk/debian/patches/remove-config.status-on-distclean.dpatch
===================================================================
--- packages/librmagick-ruby/trunk/debian/patches/remove-config.status-on-distclean.dpatch	                        (rev 0)
+++ packages/librmagick-ruby/trunk/debian/patches/remove-config.status-on-distclean.dpatch	2007-05-22 07:34:35 UTC (rev 1610)
@@ -0,0 +1,18 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## remove-config.status-on-distclean.dpatch by Lucas Nussbaum <lucas at lucas-nussbaum.net>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Remove config.status when calling the distclean rule
+
+ at DPATCH@
+diff -urNad librmagick-ruby-1.15.6~/Makefile.in librmagick-ruby-1.15.6/Makefile.in
+--- librmagick-ruby-1.15.6~/Makefile.in	2006-04-23 15:12:51.000000000 +0200
++++ librmagick-ruby-1.15.6/Makefile.in	2007-05-21 18:01:56.000000000 +0200
+@@ -26,6 +26,7 @@
+ 	rm -f Makefile ext/RMagick/extconf.rb metaconfig
+ 	rm -f ext/RMagick/Makefile config.cache config.log
+ 	rm -rf autom4te.cache
++	rm -f config.status
+ 
+ uninstall: .config
+ 	$(RUBY) uninstall.rb $(RUBY_CONFIG_OPTS)

Modified: packages/librmagick-ruby/trunk/debian/rules
===================================================================
--- packages/librmagick-ruby/trunk/debian/rules	2007-05-20 20:04:22 UTC (rev 1609)
+++ packages/librmagick-ruby/trunk/debian/rules	2007-05-22 07:34:35 UTC (rev 1610)
@@ -21,10 +21,3 @@
 install/librmagick-ruby-doc::
 	dh_rdoc -plibrmagick-ruby-doc ext lib
 	find $(CURDIR)/debian/librmagick-ruby-doc/$(docdir) -name .rmagick | xargs -r rm
-
-# remove executable flag from some examples (fixes lintian warnings)
-# see https://rubyforge.org/tracker/index.php?func=detail&aid=10080&group_id=12&atid=133
-binary-install/librmagick-ruby-doc::
-	chmod a-x $(CURDIR)/debian/librmagick-ruby-doc/usr/share/doc/librmagick-ruby-doc/examples/demo.rb
-	chmod a-x $(CURDIR)/debian/librmagick-ruby-doc/usr/share/doc/librmagick-ruby-doc/examples/describe.rb
-	chmod a-x $(CURDIR)/debian/librmagick-ruby-doc/usr/share/doc/librmagick-ruby-doc/examples/rotating_text.rb