[libterm-slang-perl] 02/15: Switch to source format "3.0 (quilt)"

Axel Beckert abe at deuxchevaux.org
Tue Dec 24 01:44:57 UTC 2013


This is an automated email from the git hooks/post-receive script.

abe pushed a commit to branch master
in repository libterm-slang-perl.

commit 5a0b6bd7013872dcb83a87072205b1c32527a2e6
Author: Axel Beckert <abe at deuxchevaux.org>
Date:   Tue Dec 24 01:36:09 2013 +0100

    Switch to source format "3.0 (quilt)"
    
    Remove quilt traces from debian/rules and quilt build-dependency
    
    Put remaining not-yet-quiltified patches into their own patch
---
 Slang.pm                               |  3 +--
 Slang.xs                               | 10 +-------
 debian/changelog                       |  5 ++++
 debian/control                         |  3 +--
 debian/patches/remaining-changes.patch | 44 ++++++++++++++++++++++++++++++++++
 debian/patches/series                  |  1 +
 debian/rules                           |  6 ++---
 debian/source/format                   |  1 +
 8 files changed, 56 insertions(+), 17 deletions(-)

diff --git a/Slang.pm b/Slang.pm
index eec6c83..1e8d964 100644
--- a/Slang.pm
+++ b/Slang.pm
@@ -1,6 +1,6 @@
 package Term::Slang;
 
-# $Id: Slang.pm,v 1.10 2000/04/17 22:46:08 daniel Exp $
+# $Id: Slang.pm,v 1.9 2000/04/16 21:04:25 daniel Exp $
 
 use strict;
 use Exporter;
@@ -49,7 +49,6 @@ $VERSION   = '0.07';
 	SLtt_reset_video SLtt_reverse_index SLtt_reverse_video SLtt_set_color
 	SLtt_set_cursor_visibility SLtt_set_mouse_mode SLtt_set_scroll_region
 	SLtt_smart_puts SLtt_write_string SLtt_set_mono SLtty_set_suspend_state
-	SLtt_set_screen_size
 
 	SLANG_GETKEY_ERROR SLANG_VERSION SLSMG_CKBRD_CHAR SLSMG_COLOR_BLACK
 	SLSMG_COLOR_BLUE SLSMG_COLOR_BRIGHT_BLUE SLSMG_COLOR_BRIGHT_BROWN
diff --git a/Slang.xs b/Slang.xs
index 82440b4..40718dc 100644
--- a/Slang.xs
+++ b/Slang.xs
@@ -1,5 +1,5 @@
 
