prepare debian upload and new packaging
authorThorsten Glaser <tg@mirbsd.org>
Wed, 27 Jul 2011 19:44:23 +0000 (19:44 +0000)
committerThorsten Glaser <tg@mirbsd.org>
Wed, 27 Jul 2011 19:44:23 +0000 (19:44 +0000)
debian/changelog
debian/control
debian/copyright
debian/joe-jupp.install
debian/joe-jupp.links [new file with mode: 0644]
debian/jupp.docs
debian/jupp.install
debian/rules

index 0d01ead..2dde1d1 100644 (file)
@@ -1,6 +1,8 @@
-jupp (3.1.15-0wtf2) xwtf; urgency=low
+jupp (3.1.17-0exp1) unstable; urgency=low
 
   * Do not call "update-alternatives --remove" on upgrade (cf. #568299)
+  * New upstream version
+  * Keep original source unpacked, not a cpio-in-tarball format
 
  -- Thorsten Glaser <tg@mirbsd.de>  Sat, 09 Jul 2011 18:32:34 +0000
 
index 76f2da4..7ca0033 100644 (file)
@@ -1,32 +1,23 @@
-# $MirOS: jupp/debian/control,v 1.14 2011/07/03 01:58:28 tg Exp $
+# $MirOS: jupp/debian/control,v 1.15 2011/07/27 19:44:23 tg Exp $
 #
 Source: jupp
-Origin: WTF
-Bugs: mailto:wtf@mirbsd.org
 Section: editors
 Priority: optional
 Maintainer: Thorsten Glaser <tg@mirbsd.de>
-Homepage: http://mirbsd.de/jupp
-Build-Depends: mircpio | pax | cpio, debhelper (>= 5),
- autotools-dev, libncurses-dev,
+Homepage: https://www.mirbsd.org/jupp.htm
+# autotools-dev, libselinux1-dev are optional build dependencies
+Build-Depends: debhelper (>= 5), autotools-dev, libncurses-dev,
  libselinux1-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386]
 Standards-Version: 3.9.2
 # First word is the $CVSROOT (-d arg) string, second word the module.
-# Upstream is on the same server, in the "jupp" module.
 Vcs-CVS: :ext:_anoncvs@anoncvs.mirbsd.org:/cvs contrib/hosted/tg/deb/jupp
 Vcs-Browser: http://cvs.mirbsd.de/contrib/hosted/tg/deb/jupp/
 
-# Backport instructions (Debian Etch):
-#      - drop autotools-dev and/or libselinux1-dev B-D only if needed
-#      – rules: change CFLAGS (if needed)
-#      – remove VCS-*, Multi-Arch, (usually not) change S-V to 3.7.2
-#      – move Homepage to “ .\n  Homepage: …” at bottom of Package sections
-#      – s/Applications/Apps/g in *.menu
-
 Package: jupp
 Architecture: any
 Multi-Arch: foreign
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Provides: editor
 Description: user friendly full screen text editor
  Joe, the Joe's Own Editor, has the feel of most PC text editors: the key
  sequences are reminiscent of WordStar and Turbo C editors, but the feature
@@ -52,8 +43,9 @@ Description: user friendly full screen text editor
  kind of sane terminal.  Furthermore, it supports SELinux context copying.
  .
  This version of JOE only comes with the Jupp flavour, to not conflict
- with the Debian joe package, activated. The resource files for the other
- flavours are still available, though, in the joe-jupp package.
+ with the Debian joe package, activated. The resource files and executable
+ links and menu entries for the other flavours are still available, though,
+ in the joe-jupp package.
 
 Package: joe-jupp
 Architecture: all
index b81ecfc..323060b 100644 (file)
@@ -3,7 +3,7 @@ Wed Sep 16 12:17:14 UTC 2009 based on the mksh package, with some
 texts taken from the joe package.
 
 It was downloaded from:
-https://www.mirbsd.org/MirOS/dist/jupp/joe-3.1jupp15.cpio.gz
+https://www.mirbsd.org/MirOS/dist/jupp/joe-3.1jupp17.cpio.gz
 
 
 Copyright (c) 1992-2011 by
index 821a571..642117a 100644 (file)
@@ -1,7 +1,7 @@
-# $MirOS: jupp/debian/joe-jupp.install,v 1.2 2009/09/16 13:18:52 tg Exp $
+# $MirOS: jupp/debian/joe-jupp.install,v 1.3 2011/07/27 19:44:23 tg Exp $
 #-
