[Pkg-ruby-extras-maintainers] r552 - in packages/librmagick-ruby/trunk/debian: . patches

Lucas Nussbaum lucas-guest at costa.debian.org
Mon May 22 08:42:01 UTC 2006 

Author: lucas-guest
Date: 2006-05-22 08:42:00 +0000 (Mon, 22 May 2006)
New Revision: 552

Removed:
   packages/librmagick-ruby/trunk/debian/librmagick-ruby-doc.docs
Modified:
   packages/librmagick-ruby/trunk/debian/changelog
   packages/librmagick-ruby/trunk/debian/control
   packages/librmagick-ruby/trunk/debian/control.in
   packages/librmagick-ruby/trunk/debian/patches/fail-on-doc-failure.dpatch
   packages/librmagick-ruby/trunk/debian/rules
Log:
librmagick-ruby: prepared for 1.11.0

Modified: packages/librmagick-ruby/trunk/debian/changelog
===================================================================
--- packages/librmagick-ruby/trunk/debian/changelog	2006-05-21 08:19:46 UTC (rev 551)
+++ packages/librmagick-ruby/trunk/debian/changelog	2006-05-22 08:42:00 UTC (rev 552)
@@ -1,9 +1,14 @@
-librmagick-ruby (1.10.1-2) UNRELEASED; urgency=low
+librmagick-ruby (1.11.0-1) UNRELEASED; urgency=low
 
+  [ Paul van Tilburg ]
   * NOT RELEASED YET
 
- -- Paul van Tilburg <paulvt at debian.org>  Thu, 23 Mar 2006 11:57:15 +0100
+  [ Lucas Nussbaum ]
+  * New upstream release.
+  * Upgraded to policy 3.7.2 (no changes required).
 
+ -- Lucas Nussbaum <lucas at lucas-nussbaum.net>  Mon, 22 May 2006 10:40:43 +0200
+
 librmagick-ruby (1.10.1-1) unstable; urgency=low
 
   * Set Uploaders to RUBY_EXTRAS_TEAM and changed build-dep on ruby-pkg-

Modified: packages/librmagick-ruby/trunk/debian/control
===================================================================
--- packages/librmagick-ruby/trunk/debian/control	2006-05-21 08:19:46 UTC (rev 551)
+++ packages/librmagick-ruby/trunk/debian/control	2006-05-22 08:42:00 UTC (rev 552)
@@ -4,7 +4,7 @@
 Maintainer: Lucas Nussbaum <lucas at lucas-nussbaum.net>
 Uploaders: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>, Antonio S. de A. Terceiro <asaterceiro at inf.ufrgs.br>, David Moreno Garza <damog at debian.org>, David Nusinow <dnusinow at debian.org>, Paul van Tilburg <paulvt at debian.org>, Esteban Manchado Velázquez <zoso at debian.org>, Arnaud Cornet <arnaud.cornet at gmail.com>, Thierry Reding <thierry at doppeltgemoppelt.de>, Marc Dequènes (Duck) <Duck at DuckCorp.org>, Ari Pollak <ari at debian.org>
 Build-Depends: debhelper (>= 5), libmagick9-dev (>= 6.2.4), ruby1.8, ruby1.8-dev, libwmf-bin, gs-gpl, gsfonts, cdbs (>= 0.4.33), ruby-pkg-tools (>= 0.8), rdoc, graphviz, dpatch, pkg-config
-Standards-Version: 3.6.2.2
+Standards-Version: 3.7.2
 
 Package: librmagick-ruby
 Architecture: all

Modified: packages/librmagick-ruby/trunk/debian/control.in
===================================================================
--- packages/librmagick-ruby/trunk/debian/control.in	2006-05-21 08:19:46 UTC (rev 551)
+++ packages/librmagick-ruby/trunk/debian/control.in	2006-05-22 08:42:00 UTC (rev 552)
@@ -4,7 +4,7 @@
 Maintainer: Lucas Nussbaum <lucas at lucas-nussbaum.net>
 Uploaders: @RUBY_EXTRAS_TEAM@
 Build-Depends: debhelper (>= 5), libmagick9-dev (>= 6.2.4), ruby1.8, ruby1.8-dev, libwmf-bin, gs-gpl, gsfonts, cdbs (>= 0.4.33), ruby-pkg-tools (>= 0.8), rdoc, graphviz, dpatch, pkg-config
-Standards-Version: 3.6.2.2
+Standards-Version: 3.7.2
 
 Package: librmagick-ruby
 Architecture: all

Deleted: packages/librmagick-ruby/trunk/debian/librmagick-ruby-doc.docs
===================================================================
--- packages/librmagick-ruby/trunk/debian/librmagick-ruby-doc.docs	2006-05-21 08:19:46 UTC (rev 551)
+++ packages/librmagick-ruby/trunk/debian/librmagick-ruby-doc.docs	2006-05-22 08:42:00 UTC (rev 552)
@@ -1 +0,0 @@
-doc

