reverted: --- pybliographer-1.2.12/po/oc.po +++ pybliographer-1.2.12.orig/po/oc.po @@ -934,7 +934,7 @@ #: ../Pyblio/GnomeUI/glade/search.glade.h:6 msgid "Query" +msgstr "" -msgstr "Consulta" #: ../Pyblio/GnomeUI/glade/search.glade.h:7 msgid "Search" reverted: --- pybliographer-1.2.12/po/nb.po +++ pybliographer-1.2.12.orig/po/nb.po @@ -1322,31 +1322,3 @@ #: ../scripts/pybtext.py:344 msgid "Done" msgstr "Ferdig" - -#: Pyblio/GnomeUI/Document.py:280 -msgid "" -"The database has been modified.\n" -"Discard changes ?" -msgstr "" -"Databasen er endret.\n" -"Forkast endringer?" - -#: Pyblio/GnomeUI/Document.py:807 -msgid "Gnome interface to the Pybliographer system." -msgstr "Gnome grensesnitt til Pybliographer systemet." - -#: Pyblio/GnomeUI/Document.py:817 -msgid "Gnome Translation Team" -msgstr "GNOME oversettelseslag" - -#: Pyblio/GnomeUI/Index.py:104 -msgid "Add..." -msgstr "Legg til..." - -#: Pyblio/GnomeUI/Index.py:106 -msgid "Edit..." -msgstr "Rediger..." - -#: Pyblio/GnomeUI/Index.py:108 -msgid "Delete..." -msgstr "Slett..." reverted: --- pybliographer-1.2.12/po/ne.po +++ pybliographer-1.2.12.orig/po/ne.po @@ -1351,10 +1351,3 @@ msgid "Done" msgstr "पूरा भयो" -#: ../Pyblio/GnomeUI/Document.py:1222 -msgid "Gnome interface to the Pybliographer system." -msgstr "पिब्लियोग्राफर प्रणालीका लागि जिनोम इन्टरफेस" - -#: ../Pyblio/GnomeUI/Document.py:1233 -msgid "Gnome Translation Team" -msgstr "जिनोम नेपाली अनुवाद समूह" reverted: --- pybliographer-1.2.12/po/pt_BR.po +++ pybliographer-1.2.12.orig/po/pt_BR.po @@ -1374,14 +1374,6 @@ msgid "Done" msgstr "Concluído" -#: ../Pyblio/GnomeUI/Document.py:1222 -msgid "Gnome interface to the Pybliographer system." -msgstr "Interface Gnome para o sistema Pybliographer." - -#: ../Pyblio/GnomeUI/Document.py:1233 -msgid "Gnome Translation Team" -msgstr "Afonso Celso Medina " - #~ msgid "Add..." #~ msgstr "Adicionar..." reverted: --- pybliographer-1.2.12/debian/pybtex.1 +++ pybliographer-1.2.12.orig/debian/pybtex.1 @@ -1,26 +0,0 @@ -.TH pybtex 1 "2007-02-23" "" "" -.SH NAME -pybtex \- use bibliographic databases in LaTex files -.SH SYNOPSIS -.B pybtex -[-o -.IR outputfile ] -[-s -.IR style ] -.RI \[la] latexfile \[ra] -.RI \[la] database ...\[ra] -.SH DESCRIPTION -Pybtex scans latex files for citation keys enclosed in brackets -(`[key]') and uses the database to generate a reference list. The -reference list is appended to the latex file and written to -`\fIlatexfile\fP.pyb' if no output file is specified. - -Pybtex is currently broken -.SH SEE ALSO -pybliographer(1), - -.SH AUTHOR -Pybtex was written by Frederic GOBRY. -.br -This manpage was written by Barry deFreese for Debian/GNU Linux and may -be used, modified and/or distributed freely by anyone. diff -u pybliographer-1.2.12/debian/changelog pybliographer-1.2.12/debian/changelog --- pybliographer-1.2.12/debian/changelog +++ pybliographer-1.2.12/debian/changelog @@ -1,3 +1,34 @@ +pybliographer (1.2.12-3.1ubuntu1) maverick; urgency=low + + * Merge from debian unstable, remaining changes: (LP: #585811) + - Bump build-deps for python-dev to allow 2.6 + + -- Stefano Rivera Wed, 26 May 2010 14:34:27 +0200 + +pybliographer (1.2.12-3.1) unstable; urgency=low + + * Non-maintainer upload. + * Fix improper handling of alternatives. (Closes: #544209) + + -- Jakub Wilk Wed, 18 Nov 2009 23:29:31 +0100 + +pybliographer (1.2.12-3) unstable; urgency=low + + * Fix pybliographic translations due to automake transition. Thanks to + Gert Kulyk for the patch. (Closes: #542027) + * Remove "pybtex is currently broken" text from man page, since it is + working since 1.2.12-1. + + -- Chris Lawrence Mon, 17 Aug 2009 15:04:20 -0500 + +pybliographer (1.2.12-2) unstable; urgency=low + + * Support alternatives for pybtex. (Closes: #540529) + * Add manual pages written by Nis Martensen. (Closes: #125637) + + Thanks to Jakub Wilk and Nicolas Van Wambeke for the diffs. + + -- Chris Lawrence Sun, 16 Aug 2009 23:33:21 -0500 + pybliographer (1.2.12-1ubuntu1) karmic; urgency=low * New upstream release. (LP: #357413) @@ -483 +513,0 @@ - diff -u pybliographer-1.2.12/debian/control pybliographer-1.2.12/debian/control --- pybliographer-1.2.12/debian/control +++ pybliographer-1.2.12/debian/control @@ -1,11 +1,11 @@ Source: pybliographer Section: gnome Priority: optional -Maintainer: Ubuntu MOTU Team +Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Chris Lawrence -Standards-Version: 3.8.2 +Standards-Version: 3.8.3 Build-Depends: debhelper (>= 7) -Build-Depends-Indep: python-dev (>= 2.3), python-dev (<< 2.7), python-bibtex (>= 1.2.2-3), python-gnome2, python-glade2, gettext, python-support (>= 0.3), scrollkeeper +Build-Depends-Indep: python-dev (>= 2.3), python-dev (<< 2.7), python-bibtex (>= 1.2.2-3), python-gnome2, python-glade2, gettext, python-support (>= 0.3) XS-Python-Version: current Homepage: http://www.pybliographer.org/ diff -u pybliographer-1.2.12/debian/manpages pybliographer-1.2.12/debian/manpages --- pybliographer-1.2.12/debian/manpages +++ pybliographer-1.2.12/debian/manpages @@ -6,3 +6,3 @@ debian/pybtext.1 -debian/pybtex.1 +debian/bibtex.pybliographer.1 debian/pybformat.1 diff -u pybliographer-1.2.12/debian/rules pybliographer-1.2.12/debian/rules --- pybliographer-1.2.12/debian/rules +++ pybliographer-1.2.12/debian/rules @@ -46,9 +46,10 @@ rm -f recode-stamp build-stamp install-stamp configure-stamp [ ! -f Makefile ] || $(MAKE) distclean -find scripts -type l -exec rm -f {} \; - -find . -name '*.py[co]' -o -name '*.mo' -exec rm -f {} \; -find . -name 'pyblio.junk' -exec rm -rf {} \; -find doc -name '*.html' -exec rm -f {} \; + -find . -name '*.py[co]' -exec rm -f {} \; + -find . -name '*.mo' -exec rm -f {} \; rm -f compiled/Setup.tmp etc/installer Pyblio/version.py \ po/pybliographer.pot scripts/pybscript pybliographer \ pybliographic.keys config.log @@ -62,6 +63,7 @@ dh_prep dh_installdirs $(MAKE) install DESTDIR=`pwd`/$(d) + mv $(d)/usr/bin/pybtex $(d)/usr/bin/bibtex.pybliographer find $(d) -name '*.py[co]' | xargs rm -f #find $(d) \( -name '*.gif' -o -name '*.css' \) | xargs chmod 644 reverted: --- pybliographer-1.2.12/debian/preinst +++ pybliographer-1.2.12.orig/debian/preinst @@ -1,26 +0,0 @@ -#! /bin/sh -e -# preinst script for pybliographer -# -# see: dh_installdeb(1) - -PACKAGE=`basename $0 .preinst` - -case "$1" in - remove|upgrade|deconfigure) - rm -rf /usr/share/gnome/help/pybliographic - rm -rf /usr/share/doc/pybliographer/html - ;; - failed-upgrade|install) - ;; - *) - echo "prerm called with unknown argument \`$1'" >&2 - exit 0 - ;; -esac - -# dh_installdeb will replace this with shell code automatically -# generated by other debhelper scripts. - -#DEBHELPER# - -exit 0 only in patch2: unchanged: --- pybliographer-1.2.12.orig/pybliographer.py +++ pybliographer-1.2.12/pybliographer.py @@ -24,7 +24,7 @@ progname = "@package@" data_pybdir = "@datapyb@" -localedir = "@localedir@" +localedir = "@p_localedir@" import sys only in patch2: unchanged: --- pybliographer-1.2.12.orig/doc/C/pybliographer-C.omf +++ pybliographer-1.2.12/doc/C/pybliographer-C.omf @@ -1,5 +1,5 @@ - + only in patch2: unchanged: --- pybliographer-1.2.12.orig/Pyblio/version.py.in +++ pybliographer-1.2.12/Pyblio/version.py.in @@ -2,6 +2,6 @@ datadir = "@p_datadir@" pybdir = "@datapyb@" -localedir = "@localedir@" +localedir = "@p_localedir@" version = "@version@" only in patch2: unchanged: --- pybliographer-1.2.12.orig/debian/pybliographer.prerm +++ pybliographer-1.2.12/debian/pybliographer.prerm @@ -0,0 +1,27 @@ +#!/bin/sh +# prerm script for pybliographer +# +# see: dh_installdeb(1) + +set -e + +case "$1" in + remove|upgrade|deconfigure) + update-alternatives --remove pybtex /usr/bin/bibtex.pybliographer + ;; + + 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 only in patch2: unchanged: --- pybliographer-1.2.12.orig/debian/bibtex.pybliographer.1 +++ pybliographer-1.2.12/debian/bibtex.pybliographer.1 @@ -0,0 +1,24 @@ +.TH pybtex 1 "2007-02-23" "" "" +.SH NAME +pybtex \- use bibliographic databases in LaTex files +.SH SYNOPSIS +.B pybtex +[-o +.IR outputfile ] +[-s +.IR style ] +.RI \[la] latexfile \[ra] +.RI \[la] database ...\[ra] +.SH DESCRIPTION +Pybtex scans latex files for citation keys enclosed in brackets +(`[key]') and uses the database to generate a reference list. The +reference list is appended to the latex file and written to +`\fIlatexfile\fP.pyb' if no output file is specified. +.SH SEE ALSO +pybliographer(1), + +.SH AUTHOR +Pybtex was written by Frederic GOBRY. +.br +This manpage was written by Barry deFreese for Debian/GNU Linux and may +be used, modified and/or distributed freely by anyone. only in patch2: unchanged: --- pybliographer-1.2.12.orig/debian/pybliographer.postinst +++ pybliographer-1.2.12/debian/pybliographer.postinst @@ -0,0 +1,23 @@ +#!/bin/sh + +set -e + +case "$1" in + configure) + update-alternatives --remove pybliographer /usr/bin/bibtex.pybliographer + update-alternatives \ + --install /usr/bin/pybtex pybtex /usr/bin/bibtex.pybliographer 100 --slave /usr/share/man/man1/pybtex.1.gz pybtex.1.gz /usr/share/man/man1/bibtex.pybliographer.1.gz + ;; + + abort-upgrade|abort-remove|abort-deconfigure) + ;; + + *) + echo "postinst called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +#DEBHELPER# + +exit 0 only in patch2: unchanged: --- pybliographer-1.2.12.orig/debian/pybliographer.preinst +++ pybliographer-1.2.12/debian/pybliographer.preinst @@ -0,0 +1,26 @@ +#! /bin/sh -e +# preinst script for pybliographer +# +# see: dh_installdeb(1) + +PACKAGE=`basename $0 .preinst` + +case "$1" in + remove|upgrade|deconfigure) + rm -rf /usr/share/gnome/help/pybliographic + rm -rf /usr/share/doc/pybliographer/html + ;; + failed-upgrade|install) + ;; + *) + echo "prerm called with unknown argument \`$1'" >&2 + exit 0 + ;; +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 only in patch2: unchanged: --- pybliographer-1.2.12.orig/etc/installer.in +++ pybliographer-1.2.12/etc/installer.in @@ -31,7 +31,7 @@ datadir="@datadir@" libpyb="${libdir}/@PACKAGE@" datapyb="${datadir}/@PACKAGE@" -localedir="${datadir}/locale" +localedir="@localedir@" bindir="@bindir@" @@ -44,6 +44,6 @@ s%@python_path@%@Python@%g s%@package@%@PACKAGE@%g s%@version@%@VERSION@%g -s%@localedir@%${localedir}%g +s%@p_localedir@%${localedir}%g s%@p_datadir@%${datadir}%g "