-debian/tmp/etc/jupp/jmacsrc etc/jupp/
-debian/tmp/etc/jupp/joerc etc/jupp/
-debian/tmp/etc/jupp/jpicorc etc/jupp/
-debian/tmp/etc/jupp/jstarrc etc/jupp/
-debian/tmp/etc/jupp/rjoerc etc/jupp/
+builddir/jmacsrc etc/jupp/jmacsrc
+builddir/joerc etc/jupp/joerc
+builddir/jpicorc etc/jupp/jpicorc
+builddir/jstarrc etc/jupp/jstarrc
+builddir/rjoerc etc/jupp/rjoerc
diff --git a/debian/joe-jupp.links b/debian/joe-jupp.links
new file mode 100644 (file)
index 0000000..7b62da2
--- /dev/null
@@ -0,0 +1,13 @@
+# $MirOS: jupp/debian/joe-jupp.links,v 1.1 2011/07/27 19:44:24 tg Exp $
+#-
+usr/bin/jupp usr/bin/jmacs
+usr/bin/jupp usr/bin/joe
+usr/bin/jupp usr/bin/jpico
+usr/bin/jupp usr/bin/jstar
+usr/bin/jupp usr/bin/rjoe
+usr/share/doc/jupp usr/share/doc/joe-jupp
+usr/share/man/man1/jupp.1.gz usr/share/man/man1/jmacs.1.gz
+usr/share/man/man1/jupp.1.gz usr/share/man/man1/joe.1.gz
+usr/share/man/man1/jupp.1.gz usr/share/man/man1/jpico.1.gz
+usr/share/man/man1/jupp.1.gz usr/share/man/man1/jstar.1.gz
+usr/share/man/man1/jupp.1.gz usr/share/man/man1/rjoe.1.gz
index f8ec0a1..d81649a 100644 (file)
@@ -1,8 +1,8 @@
-# $MirOS: jupp/debian/jupp.docs,v 1.2 2011/07/03 01:57:25 tg Exp $
+# $MirOS: jupp/debian/jupp.docs,v 1.3 2011/07/27 19:44:24 tg Exp $
 #-
-jupp/HINTS
-jupp/INFO
-jupp/LIST
-jupp/README
-jupp/TODO
-jupp/docs/help-system.html
+HINTS
+INFO
+LIST
+README
+TODO
+docs/help-system.html
index 4c912f0..1f25063 100644 (file)
@@ -1,7 +1,7 @@
-# $MirOS: jupp/debian/jupp.install,v 1.4 2011/07/03 01:31:43 tg Exp $
+# $MirOS: jupp/debian/jupp.install,v 1.5 2011/07/27 19:44:24 tg Exp $
 #-
