r20799 - in /trunk/libterm-slang-perl: Slang.xs debian/changelog debian/control debian/patches/ debian/patches/series debian/patches/slang2.patch debian/rules typemap
gregoa at users.alioth.debian.org
gregoa at users.alioth.debian.org
Sat Jun 7 01:03:36 UTC 2008
Author: gregoa
Date: Sat Jun 7 01:03:36 2008
New Revision: 20799
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=20799
Log:
* Split remaining changes out into slang2.patch; add quilt framework.
* Set Standards-Version to 3.7.3 (no changes).
Added:
trunk/libterm-slang-perl/debian/patches/
trunk/libterm-slang-perl/debian/patches/series
trunk/libterm-slang-perl/debian/patches/slang2.patch
Modified:
trunk/libterm-slang-perl/Slang.xs
trunk/libterm-slang-perl/debian/changelog
trunk/libterm-slang-perl/debian/control
trunk/libterm-slang-perl/debian/rules
trunk/libterm-slang-perl/typemap
Modified: trunk/libterm-slang-perl/Slang.xs
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libterm-slang-perl/Slang.xs?rev=20799&op=diff
==============================================================================
--- trunk/libterm-slang-perl/Slang.xs (original)
+++ trunk/libterm-slang-perl/Slang.xs Sat Jun 7 01:03:36 2008
@@ -1,5 +1,5 @@
-/* $Id: Slang.xs,v 1.9 2000/04/17 03:53:11 joey Rel $ */
+/* $Id: Slang.xs,v 1.10 2000/04/17 22:46:08 daniel Exp $ */
#ifdef __cplusplus
"C" {
@@ -140,8 +140,7 @@
SLsmg_reset_smg()
unsigned short
-SLsmg_char_at(c)
- SLsmg_Char_Type *c;
+SLsmg_char_at()
void
SLsmg_set_screen_start(r,c)
@@ -183,17 +182,17 @@
void
SLsmg_write_color_chars(us1,ui1)
- SLsmg_Char_Type *us1;
+ unsigned short &us1;
unsigned int ui1;
unsigned int
SLsmg_read_raw(us1,ui1)
- SLsmg_Char_Type *us1;
+ unsigned short &us1;
unsigned int ui1;
unsigned int
SLsmg_write_raw(us1,ui1)
- SLsmg_Char_Type *us1;
+ unsigned short &us1;
unsigned int ui1;
void
@@ -497,11 +496,9 @@
################################
# Readline
-#if 0
-
-int
-SLrline_save_line(rline)
- SLrline_Type *rline;
+SLang_Read_Line_Type*
+SLang_rline_save_line(rline)
+ SLang_RLine_Info_Type *rline;
int
SLang_init_readline(rline)
@@ -519,8 +516,6 @@
SLrline_redraw(rline)
SLang_RLine_Info_Type *rline;
-#endif
-
################################
# Signals
@@ -604,8 +599,8 @@
void
SLtt_smart_puts(us1,us2,i1,i2)
- SLsmg_Char_Type *us1;
- SLsmg_Char_Type *us2;
+ unsigned short *us1;
+ unsigned short *us2;
int i1;
int i2;
Modified: trunk/libterm-slang-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libterm-slang-perl/debian/changelog?rev=20799&op=diff
==============================================================================
--- trunk/libterm-slang-perl/debian/changelog (original)
+++ trunk/libterm-slang-perl/debian/changelog Sat Jun 7 01:03:36 2008
@@ -11,6 +11,8 @@
* debian/rules: delete /usr/share/perl5 only if it exists.
* Revert some changes to upstream code that were caused by an accidentally
set svn:keywords property.
+ * Split remaining changes out into slang2.patch; add quilt framework.
+ * Set Standards-Version to 3.7.3 (no changes).
-- gregor herrmann <gregor+debian at comodo.priv.at> Tue, 09 Oct 2007 22:32:23 +0200
Modified: trunk/libterm-slang-perl/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libterm-slang-perl/debian/control?rev=20799&op=diff
==============================================================================
--- trunk/libterm-slang-perl/debian/control (original)
+++ trunk/libterm-slang-perl/debian/control Sat Jun 7 01:03:36 2008
@@ -1,9 +1,10 @@
Source: libterm-slang-perl
Section: perl
Priority: optional
-Build-Depends: libslang2-dev, debhelper (>= 5), perl (>= 5.8), dpkg-dev (>= 1.9.0)
+Build-Depends: libslang2-dev, debhelper (>= 5), perl (>= 5.8),
+ dpkg-dev (>= 1.9.0), quilt (>= 0.40)
Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
-Standards-Version: 3.7.2
+Standards-Version: 3.7.3
Homepage: http://search.cpan.org/dist/Term-Slang/
Vcs-Svn: svn://svn.debian.org/pkg-perl/trunk/libterm-slang-perl/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-perl/trunk/libterm-slang-perl/
Added: trunk/libterm-slang-perl/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libterm-slang-perl/debian/patches/series?rev=20799&op=file
==============================================================================
--- trunk/libterm-slang-perl/debian/patches/series (added)
+++ trunk/libterm-slang-perl/debian/patches/series Sat Jun 7 01:03:36 2008
@@ -1,0 +1,1 @@
+slang2.patch
Added: trunk/libterm-slang-perl/debian/patches/slang2.patch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libterm-slang-perl/debian/patches/slang2.patch?rev=20799&op=file
==============================================================================
--- trunk/libterm-slang-perl/debian/patches/slang2.patch (added)
+++ trunk/libterm-slang-perl/debian/patches/slang2.patch Sat Jun 7 01:03:36 2008
@@ -1,0 +1,82 @@
+Author: Joey Hess <joeyh at debian.org>
+Description: Update to slang2
+
+--- libterm-slang-perl.orig/Slang.xs
++++ libterm-slang-perl/Slang.xs
+@@ -140,7 +140,8 @@
+ SLsmg_reset_smg()
+
+ unsigned short
+-SLsmg_char_at()
++SLsmg_char_at(c)
++ SLsmg_Char_Type *c;
+
+ void
+ SLsmg_set_screen_start(r,c)
+@@ -182,17 +183,17 @@
+
+ void
+ SLsmg_write_color_chars(us1,ui1)
+- unsigned short &us1;
++ SLsmg_Char_Type *us1;
+ unsigned int ui1;
+
+ unsigned int
+ SLsmg_read_raw(us1,ui1)
+- unsigned short &us1;
++ SLsmg_Char_Type *us1;
+ unsigned int ui1;
+
+ unsigned int
+ SLsmg_write_raw(us1,ui1)
+- unsigned short &us1;
++ SLsmg_Char_Type *us1;
+ unsigned int ui1;
+
+ void
+@@ -496,9 +497,11 @@
+ ################################
+ # Readline
+
+-SLang_Read_Line_Type*
+-SLang_rline_save_line(rline)
+- SLang_RLine_Info_Type *rline;
++#if 0
++
++int
++SLrline_save_line(rline)
++ SLrline_Type *rline;
+
+ int
+ SLang_init_readline(rline)
+@@ -516,6 +519,8 @@
+ SLrline_redraw(rline)
+ SLang_RLine_Info_Type *rline;
+
++#endif
++
+ ################################
+ # Signals
+
+@@ -599,8 +604,8 @@
+
+ void
+ SLtt_smart_puts(us1,us2,i1,i2)
+- unsigned short *us1;
+- unsigned short *us2;
++ SLsmg_Char_Type *us1;
++ SLsmg_Char_Type *us2;
+ int i1;
+ int i2;
+
+--- libterm-slang-perl.orig/typemap
++++ libterm-slang-perl/typemap
+@@ -1,6 +1,8 @@
+ TYPEMAP
+
+ SLsmg_Term_Type * T_PTROBJ
++SLsmg_Char_Type * T_PTROBJ
++SLrline_Type * T_PTROBJ
+
+ Scroll_Line_Type * O_OBJECT
+ SLscroll_Window_Type * T_PTROBJ
Modified: trunk/libterm-slang-perl/debian/rules
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libterm-slang-perl/debian/rules?rev=20799&op=diff
==============================================================================
--- trunk/libterm-slang-perl/debian/rules (original)
+++ trunk/libterm-slang-perl/debian/rules Sat Jun 7 01:03:36 2008
@@ -1,42 +1,73 @@
#!/usr/bin/make -f
+# This debian/rules file is provided as a template for normal perl
+# packages. It was created by Marc Brockschmidt <marc at dch-faq.de> for
+# the Debian Perl Group (http://pkg-perl.alioth.debian.org/) but may
+# be used freely wherever it is useful.
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+# If set to a true value then MakeMaker's prompt function will
+# always return the default without waiting for user input.
+export PERL_MM_USE_DEFAULT=1
+
+include /usr/share/quilt/quilt.make
+
+PERL ?= /usr/bin/perl
+PACKAGE = $(shell dh_listpackages)
+TMP = $(CURDIR)/debian/$(PACKAGE)
+
+# Allow disabling build optimisation by setting noopt in
+# $DEB_BUILD_OPTIONS
+CFLAGS = -Wall -g
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+ CFLAGS += -O0
+else
+ CFLAGS += -O2
+endif
build: build-stamp
-build-stamp:
+build-stamp: $(QUILT_STAMPFN)
dh_testdir
- perl Makefile.PL INSTALLDIRS=vendor
- $(MAKE) LD_RUN_PATH="" OPTIMIZE="-O2 -g -Wall"
+ $(PERL) Makefile.PL INSTALLDIRS=vendor
+ $(MAKE) OPTIMIZE="$(CFLAGS)" LD_RUN_PATH=""
$(MAKE) test
- touch build-stamp
+ touch $@
-clean:
+clean: unpatch
dh_testdir
dh_testroot
- rm -f build-stamp
- if [ -e Makefile ]; then $(MAKE) realclean; fi
- dh_clean
+ dh_clean build-stamp install-stamp
+ [ ! -f Makefile ] || $(MAKE) realclean
-install: build
+install: install-stamp
+install-stamp: build-stamp
dh_testdir
dh_testroot
dh_clean -k
- dh_installdirs usr/lib
- $(MAKE) install PREFIX=$(CURDIR)/debian/`dh_listpackages`/usr
- [ ! -d $(CURDIR)/debian/`dh_listpackages`/usr/share/perl5 ] || rmdir --ignore-fail-on-non-empty --parents --verbose $(CURDIR)/debian/`dh_listpackages`/usr/share/perl5
+ $(MAKE) install DESTDIR=$(TMP) PREFIX=/usr
+ [ ! -d $(TMP)/usr/share/perl5 ] || \
+ rmdir --ignore-fail-on-non-empty --parents --verbose \
+ $(TMP)/usr/share/perl5
+ touch $@
+# Build architecture-independent files here.
binary-indep: build install
+# We have nothing to do here for an architecture-dependent package
+# Build architecture-dependent files here.
binary-arch: build install
dh_testdir
dh_testroot
dh_installdocs TODO
dh_installexamples demo/*
dh_installchangelogs Changes
+ dh_shlibdeps
dh_strip
+ dh_perl
dh_compress
dh_fixperms
dh_installdeb
- dh_perl
- dh_shlibdeps
dh_gencontrol
dh_md5sums
dh_builddeb
Modified: trunk/libterm-slang-perl/typemap
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libterm-slang-perl/typemap?rev=20799&op=diff
==============================================================================
--- trunk/libterm-slang-perl/typemap (original)
+++ trunk/libterm-slang-perl/typemap Sat Jun 7 01:03:36 2008
@@ -1,8 +1,6 @@
TYPEMAP
SLsmg_Term_Type * T_PTROBJ
-SLsmg_Char_Type * T_PTROBJ
-SLrline_Type * T_PTROBJ
Scroll_Line_Type * O_OBJECT
SLscroll_Window_Type * T_PTROBJ
More information about the Pkg-perl-cvs-commits
mailing list