Package: micro-inetd
Severity: wishlist
Tags: patch
Hi,
The dpatch patch management system has been deprecated for some time. The
Lintian currently flags use of dpatch packages as an error. The new 3.0
packaging format is an improved version which, among other things, contains
patch management built-in. For more information, see:
http://wiki.debian.org/Projects/DebSrc3.0
I had some free time; see attached patch to migrate to new package
format. Note that all files in debian/patches/* are canocalized to
*.patch.
Let me know if there is anything that needs adjusting or if it is ok
to upload this version in a NMU in case you are working on other
issues needing attention.
Thanks,
Jari
>From b89cd27ae347b5daf3ab213245774a0450f86eee Mon Sep 17 00:00:00 2001
From: Jari Aalto <[email protected]>
Date: Mon, 27 Feb 2012 15:33:37 -0500
Subject: [PATCH] format-3.0
Organization: Private
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 8bit
Signed-off-by: Jari Aalto <[email protected]>
---
debian/README.source | 6 ------
debian/changelog | 8 ++++++++
debian/compat | 2 +-
debian/control | 4 ++--
debian/patches/00list | 1 -
.../{rename_binary.dpatch => rename_binary.patch} | 8 ++------
debian/patches/series | 1 +
debian/rules | 6 +-----
debian/source/format | 1 +
micro_inetd | Bin 3992 -> 0 bytes
10 files changed, 16 insertions(+), 21 deletions(-)
delete mode 100644 debian/README.source
delete mode 100644 debian/patches/00list
rename debian/patches/{rename_binary.dpatch => rename_binary.patch} (78%)
create mode 100644 debian/patches/series
create mode 100644 debian/source/format
delete mode 100755 micro_inetd
diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index 1f7b435..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# Comments about Debian specific changes to the sourcecode via patches
-#
-
- - Makefile changed to generate a binary and manpage called "micro-inetd"
- instead of "micro_inetd"
diff --git a/debian/changelog b/debian/changelog
index 46d412a..6ce8c58 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+micro-inetd (20050629-5.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Remove deprecated dpatch and upgrade to packaging format "3.0 quilt".
+ * Update to Standards-Version to 3.9.3 and debhelper to 9.
+
+ -- Jari Aalto <[email protected]> Mon, 27 Feb 2012 15:32:53 -0500
+
micro-inetd (20050629-5) unstable; urgency=low
* Renamed micro_inetd to micro-inetd (Closes: #540581).
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+9
diff --git a/debian/control b/debian/control
index 5087ec9..7180e72 100644
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,8 @@ Source: micro-inetd
Section: net
Priority: optional
Maintainer: Herve Rousseau <[email protected]>
-Build-Depends: debhelper (>= 5), dpatch
-Standards-Version: 3.8.3
+Build-Depends: debhelper (>= 9)
+Standards-Version: 3.9.3
Package: micro-inetd
Architecture: any
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 4d8bf26..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1 +0,0 @@
-rename_binary.dpatch
diff --git a/debian/patches/rename_binary.dpatch b/debian/patches/rename_binary.patch
similarity index 78%
rename from debian/patches/rename_binary.dpatch
rename to debian/patches/rename_binary.patch
index 9719b07..8236887 100644
--- a/debian/patches/rename_binary.dpatch
+++ b/debian/patches/rename_binary.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## rename_binary.dpatch by Herve Rousseau <[email protected]>
-##
-## DP: Patch against Makefile to handle stripping and rename
-## DP: binaries and manpages "micro_inetd" in "micro-inetd"
+From: Herve Rousseau <[email protected]>
+Subject: Fi Makefile strip, rename and manpages "micro_inetd" in "micro-inetd"
-@DPATCH@
diff -urNad micro-inetd-20050629~/Makefile micro-inetd-20050629/Makefile
--- micro-inetd-20050629~/Makefile 2002-01-02 06:24:29.000000000 +0100
+++ micro-inetd-20050629/Makefile 2009-08-20 15:43:47.000000000 +0200
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..d72387e
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+rename_binary.patch
diff --git a/debian/rules b/debian/rules
index f30f863..e1ff22c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,6 @@
#!/usr/bin/make -f
#export DH_VERBOSE=1
-include /usr/share/dpatch/dpatch.make
CFLAGS = -Wall -g
@@ -12,7 +11,7 @@ else
endif
build: build-stamp
-build-stamp: patch-stamp
+build-stamp:
dh_testdir
CFLAGS="$(CFLAGS)" $(MAKE)
@@ -26,9 +25,6 @@ clean:
$(MAKE) clean
- dpatch deapply-all
- rm -rf patch-stamp debian/patched
-
dh_clean
install: build
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)
diff --git a/micro_inetd b/micro_inetd
deleted file mode 100755
index 9c2462f61291af121058689121c16cf9c018703b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 3992
zcmbtXU2I%O6+X5%$;P;??K;6wmo6ceT$EnhA#F@(QS5k~pqgg!`X{J1oAvrScenee
zyLS^;#I4h<qipOI3qm}UAVpMyJOrr<LW<fT8EhqugdmFGsXVwq;cn{(C#p=O8kX;y
zy|*k?D<K%`+cV#sGiT<^%$YlW(LXp)Q&S@Yrmpt|`=wUuq((#*&w9N3AOj8fLD?rh
z*&-dXLt133;%J+L4R8^h*aCQfI^g#Nbi`*+C#a)uLKWx)*jX<^u)j1`^sV5nuXwz~
zJv4i3MU6{6sxk-t9CSnxoZ!4TMrSr-cE+QV`ivgwj88qL$EUSSO6!J7nt(@GL3s$E
zuTKG=1z5HN&43#R+uHbpvIF24_W`YdTehKcKfoASIK~62Ch|GRhn@Pz39r-G0?GIh
zmMS|PiE!0=Iolu)f`8i4RSU+zwP0J5+$q!Fo+|!D@ZtH2zFD?O7x?A8%j@L{@Hq7C
zkc|JUz#2H$XcsU5wBbxZDE>6$HRyLk(mn_@{?Oy~Vso4DcMN<S_5nvf0eQNre*~O+
z%XMy&21!B=LT^FRUluqG|37i~X~+xU5NiA!<mD=U9{e{|{5#+cRpb2t{7Hw?|Brw_
zR@q+yk3;`?Na}wEELQ2SfVW+6=i4N&gYSX;W01680ybeEclZrRcYV1ZzXj*|K&bus
z!$<hr;6C_w^?&^c7o6t^Pw|%|)c?(AdcXd)LlQbXc(ku~Fm!ZaAm|?s4fpm9`a=?m
zCZm>wrXl21IBKP%QxXd4rkOHjI%Pg5(`hrBw5HLR84!I2#*ug`ql2f-)QMy`p-b3O
z?deLdOe*r6Zb>*2(bJYpMw3&RO~%rblF$<wXaL%zpbcB8s7z(kdqq#4jGCz=M$jWC
zB@>0`xP)|g#_aT|uocFLlbK8?V}(sN!7WkA-c%$UXAU1w^jLTI&=aJc6^@#-ep`^R
zJvc|(kUURPA`uT#B7yoTk%&hqkw}A-Sm6LAl6067iE@l`E6yt=lK40!Hg$>;$!$;~
z;p3D@z%(T;0gDm|J41=f;WQ-@(f%otU|FR6co$mA?fdY{eJ!_hrUt8})iO#uXKYYc
zx}`X0ZZPFbONuiBgI7)IHN_c;;UmAOI3qGT$cu_IGJ~mInp2z+8a?D`#Tlt_ko>sf
zjMz9r9#EW-8%){KLB+WO22;7zr8rl@I8N?UoGW55pi-maTp1%xE{b!7j2ZIvf1;tC
zD`m`)uPV+JGtQCU0w2l0Gd3E`-!9C07qXth_%9mr4>RZHH(uz-&3eV!wcz)@+KN7N
zJ!0)B&h>O=w-=7o<nLqKK{RI9uFj!4zhrG6vJ)6Fx8gCFhBo81BN!w&Hfr<o3D^^8
zDq_sw8$R^OJ;h(Kn)4gEWl!!alD+rd*8IjoUHMjSdGpK%ZP1>&voNuFb6NH2P<{9-
z*8Q%X>i51fDi-Pc%-Z)c7NT01XjrIwwH47IlG+!y*l(e|oblLy!<-7=_O_SHm{Y7a
zR%>_T^yIG_Gv_?sSc^RdeQu@o#(W&p<<TgpTA<)x4~*KSf0WDl<=jfc{9Cha_CvJo
z@mRNwpEKqQP{wNPELw|pCw}LbvSTr^Uq%(}vlO-VNr+K9O(H>iM)e8WX~^7)FIF40
zbyS1)Q5cMs_uGF5GhV0rr<AF^6N>ys(AFTa+@&GRGrxh@%a1c$V+pp#60Sabu+rfj
z2(C?T&Ep1XqA9oHEu55CO~Jnzh?VW%ZL+BWTj`s9*Y2eOB3rfht6IHPZ~U2)xC*nI
z%WAybS_>9>dSSLP1~=ub*M0-a{B?TSm~A%Rqy0HFA@(rmaKpcbrIwhd;9m>GJO;O5
z)V{6;Zkb=2ebBheE+dsL8oJ~+VsKuVSP$A|w4NVnI5%<!{=1jXuKw!H#<Qz=|NHrS
zXIH25{=2cp;HVu{&JYF0uRjlG-iougA&LfH8Kd^RvcaK+%>%Ug%Li(Xzobomy`Zl?
z`>oK;<zms!VG7IcJ<NMGF4;`@gnq#1YtQ)7Dbw=t3OB<E-?L%!L`KuJiTV#e0?sx5
z@5|a3JQ^DEj|Ba_{ryA#aj%P9LFCv-tO$;&Bbi#{EGE8nF9F{Jehgdzehu6P{si0w
zYVmz+26h2^fj(dem;_AVC4d`1@V)ddz;_PcDSTrwarr)2#~YDvqf0rD7uU30J>&7>
z+LdN><hzGi!M7Pp9k2)U<h!m2@EyeW7~f1QFMGVKUxVZ~o5Aos^<hw`%i%+Z4){6_
zKQr>EZ?Cpr+lvqG|I_CBW{h3kT32_~c>hbAXqo2|R(KN9GAq(>Yxt_`W?D2OoH0b3
zdOiu$inL78Og*mQb6csT<CbXZp`fX%`YLPc&7hen^>NlJzY!~CqSI7GoJgS`Jckp}
zh*aD~Qi+6~L~}A_>0H78s_<RO__<H&{{%?){fw&8QGNm7-qVifU>)*JfcwnC^Fcfc
z@GQ`d=i@4zuLIO^97>)Ou0Q+Ij_2tT2+xsQ-0GLn!2bnk$MbRx4!D=>%QHlO<b8l^
z$MdxU1<xJrsCVt2MxDNSetEu!5ftlgp&iRN0M~9DcH^+?awi2H?TFDTyG7*DBAod+
zs8d{j<KV78=F??N_T$E#bnF-}bN>qLrW{`s?i6B9okQ`f%m35dv1sSk(^Yo-bhg2c
z>){sH?i3p6oBnpgZuckHy-;Px{N4k*VYIo0{)imF_~?)K75`7<ez@aNavqD0q#fVo
xjW|4wZjg=+LcR-BH4E(mR5-=ey#mhv16im){t0$GI~>z3ufgu3OCVi;{{j#J$XEaX
--
1.7.9