+builddir/charmaps/* etc/jupp/charmaps/
 builddir/jupp usr/bin/
+builddir/syntax/* etc/jupp/syntax/
 debian/lintian/jupp usr/share/lintian/overrides/
-debian/tmp/etc/jupp/charmaps/* etc/jupp/charmaps/
-debian/tmp/etc/jupp/jupprc etc/jupp/
-debian/tmp/etc/jupp/syntax/* etc/jupp/syntax/
+jupprc etc/jupp/
index a413109..552c976 100755 (executable)
@@ -1,5 +1,5 @@
 #!/usr/bin/make -f
-# $MirOS: jupp/debian/rules,v 1.12 2011/07/03 01:57:25 tg Exp $
+# $MirOS: jupp/debian/rules,v 1.13 2011/07/27 19:44:24 tg Exp $
 #-
 # -*- makefile -*-
 # Sample debian/rules that uses debhelper.
@@ -8,12 +8,10 @@
 # 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.
 
-DISTFILE=              joe-3.1jupp15.cpio.gz
-
-
+SHELL?=                        sh
 CC?=                   gcc
 CFLAGS=                        -g
-#CFLAGS+=              -Wall
+CFLAGS+=               -Wall -Wformat
 
 ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
 CFLAGS+=               -O0
@@ -27,103 +25,95 @@ MAKEFLAGS+=                -j${NUMJOBS}
 endif
 
 CFLAGS+=               -fno-omit-frame-pointer -fwrapv -fno-strict-aliasing
-# adjust when backporting (this set is for using -Wall -Wextra, FWIW)
-#CFLAGS+=              -Wno-missing-field-initializers -Wno-cast-qual \
-#                      -Wno-strict-prototypes -Wno-missing-prototypes \
-#                      -Wno-missing-declarations -Wno-unused \
-#                      -Wno-pointer-sign
-
-
-patch: debian/.patch_stamp
-build build-arch build-indep: debian/.build_stamp
-
-debian/.patch_stamp: ${DISTFILE}
+# adjust when backporting
+CFLAGS+=               -Wextra -Wno-pointer-sign -Wno-unused-parameter \
+                       -Wno-missing-field-initializers \
+                       -Wno-old-style-definition -Wno-strict-prototypes \
+                       -Wno-cast-qual \
+                       -Wno-missing-prototypes -Wno-missing-declarations
+
+debian/.configure_stamp:
        dh_testdir
        -rm -f debian/.*_stamp
-       -rm -rf jupp builddir
-       # extract jupp upstream source code
-       gzip -dc ${DISTFILE} | if which mirpax >/dev/null 2>&1; then \
-               mirpax -r; \
-       elif which pax >/dev/null 2>&1; then \
-               pax -r; \
-       else \
-               cpio -mid; \
-       fi
-       # apply autotools-dev if exists
+       -rm -rf builddir
+       # apply autotools-dev if it exists
        for x in config.guess config.sub; do \
                test -e /usr/share/misc/$$x || continue; \
-               rm -f jupp/$$x; \
-               cp /usr/share/misc/$$x jupp/; \
+               rm -f $$x; \
+               cp /usr/share/misc/$$x .; \
        done
-       # apply patches
-       for a in debian/diffs/*; do \
-               test -e "$$a" || continue; \
-               (cd jupp; patch -lp0) <$$a; \
-       done
-       touch $@
-
-debian/.build_stamp: debian/.patch_stamp
-       dh_testdir
-       -rm -rf builddir
        mkdir builddir
        cd builddir && env \
            CC='${CC}' \
            CFLAGS='${CFLAGS}' \
            CPPFLAGS='${CPPFLAGS}' \
-           sh ../jupp/configure \
+           ${SHELL} ../configure \
            --sysconfdir=/etc \
            --prefix=/usr \
            --mandir=/usr/share/man \
            --disable-dependency-tracking \
            --disable-termidx
+       @:>$@
+
+debian/.build_stamp: debian/.configure_stamp
+       dh_testdir
        cd builddir && ${MAKE} sysconfjoesubdir=/jupp
        ln -f builddir/joe builddir/jupp
        ln -f builddir/joe.1 builddir/jupp.1
-       touch $@
+       @:>$@
+
+build: build-arch build-indep
+build-arch: debian/.build_stamp
+build-indep: debian/.configure_stamp
 
 clean:
        dh_testdir
        -rm -f debian/.*_stamp
-       -rm -rf jupp builddir
+       -rm -rf builddir
+       # unapply autotools-dev if it exists
+       for x in config.guess config.sub; do \
+               test -e /usr/share/misc/$$x || continue; \
+               rm -f $$x; \
+       done
        dh_clean
 
-install: build
+binary-indep: build-indep
        dh_testdir
        dh_testroot
-       dh_clean -k
-       dh_installdirs
-       _topdir=$$(pwd); cd builddir && \
-           ${MAKE} install DESTDIR=$$_topdir/debian/tmp sysconfjoesubdir=/jupp
-
-binary-arch: binary
-binary-indep: binary
-
-# dh_installchangelogs -Njupp → skip, since we later drop
-#              joe-jupp/usr/share/doc/joe-jupp anyway
-
-binary: build install
+       dh_prep -i
+       dh_installdirs -i
+       dh_installchangelogs -i -Njupp
+       dh_install -i
+       dh_installmenu -i
+       # will be replaced by links to jupp
+       rm -rf debian/joe-jupp/usr/share/doc/joe-jupp
+       dh_link -i
+       dh_fixperms -i
+       dh_installdeb -i
+       dh_gencontrol -i
+       dh_md5sums -i
+       dh_builddeb -i
+
+binary-arch: build-arch
        dh_testdir
        dh_testroot
-       dh_installchangelogs -pjupp -k jupp/NEWS
-       dh_installdocs
-       dh_install
-       dh_installmenu
-       dh_installman
-       dh_link
-       dh_strip
-       dh_compress
-       mkdir -p debian/joe-jupp/usr/bin debian/joe-jupp/usr/share/man/man1
-       cd debian/joe-jupp/usr && for i in jmacs joe jpico jstar rjoe; do \
-               ln -sf jupp bin/$$i; \
-               ln -sf jupp.1.gz share/man/man1/$$i.1.gz; \
-       done
-       rm -rf debian/joe-jupp/usr/share/doc/joe-jupp
-       ln -s jupp debian/joe-jupp/usr/share/doc/joe-jupp
-       dh_fixperms
-       dh_installdeb
-       dh_shlibdeps
-       dh_gencontrol
-       dh_md5sums
-       dh_builddeb
-
-.PHONY: build build-indep build-arch clean binary-indep binary-arch binary install check
+       dh_prep -a
+       dh_installdirs -a
+       dh_installchangelogs -pjupp -k NEWS
+       dh_installdocs -a
+       dh_install -a
+       dh_installmenu -a
+       dh_installman -a
+       dh_link -a
+       dh_strip -a
+       dh_compress -a
+       dh_fixperms -a
+       dh_installdeb -a
+       dh_shlibdeps -a
+       dh_gencontrol -a
+       dh_md5sums -a
+       dh_builddeb -a
+
+binary: binary-arch binary-indep
+
+.PHONY: build build-indep build-arch clean binary-indep binary-arch binary install