-/* $Id: Slang.xs,v 1.10 2000/04/17 22:46:08 daniel Exp $ */
+/* $Id: Slang.xs,v 1.9 2000/04/16 20:56:51 daniel Exp $ */
 
 #ifdef __cplusplus
 "C" {
@@ -630,14 +630,6 @@ SLtt_get_screen_size()
 		PUSHs(sv_2mortal(newSViv(SLtt_Screen_Rows)));
 		PUSHs(sv_2mortal(newSViv(SLtt_Screen_Cols)));
 
-void
-SLtt_set_screen_size(r, c)
-	int r;
-	int c;
-	CODE:
-		SLtt_Screen_Rows = r;
-		SLtt_Screen_Cols = c;
-
 int
 SLtt_set_cursor_visibility(i1)
 	int i1;
diff --git a/debian/changelog b/debian/changelog
index d968fcd..1fd3ff7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -30,6 +30,11 @@ libterm-slang-perl (0.07-12) UNRELEASED; urgency=low
   * Change Vcs-Git to canonical URI (git://anonscm.debian.org)
   * Change search.cpan.org based URIs to metacpan.org based URIs
 
+  [ Axel Beckert ]
+  * Switch to source format "3.0 (quilt)"
+    + Remove quilt traces from debian/rules and quilt build-dependency
+    + Put remaining not-yet-quiltified patches into their own patch
+
  -- gregor herrmann <gregor+debian at comodo.priv.at>  Tue, 09 Oct 2007 22:32:23 +0200
 
 libterm-slang-perl (0.07-11) unstable; urgency=low
diff --git a/debian/control b/debian/control
index edef88d..da089af 100644
--- a/debian/control
+++ b/debian/control
@@ -4,8 +4,7 @@ Section: perl
 Priority: optional
 Build-Depends: libslang2-dev,
                debhelper (>= 5),
-               perl,
-               quilt
+               perl
 Standards-Version: 3.7.3
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-perl/packages/libterm-slang-perl.git
 Vcs-Git: git://anonscm.debian.org/pkg-perl/packages/libterm-slang-perl.git
diff --git a/debian/patches/remaining-changes.patch b/debian/patches/remaining-changes.patch
new file mode 100644
index 0000000..2ab11c7
--- /dev/null
+++ b/debian/patches/remaining-changes.patch
@@ -0,0 +1,44 @@
+Description: Remaining changes from non-source-format-3.0 package
+
+--- libterm-slang-perl-0.07.orig/Slang.pm
++++ libterm-slang-perl-0.07/Slang.pm
+@@ -1,6 +1,6 @@
+ package Term::Slang;
+ 
+-# $Id: Slang.pm,v 1.9 2000/04/16 21:04:25 daniel Exp $
++# $Id: Slang.pm,v 1.10 2000/04/17 22:46:08 daniel Exp $
+ 
+ use strict;
+ use Exporter;
+@@ -49,6 +49,7 @@ $VERSION   = '0.07';
+ 	SLtt_reset_video SLtt_reverse_index SLtt_reverse_video SLtt_set_color
+ 	SLtt_set_cursor_visibility SLtt_set_mouse_mode SLtt_set_scroll_region
+ 	SLtt_smart_puts SLtt_write_string SLtt_set_mono SLtty_set_suspend_state
++	SLtt_set_screen_size
+ 
+ 	SLANG_GETKEY_ERROR SLANG_VERSION SLSMG_CKBRD_CHAR SLSMG_COLOR_BLACK
+ 	SLSMG_COLOR_BLUE SLSMG_COLOR_BRIGHT_BLUE SLSMG_COLOR_BRIGHT_BROWN
+--- libterm-slang-perl-0.07.orig/Slang.xs
++++ libterm-slang-perl-0.07/Slang.xs
+@@ -1,5 +1,5 @@
+ 
+-/* $Id: Slang.xs,v 1.9 2000/04/16 20:56:51 daniel Exp $ */
++/* $Id: Slang.xs,v 1.10 2000/04/17 22:46:08 daniel Exp $ */
+ 
+ #ifdef __cplusplus
+ "C" {
+@@ -635,6 +635,14 @@ SLtt_get_screen_size()
+ 		PUSHs(sv_2mortal(newSViv(SLtt_Screen_Rows)));
+ 		PUSHs(sv_2mortal(newSViv(SLtt_Screen_Cols)));
+ 
++void
++SLtt_set_screen_size(r, c)
++	int r;
++	int c;
++	CODE:
++		SLtt_Screen_Rows = r;
++		SLtt_Screen_Cols = c;
++
+ int
+ SLtt_set_cursor_visibility(i1)
+ 	int i1;
diff --git a/debian/patches/series b/debian/patches/series
index 6a7b80e..5e169c5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
+remaining-changes.patch
 slang2.patch
diff --git a/debian/rules b/debian/rules
index 8e27db5..1be2e07 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,8 +11,6 @@
 # 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)
@@ -27,14 +25,14 @@ else
 endif
 
 build: build-stamp
-build-stamp: $(QUILT_STAMPFN)
+build-stamp:
 	dh_testdir
 	$(PERL) Makefile.PL INSTALLDIRS=vendor
 	$(MAKE) OPTIMIZE="$(CFLAGS)" LD_RUN_PATH=""
 	$(MAKE) test
 	touch $@
 
-clean: unpatch
+clean:
 	dh_testdir
 	dh_testroot
 	dh_clean build-stamp install-stamp
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libterm-slang-perl.git



More information about the Pkg-perl-cvs-commits mailing list