the huge packaging update
authorgregor herrmann <gregoa@debian.org>
Sat, 26 Feb 2011 18:19:41 +0000 (18:19 -0000)
committergregor herrmann <gregoa@debian.org>
Sat, 26 Feb 2011 18:19:41 +0000 (18:19 -0000)
21 files changed:
config.guess
config.sub
debian/changelog
debian/compat
debian/control
debian/copyright
debian/dirs [deleted file]
debian/docs [deleted file]
debian/fullquottel-devel [deleted file]
debian/fullquottel-user [deleted file]
debian/fullquottel.doc-base.fullquottel-devel [new file with mode: 0644]
debian/fullquottel.doc-base.fullquottel-user [new file with mode: 0644]
debian/fullquottel.docs [new file with mode: 0644]
debian/fullquottel.examples [new file with mode: 0644]
debian/fullquottel.install [new file with mode: 0644]
debian/install [deleted file]
debian/postinst [deleted file]
debian/prerm [deleted file]
debian/rules
debian/source/format [new file with mode: 0644]
fullquottel.1

index 278f9e9e07c1d1a3bda668e6529bcce3006cfbdf..396482d6cb50b24a598700992f65d340165591d6 100755 (executable)
@@ -4,7 +4,7 @@
 #   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
 #   Inc.
 
-timestamp='2007-07-22'
+timestamp='2006-07-02'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -161,7 +161,6 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
            arm*) machine=arm-unknown ;;
            sh3el) machine=shl-unknown ;;
            sh3eb) machine=sh-unknown ;;
-           sh5el) machine=sh5le-unknown ;;
            *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
        esac
        # The Operating System including object format, if it has switched
@@ -330,7 +329,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
        echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
        exit ;;
-    i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
+    i86pc:SunOS:5.*:*)
        echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
        exit ;;
     sun4*:SunOS:6*:*)
@@ -781,7 +780,7 @@ EOF
     i*:CYGWIN*:*)
        echo ${UNAME_MACHINE}-pc-cygwin
        exit ;;
-    *:MINGW*:*)
+    i*:MINGW*:*)
        echo ${UNAME_MACHINE}-pc-mingw32
        exit ;;
     i*:windows32*:*)
@@ -791,15 +790,12 @@ EOF
     i*:PW*:*)
        echo ${UNAME_MACHINE}-pc-pw32
        exit ;;
-    *:Interix*:[3456]*)
-       case ${UNAME_MACHINE} in
-           x86)
-               echo i586-pc-interix${UNAME_RELEASE}
-               exit ;;
-           EM64T | authenticamd)
-               echo x86_64-unknown-interix${UNAME_RELEASE}
-               exit ;;
-       esac ;;
+    x86:Interix*:[3456]*)
+       echo i586-pc-interix${UNAME_RELEASE}
+       exit ;;
+    EM64T:Interix*:[3456]*)
+       echo x86_64-unknown-interix${UNAME_RELEASE}
+       exit ;;
     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
        echo i${UNAME_MACHINE}-pc-mks
        exit ;;
@@ -954,9 +950,6 @@ EOF
     x86_64:Linux:*:*)
        echo x86_64-unknown-linux-gnu
        exit ;;
-    xtensa:Linux:*:*)
-       echo xtensa-unknown-linux-gnu
-       exit ;;
     i*86:Linux:*:*)
        # The BFD linker knows what the default object file format is, so
        # first see if it will tell us. cd to the root directory to prevent
@@ -1215,15 +1208,6 @@ EOF
     SX-6:SUPER-UX:*:*)
        echo sx6-nec-superux${UNAME_RELEASE}
        exit ;;
-    SX-7:SUPER-UX:*:*)
-       echo sx7-nec-superux${UNAME_RELEASE}
-       exit ;;
-    SX-8:SUPER-UX:*:*)
-       echo sx8-nec-superux${UNAME_RELEASE}
-       exit ;;
-    SX-8R:SUPER-UX:*:*)
-       echo sx8r-nec-superux${UNAME_RELEASE}
-       exit ;;
     Power*:Rhapsody:*:*)
        echo powerpc-apple-rhapsody${UNAME_RELEASE}
        exit ;;
index 1761d8bdf6307c02067b3581e183ba2fdef7e1fa..fab0aa3556632a4aec253b77804270a096c11c3e 100755 (executable)
@@ -4,7 +4,7 @@
 #   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
 #   Inc.
 
-timestamp='2007-06-28'
+timestamp='2006-09-20'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -245,12 +245,12 @@ case $basic_machine in
        | bfin \
        | c4x | clipper \
        | d10v | d30v | dlx | dsp16xx \
-       | fido | fr30 | frv \
+       | fr30 | frv \
        | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
        | i370 | i860 | i960 | ia64 \
        | ip2k | iq2000 \
        | m32c | m32r | m32rle | m68000 | m68k | m88k \
