[DRE-commits] r2323 - in packages/libxtemplate-ruby1.8/trunk: debian ext

lucas at alioth.debian.org lucas at alioth.debian.org
Thu Dec 20 11:37:44 UTC 2007


Author: lucas
Date: 2007-12-20 11:37:44 +0000 (Thu, 20 Dec 2007)
New Revision: 2323

Added:
   packages/libxtemplate-ruby1.8/trunk/debian/examples
   packages/libxtemplate-ruby1.8/trunk/debian/manpages
   packages/libxtemplate-ruby1.8/trunk/ext/Makefile
Removed:
   packages/libxtemplate-ruby1.8/trunk/debian/dirs
Modified:
   packages/libxtemplate-ruby1.8/trunk/debian/changelog
   packages/libxtemplate-ruby1.8/trunk/debian/compat
   packages/libxtemplate-ruby1.8/trunk/debian/control
   packages/libxtemplate-ruby1.8/trunk/debian/rules
   packages/libxtemplate-ruby1.8/trunk/debian/watch
Log:
applied patch from bdfreese

Modified: packages/libxtemplate-ruby1.8/trunk/debian/changelog
===================================================================
--- packages/libxtemplate-ruby1.8/trunk/debian/changelog	2007-12-20 11:31:27 UTC (rev 2322)
+++ packages/libxtemplate-ruby1.8/trunk/debian/changelog	2007-12-20 11:37:44 UTC (rev 2323)
@@ -1,13 +1,18 @@
-libxtemplate-ruby1.8 (0.8.0-3) UNRELEASED; urgency=low
+libxtemplate-ruby1.8 (0.8.0-3) unstable; urgency=low
 
-  [ Lucas Nussbaum ]
-  * NOT RELEASED YET
+  [ Barry deFreese ]
+  * Move to CDBS build system
+  * Bump debhelper build-dep and compat to 5
+  * Bump standards to 3.7.3
 
   [ Vincent Fourmond ]
   * Added watchfile and Homepage field
 
- -- Vincent Fourmond <fourmond at debian.org>  Mon, 10 Dec 2007 20:13:18 +0100
+  [ Lucas Nussbaum ]
+  * Fixed Vcs-* fields.
 
+ -- Lucas Nussbaum <lucas at lucas-nussbaum.net>  Thu, 20 Dec 2007 12:34:56 +0100
+
 libxtemplate-ruby1.8 (0.8.0-2) unstable; urgency=low
 
   * New maintainer. 

Modified: packages/libxtemplate-ruby1.8/trunk/debian/compat
===================================================================
--- packages/libxtemplate-ruby1.8/trunk/debian/compat	2007-12-20 11:31:27 UTC (rev 2322)
+++ packages/libxtemplate-ruby1.8/trunk/debian/compat	2007-12-20 11:37:44 UTC (rev 2323)
@@ -1 +1 @@
-4
+5

Modified: packages/libxtemplate-ruby1.8/trunk/debian/control
===================================================================
--- packages/libxtemplate-ruby1.8/trunk/debian/control	2007-12-20 11:31:27 UTC (rev 2322)
+++ packages/libxtemplate-ruby1.8/trunk/debian/control	2007-12-20 11:37:44 UTC (rev 2323)
@@ -2,11 +2,11 @@
 Section: interpreters
 Priority: optional
 Maintainer: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
-Build-Depends: debhelper (>> 4.0.0), ruby1.8, ruby1.8-dev
-Standards-Version: 3.6.1
+Build-Depends: debhelper (>> 5.0.0), cdbs, ruby-pkg-tools (>= 0.9), ruby1.8, ruby1.8-dev
+Standards-Version: 3.7.3
 Homepage: http://xtemplate.sourceforge.net/
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-ruby-extras/packages/libxtemplate-ruby1.8/
-Vcs-Svn: svn://svn.debian.org/pkg-ruby-extras/packages/libxtemplate-ruby1.8/
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-ruby-extras/packages/libxtemplate-ruby1.8/trunk/
+Vcs-Svn: svn://svn.debian.org/pkg-ruby-extras/packages/libxtemplate-ruby1.8/trunk/
 
 Package: libxtemplate-ruby1.8
 Architecture: any