Modified: packages/librmagick-ruby/trunk/debian/patches/fail-on-doc-failure.dpatch
===================================================================
--- packages/librmagick-ruby/trunk/debian/patches/fail-on-doc-failure.dpatch	2006-05-21 08:19:46 UTC (rev 551)
+++ packages/librmagick-ruby/trunk/debian/patches/fail-on-doc-failure.dpatch	2006-05-22 08:42:00 UTC (rev 552)
@@ -6,10 +6,10 @@
 ## DP: failures.
 
 @DPATCH@
-diff -urNad trunk~/post-setup.rb trunk/post-setup.rb
---- trunk~/post-setup.rb	2004-03-04 01:41:55.000000000 +0100
-+++ trunk/post-setup.rb	2006-01-30 09:45:32.000000000 +0100
-@@ -82,7 +82,7 @@
+diff -urNad librmagick-ruby-1.11.0~/post-setup.rb librmagick-ruby-1.11.0/post-setup.rb
+--- librmagick-ruby-1.11.0~/post-setup.rb	2006-04-27 00:27:41.000000000 +0200
++++ librmagick-ruby-1.11.0/post-setup.rb	2006-05-22 09:43:15.000000000 +0200
+@@ -84,7 +84,7 @@
      if $? != 0 then
        puts("post-setup.rb: #{example} example returned error code #{$?}")
        @errs += 1 unless ALLOW_EXAMPLE_ERRORS
@@ -18,12 +18,3 @@
           err(<<-END_EXFAIL
              Too many examples failed. The RMagick documentation cannot be installed
              successfully. Consult the README.txt file and try again, or send email
-@@ -109,7 +109,7 @@
-   #
-   def err(msg)
-       $stderr.puts "#{$0}: #{msg}"
--      exit
-+      exit(1)
-   end
- 
- end

Modified: packages/librmagick-ruby/trunk/debian/rules
===================================================================
--- packages/librmagick-ruby/trunk/debian/rules	2006-05-21 08:19:46 UTC (rev 551)
+++ packages/librmagick-ruby/trunk/debian/rules	2006-05-22 08:42:00 UTC (rev 552)
@@ -6,48 +6,17 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/ruby-pkg-tools/1/rules/uploaders.mk
 include /usr/share/cdbs/1/rules/dpatch.mk
+include /usr/share/cdbs/1/class/autotools.mk
 
-# These are used for cross-compiling and for saving the configure script
-# from having to guess our platform (since we know it already)
-DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-
-CFLAGS = -Wall -g
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2
-endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-	INSTALL_PROGRAM += -s
-endif
-
-RUBY = ruby1.8
-
+RUBY := ruby1.8
 rubylibdir := $(shell $(RUBY) -r rbconfig -e 'print Config::CONFIG["rubylibdir"]')
 rubyarchdir := $(shell $(RUBY) -r rbconfig -e 'print Config::CONFIG["archdir"]')
-docdir = /usr/share/doc/librmagick-ruby-doc/html
+docdir := /usr/share/doc/librmagick-ruby-doc/html
+DEB_CONFIGURE_EXTRA_FLAGS := --with-doc-dir=$(CURDIR)/debian/librmagick-ruby-doc/$(docdir) \
+--with-rb-dir=$(CURDIR)/debian/librmagick-$(RUBY)/$(rubylibdir) \
+--with-so-dir=$(CURDIR)/debian/librmagick-$(RUBY)/$(rubyarchdir)
 
-configure/librmagick-ruby1.8::
-	RUBY=/usr/bin/$(RUBY) ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr
-	$(RUBY) install.rb config \
-	  --rb-dir=$(CURDIR)/debian/librmagick-$(RUBY)/$(rubylibdir) \
-	  --so-dir=$(CURDIR)/debian/librmagick-$(RUBY)/$(rubyarchdir) \
-	  --doc-dir='$(CURDIR)/debian/librmagick-ruby-doc/$(docdir)' 
-	$(RUBY) install.rb setup
-
-install/librmagick-ruby1.8::
-	$(RUBY) install.rb install
-
 install/librmagick-ruby-doc::
 	dh_rdoc -plibrmagick-ruby-doc ext lib
 	find $(CURDIR)/debian/librmagick-ruby-doc/$(docdir) -name .rmagick | xargs -r rm
 
-binary-post-install/librmagick-ruby-doc::
-	mv $(CURDIR)/debian/librmagick-ruby-doc/usr/share/doc/librmagick-ruby-doc/doc $(CURDIR)/debian/librmagick-ruby-doc/usr/share/doc/librmagick-ruby-doc/html
-
-cleanbuilddir/librmagick-ruby::
-	-$(MAKE) distclean
-	rm -f ext/RMagick/Makefile ext/RMagick/rmagick_config.h
-	rm -rf doc/ex/.examples

More information about the pkg-ruby-extras-maintainers mailing list