-       | maxq | mb | microblaze | mcore | mep \
+       | maxq | mb | microblaze | mcore \
        | mips | mipsbe | mipseb | mipsel | mipsle \
        | mips16 \
        | mips64 | mips64el \
@@ -324,7 +324,7 @@ case $basic_machine in
        | clipper-* | craynv-* | cydra-* \
        | d10v-* | d30v-* | dlx-* \
        | elxsi-* \
-       | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
+       | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
        | h8300-* | h8500-* \
        | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
        | i*86-* | i860-* | i960-* | ia64-* \
@@ -475,8 +475,8 @@ case $basic_machine in
                basic_machine=craynv-cray
                os=-unicosmp
                ;;
-       cr16)
-               basic_machine=cr16-unknown
+       cr16c)
+               basic_machine=cr16c-unknown
                os=-elf
                ;;
        crds | unos)
@@ -683,10 +683,6 @@ case $basic_machine in
                basic_machine=i386-pc
                os=-mingw32
                ;;
-       mingw32ce)
-               basic_machine=arm-unknown
-               os=-mingw32ce
-               ;;
        miniframe)
                basic_machine=m68000-convergent
                ;;
@@ -929,9 +925,6 @@ case $basic_machine in
                basic_machine=sh-hitachi
                os=-hms
                ;;
-       sh5el)
-               basic_machine=sh5le-unknown
-               ;;
        sh64)
                basic_machine=sh64-unknown
                ;;
@@ -1226,7 +1219,7 @@ case $os in
              | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
              | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
              | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-             | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
+             | -skyos* | -haiku* | -rdos* | -toppers*)
        # Remember, each alternative MUST END IN *, to match a version number.
                ;;
        -qnx*)
@@ -1421,9 +1414,6 @@ case $basic_machine in
        m68*-cisco)
                os=-aout
                ;;
-        mep-*)
-               os=-elf
-               ;;
        mips*-cisco)
                os=-elf
                ;;
index b86496736972d54f201b75cda5f39ca3b2af53be..98dce2a95647b47977c384cb162f40144473b5be 100644 (file)
@@ -1,14 +1,14 @@
 fullquottel (0.1.2-2) UNRELEASED; urgency=low
 
