Package: libnora-ruby
Version: 1:0.0.20041021-1
Severity: normal
Tags: patch
Hi,
Attached is the diff for my libnora-ruby 1:0.0.20041021-2 NMU.
bye,
- michael
diff -Nru /tmp/MgE6tCWelt/libnora-ruby-0.0.20041021/debian/changelog
/tmp/J0knGkMSrM/libnora-ruby-0.0.20041021/debian/changelog
--- /tmp/MgE6tCWelt/libnora-ruby-0.0.20041021/debian/changelog 2006-08-04
07:38:53.000000000 +0200
+++ /tmp/J0knGkMSrM/libnora-ruby-0.0.20041021/debian/changelog 2006-08-04
07:38:53.000000000 +0200
@@ -1,3 +1,11 @@
+libnora-ruby (1:0.0.20041021-2) unstable; urgency=low
+
+ * Non-maintainer upload
+ * Do not build soon-to-be-obsolete packages for ruby1.6
+ Closes: #366574
+
+ -- Michael Ablassmeier <[EMAIL PROTECTED]> Fri, 4 Aug 2006 07:37:12 +0200
+
libnora-ruby (1:0.0.20041021-1) unstable; urgency=low
* New upstream release
diff -Nru /tmp/MgE6tCWelt/libnora-ruby-0.0.20041021/debian/control
/tmp/J0knGkMSrM/libnora-ruby-0.0.20041021/debian/control
--- /tmp/MgE6tCWelt/libnora-ruby-0.0.20041021/debian/control 2006-08-04
07:38:53.000000000 +0200
+++ /tmp/J0knGkMSrM/libnora-ruby-0.0.20041021/debian/control 2006-08-04
07:38:53.000000000 +0200
@@ -2,21 +2,9 @@
Section: interpreters
Priority: optional
Maintainer: Tatsuki Sugiura <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>> 4.0.0), ruby1.6, ruby1.8, ruby1.6-dev, ruby1.8-dev
+Build-Depends: debhelper (>> 4.0.0), ruby1.8, ruby1.8-dev
Standards-Version: 3.6.1.0
-Package: libnora-ruby1.6
-Provides: libnora-ruby
-Architecture: any
-Depends: ruby1.6, ${shlibs:Depends}
-Suggests: libfcgi-ruby, libapache-mod-ruby, drb
-Description: Web Application Library for ruby
- Features:
- * CGI/mod_ruby/FastCGI/Rinda/Mail interface
- * Persistent Framework
- * multipart/form-data support
- * Cookie support
-
Package: libnora-ruby1.8
Provides: libnora-ruby
Architecture: any
diff -Nru /tmp/MgE6tCWelt/libnora-ruby-0.0.20041021/debian/rules
/tmp/J0knGkMSrM/libnora-ruby-0.0.20041021/debian/rules
--- /tmp/MgE6tCWelt/libnora-ruby-0.0.20041021/debian/rules 2006-08-04
07:38:53.000000000 +0200
+++ /tmp/J0knGkMSrM/libnora-ruby-0.0.20041021/debian/rules 2006-08-04
07:38:53.000000000 +0200
@@ -53,19 +53,6 @@
dh_installdirs
# Add here commands to install the package into debian/libnora-ruby.
- ruby1.6 install.rb config \
- --site-ruby="\$$prefix/lib/ruby/1.6" \
- --site-ruby-common="\$$prefix/lib/ruby/1.6" \
- --so-dir="\$$prefix/lib/ruby/1.6/$$DEB_HOST_GNU_TYPE" \
- # Hmmmmmm..
- ruby1.6 install.rb setup
- ruby1.6 install.rb install --prefix=$(CURDIR)/debian/libnora-ruby1.6
- mkdir -p $(CURDIR)/debian/libnora-ruby1.6/usr/share/doc/libnora-ruby1.6
- cp -a sample \
-
$(CURDIR)/debian/libnora-ruby1.6/usr/share/doc/libnora-ruby1.6/examples
- find $(CURDIR)/debian/libnora-ruby1.6/usr/share/doc \
- -type f | xargs chmod -x
- ruby1.6 install.rb clean
ruby1.8 install.rb config \
--site-ruby="\$$prefix/lib/ruby/1.8" \
diff -Nru /tmp/MgE6tCWelt/libnora-ruby-0.0.20041021/ext/web/escape_ext/Makefile
/tmp/J0knGkMSrM/libnora-ruby-0.0.20041021/ext/web/escape_ext/Makefile
--- /tmp/MgE6tCWelt/libnora-ruby-0.0.20041021/ext/web/escape_ext/Makefile
2006-08-04 07:38:53.000000000 +0200
+++ /tmp/J0knGkMSrM/libnora-ruby-0.0.20041021/ext/web/escape_ext/Makefile
2006-08-04 07:38:53.000000000 +0200
@@ -3,27 +3,31 @@
#### Start of system configuration section. ####
-srcdir =
/home/sugi/works/debian/libnora-ruby/libnora-ruby-0.0.20041008/ext/web/escape_ext
-topdir = /usr/lib/ruby/1.8/i386-linux
+srcdir = /home/abi/nora/libnora-ruby-0.0.20041021/ext/web/escape_ext
+topdir = /usr/lib/ruby/1.8/x86_64-linux
hdrdir = $(topdir)
-VPATH = $(srcdir)
+VPATH = $(srcdir):$(topdir):$(hdrdir)
prefix = $(DESTDIR)/usr
exec_prefix = $(prefix)
-sitedir = $(prefix)/local/lib/site_ruby
+sitedir = $(DESTDIR)/usr/local/lib/site_ruby
rubylibdir = $(libdir)/ruby/$(ruby_version)
-builddir = $(ac_builddir)
+docdir = $(datarootdir)/doc/$(PACKAGE)
+dvidir = $(docdir)
+datarootdir = $(prefix)/share
archdir = $(rubylibdir)/$(arch)
sbindir = $(exec_prefix)/sbin
-compile_dir = $(DESTDIR)/tmp/ruby1.8-1.8.1+1.8.2pre2/build-tree/ruby-1.8.2
+psdir = $(docdir)
+localedir = $(datarootdir)/locale
+htmldir = $(docdir)
datadir = $(prefix)/share
includedir = $(prefix)/include
-infodir = $(prefix)/info
-top_builddir = $(ac_top_builddir)
+infodir = $(datarootdir)/info
sysconfdir = $(DESTDIR)/etc
mandir = $(datadir)/man
libdir = $(exec_prefix)/lib
sharedstatedir = $(prefix)/com
oldincludedir = $(DESTDIR)/usr/include
+pdfdir = $(docdir)
sitearchdir = $(sitelibdir)/$(sitearch)
bindir = $(exec_prefix)/bin
localstatedir = $(DESTDIR)/var
@@ -36,79 +40,95 @@
LIBRUBYARG_SHARED = -l$(RUBY_SO_NAME)
LIBRUBYARG_STATIC = -l$(RUBY_SO_NAME)-static
-CFLAGS = -fPIC -Wall -g -O2 -fPIC
+CFLAGS = -fPIC -Wall -g -fno-strict-aliasing -O2 -fPIC
CPPFLAGS = -I. -I$(topdir) -I$(hdrdir) -I$(srcdir)
CXXFLAGS = $(CFLAGS)
DLDFLAGS =
-LDSHARED = gcc -shared
+LDSHARED = $(CC) -shared
AR = ar
EXEEXT =
RUBY_INSTALL_NAME = ruby1.8
-RUBY_SO_NAME = $(RUBY_INSTALL_NAME)
-arch = i386-linux
-sitearch = i386-linux
+RUBY_SO_NAME = ruby1.8
+arch = x86_64-linux
+sitearch = x86_64-linux
ruby_version = 1.8
ruby = /usr/bin/ruby1.8
RUBY = $(ruby)
-RM = $(RUBY) -run -e rm -- -f
-MAKEDIRS = $(RUBY) -run -e mkdir -- -p
-INSTALL_PROG = $(RUBY) -run -e install -- -vpm 0755
-INSTALL_DATA = $(RUBY) -run -e install -- -vpm 0644
+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"$(libdir)"
DEFFILE =
CLEANFILES =
DISTCLEANFILES =
+extout =
+extout_prefix =
target_prefix =
LOCAL_LIBS =
LIBS = $(LIBRUBYARG_SHARED) -lpthread -ldl -lcrypt -lm -lc
+SRCS = escape_ext.c
OBJS = escape_ext.o
TARGET = escape_ext
DLLIB = $(TARGET).so
-STATIC_LIB = $(TARGET).a
+STATIC_LIB =
RUBYCOMMONDIR = $(sitedir)$(target_prefix)
RUBYLIBDIR = $(sitelibdir)$(target_prefix)
RUBYARCHDIR = $(sitearchdir)$(target_prefix)
-CLEANLIBS = "$(TARGET).{lib,exp,il?,tds,map}" $(DLLIB)
-CLEANOBJS = "*.{o,a,s[ol],pdb,bak}"
+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)
+ @-$(RM) $(CLEANLIBS) $(CLEANOBJS) $(CLEANFILES)
distclean: clean
- @$(RM) Makefile extconf.h conftest.* mkmf.log
- @$(RM) core ruby$(EXEEXT) *~ $(DISTCLEANFILES)
+ @-$(RM) Makefile extconf.h conftest.* mkmf.log
+ @-$(RM) core ruby$(EXEEXT) *~ $(DISTCLEANFILES)
realclean: distclean
-install: $(RUBYARCHDIR)
-install: $(RUBYARCHDIR)/$(DLLIB)
-$(RUBYARCHDIR)/$(DLLIB): $(DLLIB) $(RUBYARCHDIR)
- @$(INSTALL_PROG) $(DLLIB) $(RUBYARCHDIR)
+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) $(RUBYARCHDIR)
+ $(MAKEDIRS) $@
-site-install: install
+site-install: site-install-so site-install-rb
+site-install-so: install-so
+site-install-rb: install-rb
-.SUFFIXES: .c .cc .m .cxx .cpp .C .o
+.SUFFIXES: .c .m .cc .cxx .cpp .C .o
.cc.o:
$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $<
-.cpp.o:
+.cxx.o:
$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $<
-.cxx.o:
+.cpp.o:
$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $<
.C.o:
@@ -119,9 +139,8 @@
$(DLLIB): $(OBJS)
@-$(RM) $@
- $(LDSHARED) $(DLDFLAGS) $(LIBPATH) -o $(DLLIB) $(OBJS) $(LOCAL_LIBS)
$(LIBS)
+ $(LDSHARED) $(DLDFLAGS) $(LIBPATH) -o $@ $(OBJS) $(LOCAL_LIBS) $(LIBS)
+
-$(STATIC_LIB): $(OBJS)
- $(AR) cru $@ $(OBJS)
- @-ranlib $(DLLIB) 2> /dev/null || true
+$(OBJS): ruby.h defines.h