Deleted: packages/libxtemplate-ruby1.8/trunk/debian/dirs
===================================================================
--- packages/libxtemplate-ruby1.8/trunk/debian/dirs	2007-12-20 11:31:27 UTC (rev 2322)
+++ packages/libxtemplate-ruby1.8/trunk/debian/dirs	2007-12-20 11:37:44 UTC (rev 2323)
@@ -1,2 +0,0 @@
-usr/bin
-usr/sbin

Added: packages/libxtemplate-ruby1.8/trunk/debian/examples
===================================================================
--- packages/libxtemplate-ruby1.8/trunk/debian/examples	                        (rev 0)
+++ packages/libxtemplate-ruby1.8/trunk/debian/examples	2007-12-20 11:37:44 UTC (rev 2323)
@@ -0,0 +1 @@
+samples/*

Added: packages/libxtemplate-ruby1.8/trunk/debian/manpages
===================================================================
--- packages/libxtemplate-ruby1.8/trunk/debian/manpages	                        (rev 0)
+++ packages/libxtemplate-ruby1.8/trunk/debian/manpages	2007-12-20 11:37:44 UTC (rev 2323)
@@ -0,0 +1 @@
+debian/xtemplate.1

Modified: packages/libxtemplate-ruby1.8/trunk/debian/rules
===================================================================
--- packages/libxtemplate-ruby1.8/trunk/debian/rules	2007-12-20 11:31:27 UTC (rev 2322)
+++ packages/libxtemplate-ruby1.8/trunk/debian/rules	2007-12-20 11:37:44 UTC (rev 2323)
@@ -1,93 +1,22 @@
 #!/usr/bin/make -f
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/ruby-pkg-tools/1/class/ruby-setup-rb.mk
 
-RUBY := ruby1.8
+RUBY     := ruby1.8
 
-rblibdir = $(shell $(RUBY) -rrbconfig -e'print Config::CONFIG["rubylibdir"]')
-rbarchdir = $(shell $(RUBY) -rrbconfig -e'print Config::CONFIG["archdir"]')
+destdir  := $(shell pwd)/debian/tmp
+bindir   := $(shell $(RUBY) -r rbconfig -e 'print Config::CONFIG["bindir"]')
+libdir   := $(shell $(RUBY) -r rbconfig -e 'print Config::CONFIG["rubylibdir"]')
+archdir  := $(shell $(RUBY) -r rbconfig -e 'print Config::CONFIG["archdir"]')
 
-configure: configure-stamp
-configure-stamp:
-	dh_testdir
-	# Add here commands to configure the package.
-	$(RUBY) install.rb config \
-	  --with-ext \
-	  --rb-dir=$(rblibdir) \
-	  --so-dir=$(rbarchdir)
-
-	touch configure-stamp
-
-
-build: build-stamp
-
-build-stamp: configure-stamp 
-	dh_testdir
-
-	# Add here commands to compile the package.
-	$(RUBY) install.rb setup
-	#/usr/bin/docbook-to-man debian/libxtemplate-ruby.sgml > libxtemplate-ruby.1
-
-	touch build-stamp
-
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp configure-stamp
-
-	# Add here commands to clean up after the build process.
-	-$(RUBY) install.rb clean
-	-cd ext && make distclean
-
-	dh_clean
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	dh_installdirs
-
-	# Add here commands to install the package into debian/libxtemplate-ruby.
-	$(RUBY) install.rb install --prefix=$(CURDIR)/debian/libxtemplate-ruby1.8
-
-
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs CHANGES
-	dh_installdocs
-	dh_installexamples samples/*
-#	dh_install
-#	dh_installmenu
-#	dh_installdebconf	
-#	dh_installlogrotate
-#	dh_installemacsen
-#	dh_installpam
-#	dh_installmime
-#	dh_installinit
-#	dh_installcron
-#	dh_installinfo
-	dh_installman debian/xtemplate.1
-	dh_link
-	dh_strip
-	dh_compress
-	dh_fixperms
-#	dh_perl
-#	dh_python
-#	dh_makeshlibs
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
+DEB_RUBY_SETUP_CMD = install.rb
+#DEB_RUBY_CONFIG_ARGS = --prefix=/usr \
+#	--site-ruby=/usr/lib/ruby/1.8 \
+#	--with-ext
+DEB_RUBY_CONFIG_ARGS = --prefix=/usr \
+	--with-ext \
+	--bin-dir=$(bindir) \
+	--rb-dir=$(libdir) \
+	--so-dir=$(archdir)
+DEB_RUBY_CLEAN_TARGET = clean

Modified: packages/libxtemplate-ruby1.8/trunk/debian/watch
===================================================================
--- packages/libxtemplate-ruby1.8/trunk/debian/watch	2007-12-20 11:31:27 UTC (rev 2322)
+++ packages/libxtemplate-ruby1.8/trunk/debian/watch	2007-12-20 11:37:44 UTC (rev 2323)
@@ -1,2 +1,2 @@
 version=3
-http://sf.net/xtemplate xtemplate-(.*).tar.gz
\ No newline at end of file
+http://sf.net/xtemplate xtemplate-(.*).tar.gz

Added: packages/libxtemplate-ruby1.8/trunk/ext/Makefile
===================================================================
--- packages/libxtemplate-ruby1.8/trunk/ext/Makefile	                        (rev 0)
+++ packages/libxtemplate-ruby1.8/trunk/ext/Makefile	2007-12-20 11:37:44 UTC (rev 2323)
@@ -0,0 +1,149 @@
+
+SHELL = /bin/sh
+
+#### Start of system configuration section. ####
+
+srcdir = /home/bdefreese/debian/libxtemplate-ruby1.8/libxtemplate-ruby1.8-0.8.0/ext
+topdir = /usr/lib/ruby/1.8/i486-linux
+hdrdir = $(topdir)
+VPATH = $(srcdir):$(topdir):$(hdrdir)
+prefix = $(DESTDIR)/usr
+exec_prefix = $(prefix)
+sitedir = $(DESTDIR)/usr/local/lib/site_ruby
+rubylibdir = $(libdir)/ruby/$(ruby_version)
+docdir = $(datarootdir)/doc/$(PACKAGE)
+dvidir = $(docdir)
+datarootdir = $(prefix)/share
+archdir = $(rubylibdir)/$(arch)
+sbindir = $(exec_prefix)/sbin
+psdir = $(docdir)
+localedir = $(datarootdir)/locale
+htmldir = $(docdir)
+datadir = $(datarootdir)
+includedir = $(prefix)/include
+infodir = $(prefix)/share/info
+sysconfdir = $(DESTDIR)/etc
+mandir = $(prefix)/share/man
+libdir = $(exec_prefix)/lib
+sharedstatedir = $(prefix)/com
+oldincludedir = $(DESTDIR)/usr/include
+pdfdir = $(docdir)
+sitearchdir = $(sitelibdir)/$(sitearch)
+bindir = $(exec_prefix)/bin
+localstatedir = $(DESTDIR)/var
+sitelibdir = $(sitedir)/$(ruby_version)
+libexecdir = $(prefix)/lib/ruby1.8
+
+CC = cc
+LIBRUBY = $(LIBRUBY_SO)
+LIBRUBY_A = lib$(RUBY_SO_NAME)-static.a
+LIBRUBYARG_SHARED = -l$(RUBY_SO_NAME)
+LIBRUBYARG_STATIC = -l$(RUBY_SO_NAME)-static
+
+RUBY_EXTCONF_H = 
+CFLAGS   =  -fPIC -fno-strict-aliasing -g -O2  -fPIC 
+INCFLAGS = -I. -I$(topdir) -I$(hdrdir) -I$(srcdir)
+CPPFLAGS =  
+CXXFLAGS = $(CFLAGS) 
+DLDFLAGS = -L.  -rdynamic -Wl,-export-dynamic  
+LDSHARED = $(CC) -shared
+AR = ar
+EXEEXT = 
+
+RUBY_INSTALL_NAME = ruby1.8
+RUBY_SO_NAME = ruby1.8
+arch = i486-linux
+sitearch = i486-linux
+ruby_version = 1.8
+ruby = /usr/bin/ruby1.8
+RUBY = $(ruby)
+RM = rm -f
+MAKEDIRS = mkdir -p
+INSTALL = /usr/bin/install -c
+INSTALL_PROG = $(INSTALL) -m 0755
+INSTALL_DATA = $(INSTALL) -m 644
+COPY = cp
+
+#### End of system configuration section. ####
+
+preload = 
+
+libpath = . $(libdir)
+LIBPATH =  -L"." -L"$(libdir)"
+DEFFILE = 
+
+CLEANFILES = mkmf.log
+DISTCLEANFILES = 
+
+extout = 
+extout_prefix = 
+target_prefix = 
+LOCAL_LIBS = 
+LIBS = $(LIBRUBYARG_SHARED)  -lpthread -ldl -lcrypt -lm   -lc
+SRCS = xt.c
+OBJS = xt.o
+TARGET = xtemplate_ext
+DLLIB = $(TARGET).so
+EXTSTATIC = 
+STATIC_LIB = 
+
+RUBYCOMMONDIR = $(sitedir)$(target_prefix)
+RUBYLIBDIR    = $(sitelibdir)$(target_prefix)
+RUBYARCHDIR   = $(sitearchdir)$(target_prefix)
+
+TARGET_SO     = $(DLLIB)
+CLEANLIBS     = $(TARGET).so $(TARGET).il? $(TARGET).tds $(TARGET).map
+CLEANOBJS     = *.o *.a *.s[ol] *.pdb *.exp *.bak
+
+all:		$(DLLIB)
+static:		$(STATIC_LIB)
+
+clean:
+		@-$(RM) $(CLEANLIBS) $(CLEANOBJS) $(CLEANFILES)
+
+distclean:	clean
+		@-$(RM) Makefile $(RUBY_EXTCONF_H) conftest.* mkmf.log
+		@-$(RM) core ruby$(EXEEXT) *~ $(DISTCLEANFILES)
+
+realclean:	distclean
+install: install-so install-rb
+
+install-so: $(RUBYARCHDIR)
+install-so: $(RUBYARCHDIR)/$(DLLIB)
+$(RUBYARCHDIR)/$(DLLIB): $(DLLIB)
+	$(INSTALL_PROG) $(DLLIB) $(RUBYARCHDIR)
+install-rb: pre-install-rb install-rb-default
+install-rb-default: pre-install-rb-default
+pre-install-rb: Makefile
+pre-install-rb-default: Makefile
+$(RUBYARCHDIR):
+	$(MAKEDIRS) $@
+
+site-install: site-install-so site-install-rb
+site-install-so: install-so
+site-install-rb: install-rb
+
+.SUFFIXES: .c .m .cc .cxx .cpp .C .o
+
+.cc.o:
+	$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) -c $<
+
+.cxx.o:
+	$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) -c $<
+
+.cpp.o:
+	$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) -c $<
+
+.C.o:
+	$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) -c $<
+
+.c.o:
+	$(CC) $(INCFLAGS) $(CPPFLAGS) $(CFLAGS) -c $<
+
+$(DLLIB): $(OBJS)
+	@-$(RM) $@
+	$(LDSHARED) -o $@ $(OBJS) $(LIBPATH) $(DLDFLAGS) $(LOCAL_LIBS) $(LIBS)
+
+
+
+$(OBJS): ruby.h defines.h




More information about the Pkg-ruby-extras-commits mailing list