-  * Clean up debian/rules and debian/dirs.
-  * Don't ignore return value of $(MAKE) distclean.
   * Move upstream URL from the description to the new Homepage field
     (closes: #615342).
   * Change XS-Vcs-* fields to Vcs-*.
-  * Set Standards-Version to 3.7.3 (no changes required).
-  * Create install-stamp target in debian/rules and adapt dependencies.
-  * Remove debian/examples and install examples directly from debian/rules.
   * Change debian/copyright to the new machine-readable format.
+  * Set Standards-Version to 3.9.1 (no changes).
+  * Switch to source format 3.0 (quilt).
+  * Switch to debhelper 8; use the autotools-dev debhelper sequence in
+    debian/rules.
+  * Update my email address.
 
  -- gregor herrmann <gregor+debian@comodo.priv.at>  Mon, 24 Dec 2007 23:08:30 +0100
 
index 7ed6ff82de6bcc2a78243fc9c54d3ef5ac14da69..45a4fb75db864000d01701c0f7a51864bd4daabf 100644 (file)
@@ -1 +1 @@
-5
+8
index b9a29adb3172f9fc3526fbab424f91ec8a55aefd..b9873dce18725f0a6e008d60d4868675a157841e 100644 (file)
@@ -1,10 +1,10 @@
 Source: fullquottel
 Section: mail
 Priority: optional
-Maintainer: gregor herrmann <gregor+debian@comodo.priv.at>
+Maintainer: gregor herrmann <gregoa@debian.org>>
 Uploaders: tony mancill <tmancill@debian.org>
-Build-Depends: debhelper (>= 5.0.0), autotools-dev
-Standards-Version: 3.7.3
+Build-Depends: debhelper (>= 8), autotools-dev
+Standards-Version: 3.9.1
 Homepage: http://www.toastfreeware.priv.at/
 Vcs-Svn: http://svn.toastfreeware.priv.at/debian/fullquottel/trunk/
 Vcs-Browser: http://svn.toastfreeware.priv.at/wsvn/ToastfreewareDebian/fullquottel/trunk/
@@ -13,7 +13,7 @@ Package: fullquottel
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Suggests: mailtextbody
-Description: Recognizes top-posted e-mail and usenet replies
+Description: tool for recognizing top-posted e-mail and usenet replies
  Fullquottel performs several tests to determine if a message is written in
  the top-post style (a.k.a. "TOFU" or jeopardy-style quoting) - the full
  response above and a full quote of the original message below.
index 91f2ea36507a36bd0117ddc83acc08448a8d6ebd..c0e25bef1ac2927790f880ac450fee72bfd6def8 100644 (file)
@@ -1,15 +1,22 @@
-Upstream source location: http://www.toastfreeware.priv.at/
+Format: http://dep.debian.net/deps/dep5/
+Source: http://www.toastfreeware.priv.at/
 
 Files: *
-Copyright:
- © 2005 Toastfreeware (Philipp Spitzer, Gregor Herrmann)
- Philipp Spitzer <philipp@toastfreeware.priv.at>
- Gregor Herrmann <gregor@toastfreeware.priv.at>
-License: GPL2+
+Copyright: 2005 Toastfreeware (Philipp Spitzer, Gregor Herrmann)
+           Philipp Spitzer <philipp@toastfreeware.priv.at>
+           Gregor Herrmann <gregor@toastfreeware.priv.at>
+License: GPL-2+
+
+Files: debian/*
+Copyright: 2005-2011, gregor herrmann <gregoa@debian.org>
+           2006-2011, tony mancill <tmancill@debian.org>
+License: GPL-2+
+
+License: GPL-2+
  This program is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
  the Free Software Foundation; either version 2 of the License, or
  (at your option) any later version.
-                
-On Debian GNU/Linux systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL'.
+ .                
+ On Debian systems, the complete text of the GNU General
+ Public License version 2 can be found in `/usr/share/common-licenses/GPL-2'.
diff --git a/debian/dirs b/debian/dirs
deleted file mode 100644 (file)
index ee19d5d..0000000
+++ /dev/null
@@ -1 +0,0 @@
-etc
diff --git a/debian/docs b/debian/docs
deleted file mode 100644 (file)
index 6b84eed..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-README
-doc_programmer/
-doc_user/
diff --git a/debian/fullquottel-devel b/debian/fullquottel-devel
deleted file mode 100644 (file)
index 8613eea..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-Document: fullquottel-devel
-Title: Fullquottel Developer Manual
-Author: Gregor Herrmann
-Abstract: This manual describes fullquottel from a
- developer's point of view.
-Section: Apps/Net
-
-Format: HTML
-Index: /usr/share/doc/fullquottel/doc_programmer/html/index.html
-Files: /usr/share/doc/fullquottel/doc_programmer/html/*.html
diff --git a/debian/fullquottel-user b/debian/fullquottel-user
deleted file mode 100644 (file)
index 81a5087..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-Document: fullquottel-user
-Title: Fullquottel User Manual
-Author: Gregor Herrmann
-Abstract: This manual describes how fullquottel is used.
-Section: Apps/Net
-
-Format: HTML
-Index: /usr/share/doc/fullquottel/doc_user/html/index.html
-Files: /usr/share/doc/fullquottel/doc_user/html/*.html
diff --git a/debian/fullquottel.doc-base.fullquottel-devel b/debian/fullquottel.doc-base.fullquottel-devel
new file mode 100644 (file)
index 0000000..8613eea
--- /dev/null
@@ -0,0 +1,10 @@
+Document: fullquottel-devel
+Title: Fullquottel Developer Manual
+Author: Gregor Herrmann
+Abstract: This manual describes fullquottel from a
+ developer's point of view.
+Section: Apps/Net
+
+Format: HTML
+Index: /usr/share/doc/fullquottel/doc_programmer/html/index.html
+Files: /usr/share/doc/fullquottel/doc_programmer/html/*.html
diff --git a/debian/fullquottel.doc-base.fullquottel-user b/debian/fullquottel.doc-base.fullquottel-user
new file mode 100644 (file)
index 0000000..81a5087
--- /dev/null
@@ -0,0 +1,9 @@
+Document: fullquottel-user
+Title: Fullquottel User Manual
+Author: Gregor Herrmann
+Abstract: This manual describes how fullquottel is used.
+Section: Apps/Net
+
+Format: HTML
+Index: /usr/share/doc/fullquottel/doc_user/html/index.html
+Files: /usr/share/doc/fullquottel/doc_user/html/*.html
diff --git a/debian/fullquottel.docs b/debian/fullquottel.docs
new file mode 100644 (file)
index 0000000..6b84eed
--- /dev/null
@@ -0,0 +1,3 @@
+README
+doc_programmer/
+doc_user/
diff --git a/debian/fullquottel.examples b/debian/fullquottel.examples
new file mode 100644 (file)
index 0000000..e39721e
--- /dev/null
@@ -0,0 +1 @@
+examples/*
diff --git a/debian/fullquottel.install b/debian/fullquottel.install
new file mode 100644 (file)
index 0000000..c1c5521
--- /dev/null
@@ -0,0 +1 @@
+examples/fullquottelrc etc/
diff --git a/debian/install b/debian/install
deleted file mode 100644 (file)
index 0108a07..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-examples/fullquottelrc etc/
-debian/fullquottel-user usr/share/doc-base/
-debian/fullquottel-devel usr/share/doc-base/
diff --git a/debian/postinst b/debian/postinst
deleted file mode 100644 (file)
index 4ca9524..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-#! /bin/sh
-# postinst script for fullquottel
-#
-# see: dh_installdeb(1)
-
-set -e
-
-# summary of how this script can be called:
-#        * <postinst> `configure' <most-recently-configured-version>
-#        * <old-postinst> `abort-upgrade' <new version>
-#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
-#          <new-version>
-#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
-#          <failed-install-package> <version> `removing'
-#          <conflicting-package> <version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-#
-
-case "$1" in
-    configure)
-      if which install-docs >/dev/null 2>&1; then
-        install-docs -i /usr/share/doc-base/fullquottel-user
-        install-docs -i /usr/share/doc-base/fullquottel-devel
-      fi
-    ;;
-
-    abort-upgrade|abort-remove|abort-deconfigure)
-    ;;
-
-    *)
-      echo "postinst called with unknown argument \`$1'" >&2
-      exit 1
-    ;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
-
-
diff --git a/debian/prerm b/debian/prerm
deleted file mode 100644 (file)
index fd69e0c..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-#! /bin/sh
-# prerm script for fullquottel
-#
-# see: dh_installdeb(1)
-
-set -e
-
-# summary of how this script can be called:
-#        * <prerm> `remove'
-#        * <old-prerm> `upgrade' <new-version>
-#        * <new-prerm> `failed-upgrade' <old-version>
-#        * <conflictor's-prerm> `remove' `in-favour' <package> <new-version>
-#        * <deconfigured's-prerm> `deconfigure' `in-favour'
-#          <package-being-installed> <version> `removing'
-#          <conflicting-package> <version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-
-
-case "$1" in
-    remove|upgrade|deconfigure)
-      if which install-docs >/dev/null 2>&1; then
-        install-docs -r fullquottel-user
-        install-docs -r fullquottel-devel
-      fi
-    ;;
-
-    failed-upgrade)
-    ;;
-    
-    *)
-      echo "prerm called with unknown argument \`$1'" >&2
-      exit 1
-    ;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
-
-
index 890df7fef467672b602c0134f33a9cf2bf54769b..4a2be6c6cf231360bf2124bf530a64e42e217258 100755 (executable)
@@ -1,87 +1,4 @@
 #!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-
-# These are used for cross-compiling and for saving the configure script
-# from having to guess our platform (since we know it already)
-DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-
-
-CFLAGS = -Wall -g
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-       CFLAGS += -O0
-else
-       CFLAGS += -O2
-endif
-
-config.status: configure
-       dh_testdir
-       # Add here commands to configure the package.
-       CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info
-
-
-build: build-stamp
-build-stamp:  config.status
-       dh_testdir
-       $(MAKE)
-       touch $@
-
-clean:
-       dh_testdir
-       dh_testroot
-       rm -f build-stamp install-stamp
-
-       [ ! -f Makefile ] || $(MAKE) distclean
-ifneq "$(wildcard /usr/share/misc/config.sub)" ""
-       cp -f /usr/share/misc/config.sub config.sub
-endif
-ifneq "$(wildcard /usr/share/misc/config.guess)" ""
-       cp -f /usr/share/misc/config.guess config.guess
-endif
-
-       dh_clean 
-
-install: install-stamp
-install-stamp: build-stamp
-       dh_testdir
-       dh_testroot
-       dh_clean -k 
-       dh_installdirs
-       $(MAKE) install DESTDIR=$(CURDIR)/debian/fullquottel
-       touch $@
-
-
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
-       dh_testdir
-       dh_testroot
-       dh_installchangelogs ChangeLog
-       dh_installdocs
-       dh_installexamples examples/*
-       dh_install
-       dh_installman
-       dh_strip
-       dh_compress
-       dh_fixperms
-       dh_installdeb
-       dh_shlibdeps
-       dh_gencontrol
-       dh_md5sums
-       dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install 
+%:
+       dh $@ --with autotools-dev
diff --git a/debian/source/format b/debian/source/format
new file mode 100644 (file)
index 0000000..163aaf8
--- /dev/null
@@ -0,0 +1 @@
+3.0 (quilt)
index 6865bcf44abf5ad355b75b20ed49049a9eb3b324..7d7187c139440aeffd1ab0eea0e6463e920718a1 100644 (file)
@@ -1,7 +1,7 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.36.
 .TH FULLQUOTTEL "1" "April 2007" "fullquottel 0.1.2" "User Commands"
 .SH NAME
-fullquottel \- tool for detecting full quotes in mails or postings
+fullquottel \- manual page for fullquottel 0.1.2
 .SH SYNOPSIS
 .B fullquottel
 [\fIOPTION\fR...] \fI< infile > outfile\fR