diff options
| -rw-r--r-- | debian/changelog | 15 | ||||
| -rw-r--r-- | debian/control | 11 | ||||
| -rwxr-xr-x | debian/rules | 4 | ||||
| -rw-r--r-- | wlp/module/Makefile.pre.in | 31 |
4 files changed, 15 insertions, 46 deletions
diff --git a/debian/changelog b/debian/changelog index 2020dcf..458e5aa 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,12 @@ -<<<<<<< HEAD -======= +pyg (0.9.6-4.1) unstable; urgency=low + + * Non-maintainer upload. + * Update package to the last python policy (Closes: #380905). + * Bump DH_COMPAT to 4. + * Bump Standards-Version to 3.7.2. + + -- Pierre Habouzit <madcoder@debian.org> Sat, 12 Aug 2006 14:01:38 +0200 + pyg (0.9.6-4) unstable; urgency=low * added some more header to be stripepd in mail2news class @@ -21,7 +28,6 @@ pyg (0.9.6-3) unstable; urgency=low -- Cosimo Alfarano <kalfa@debian.org> Wed, 5 Nov 2003 11:59:29 +0100 ->>>>>>> 32401d9... pyg 0.9.6-4 from archive.debian.org pyg (0.9.6-2) unstable; urgency=low * typos in debian/control fixed (closes: #125276) @@ -191,6 +197,3 @@ pyg (0.9-1) unstable; urgency=low -- Cosimo Alfarano <alfarano@students.cs.unibo.it> Sun, 25 Jun 2000 17:52:35 +0200 -Local variables: -mode: debian-changelog -End: diff --git a/debian/control b/debian/control index f5076b3..9689cc3 100644 --- a/debian/control +++ b/debian/control @@ -2,17 +2,12 @@ Source: pyg Section: news Priority: optional Maintainer: Cosimo Alfarano <kalfa@debian.org> -<<<<<<< HEAD -Standards-Version: 3.5.6.0 -Build-Depends: debhelper, python-dev (>= 2.1), flex, bison -======= -Standards-Version: 3.6.1.0 -Build-Depends: debhelper (>= 3.0), python-dev (>= 2.1), flex, bison ->>>>>>> 32401d9... pyg 0.9.6-4 from archive.debian.org +Standards-Version: 3.7.2 +Build-Depends: debhelper (>= 3.0), python-dev (>= 2.1), flex, bison, python-support (>= 0.4.0) Package: pyg Architecture: any -Depends: python (>= 2.1) +Depends: ${python:Depends} Suggests: news-transport-system , mail-transport-agent, procmail Description: Python Mail <-> News Gateway Python Gateway Script from news to mail and vice versa. diff --git a/debian/rules b/debian/rules index 23bee10..1270bed 100755 --- a/debian/rules +++ b/debian/rules @@ -5,7 +5,7 @@ #export DH_VERBOSE=1 # This is the debhelper compatability version to use. -export DH_COMPAT=3 +export DH_COMPAT=4 export package=pyg export debdestdir=$(CURDIR)/debian/$(package) @@ -59,6 +59,8 @@ binary-arch: build install # dh_fixperms doesn't fix perms in /usr/share/doc subdirs find $(debdestdir)/usr/share/doc/$(package) -type d -exec chmod 0755 {} \; + + dh_pysupport dh_strip dh_compress diff --git a/wlp/module/Makefile.pre.in b/wlp/module/Makefile.pre.in index a30609e..05f108b 100644 --- a/wlp/module/Makefile.pre.in +++ b/wlp/module/Makefile.pre.in @@ -17,11 +17,7 @@ # only withs with Python 1.5, alpha 3 or newer.) # Create a file Setup.in for your extension. This file follows the -<<<<<<< HEAD -# format of the Modules/Setup.in file; see the instructions there. -======= # format of the Modules/Setup.dist file; see the instructions there. ->>>>>>> 32401d9... pyg 0.9.6-4 from archive.debian.org # For a simple module called "spam" on file "spammodule.c", it can # contain a single line: # spam spammodule.c @@ -132,11 +128,7 @@ SO= @SO@ LDSHARED= @LDSHARED@ CCSHARED= @CCSHARED@ LINKFORSHARED= @LINKFORSHARED@ -<<<<<<< HEAD -#@SET_CCC@ -======= CXX= @CXX@ ->>>>>>> 32401d9... pyg 0.9.6-4 from archive.debian.org # Install prefix for architecture-independent files prefix= /usr/local @@ -156,11 +148,7 @@ SHELL= /bin/sh # Expanded directories BINDIR= $(exec_installdir)/bin LIBDIR= $(exec_prefix)/lib -<<<<<<< HEAD -MANDIR= $(installdir)/man -======= MANDIR= $(installdir)/share/man ->>>>>>> 32401d9... pyg 0.9.6-4 from archive.debian.org INCLUDEDIR= $(installdir)/include SCRIPTDIR= $(prefix)/lib @@ -176,19 +164,11 @@ LIBPL= $(LIBP)/config PYTHONLIBS= $(LIBPL)/libpython$(VERSION).a -<<<<<<< HEAD -MAKESETUP= ./makesetup -MAKEFILE= $(LIBPL)/Makefile -CONFIGC= $(LIBPL)/config.c -CONFIGCIN= $(LIBPL)/config.c.in -SETUP= $(LIBPL)/Setup.thread $(LIBPL)/Setup.local $(LIBPL)/Setup -======= MAKESETUP= $(LIBPL)/makesetup MAKEFILE= $(LIBPL)/Makefile CONFIGC= $(LIBPL)/config.c CONFIGCIN= $(LIBPL)/config.c.in SETUP= $(LIBPL)/Setup.config $(LIBPL)/Setup.local $(LIBPL)/Setup ->>>>>>> 32401d9... pyg 0.9.6-4 from archive.debian.org SYSLIBS= $(LIBM) $(LIBC) @@ -271,11 +251,7 @@ sedscript: $(MAKEFILE) -e '2s%.*%# $H%p' \ -e '/^VERSION=/s/^VERSION=[ ]*\(.*\)/s%@VERSION[@]%\1%/p' \ -e '/^CC=/s/^CC=[ ]*\(.*\)/s%@CC[@]%\1%/p' \ -<<<<<<< HEAD - -e '/^CCC=/s/^CCC=[ ]*\(.*\)/s%#@SET_CCC[@]%CCC=\1%/p' \ -======= -e '/^CXX=/s/^CXX=[ ]*\(.*\)/s%@CXX[@]%\1%/p' \ ->>>>>>> 32401d9... pyg 0.9.6-4 from archive.debian.org -e '/^LINKCC=/s/^LINKCC=[ ]*\(.*\)/s%@LINKCC[@]%\1%/p' \ -e '/^OPT=/s/^OPT=[ ]*\(.*\)/s%@OPT[@]%\1%/p' \ -e '/^LDFLAGS=/s/^LDFLAGS=[ ]*\(.*\)/s%@LDFLAGS[@]%\1%/p' \ @@ -294,10 +270,6 @@ sedscript: $(MAKEFILE) -e '/^$P=/s/^$P=\(.*\)/s%^$P=.*%$P=\1%/p' \ -e '/^$E=/s/^$E=\(.*\)/s%^$E=.*%$E=\1%/p' \ $(MAKEFILE) >sedscript -<<<<<<< HEAD - echo "/^#@SET_CCC@/d" >>sedscript -======= ->>>>>>> 32401d9... pyg 0.9.6-4 from archive.debian.org echo "/^installdir=/s%=.*%= $(installdir)%" >>sedscript echo "/^exec_installdir=/s%=.*%=$(exec_installdir)%" >>sedscript echo "/^srcdir=/s%=.*%= $(srcdir)%" >>sedscript @@ -305,15 +277,12 @@ sedscript: $(MAKEFILE) echo "/^LINKPATH=/s%=.*%= $(LINKPATH)%" >>sedscript echo "/^BASELIB=/s%=.*%= $(BASELIB)%" >>sedscript echo "/^BASESETUP=/s%=.*%= $(BASESETUP)%" >>sedscript -<<<<<<< HEAD -======= if grep 's%@DEFS' sedscript >/dev/null 2>&1; then \ :; \ else \ echo "s%@DEFS[@]%%" >>sedscript; \ fi ->>>>>>> 32401d9... pyg 0.9.6-4 from archive.debian.org # Bootstrap target boot: clobber |