← Back to branch summary

~ubuntu-branches/ubuntu/dapper/file-roller/dapper-updates

« back to all changes in this revision

Viewing changes to help/Makefile.in

  • Committer: Bazaar Package Importer
  • Author(s): Sebastien Bacher
  • Date: 2005-12-13 00:19:53 UTC
  • mfrom: (1.2.2 upstream)
  • Revision ID: james.westby@ubuntu.com-20051213001953-0klipgnhk6vikhrt
Tags: 2.13.2-0ubuntu1
* New upstream version:
  - Fixed bug #323713: "Save as" should default to current archive filename
    (Ubuntu: #20132)
  - Fixed bug #315069: file-roller: drag 'n drop doesn't work for more
    than 1 file.
  - Fixed bug #323534: Passwords improperly escaped for zip files
  - Do not open a progress dialog when dragging files, use a progressbar
    in the statusbar instead.
  - Fixed bug #316364: Nautilus dependency should be optional
  - Fixed bug #311821: ascending and descending indicators are opposite
    from expected.
  - Fixed bug #317423: Conflicting mnemonic in "Extract" dialog.
  - Fixed bug #323068: file-roller fails in chosing extract-to directory
  - Fixed bug #322197: Improve Naming Filename when create new Archive file
  - Fixed bug #316564: needs unzip AND zip
    (Ubuntu: #15595)
  - Simplified the add dialog populating the file type combobox with the
    extensions instead of the descriptions.
  - Set progress dialog display delay to 1 second.
  - More HIG compliant progress dialog.
  - Use a single command execution to add many files and folders to an
    archive to speed up the operation.
  - Allow to stop creation of a new archive.
  - Correctly associate fr to 7zip files.
* debian/patches/03_lp-autoconf.patch:
  - updated

Show diffs side-by-side

added added

removed removed

Lines of Context:
help/Makefile.in
69
69
AUTOHEADER = @AUTOHEADER@
70
70
AUTOMAKE = @AUTOMAKE@
71
71
AWK = @AWK@
72
 
BONOBO_ACTIVATION_REQUIRED = @BONOBO_ACTIVATION_REQUIRED@
73
72
CATALOGS = @CATALOGS@
74
73
CATOBJEXT = @CATOBJEXT@
75
74
CC = @CC@
93
92
EGREP = @EGREP@
94
93
ENABLE_DEPRECATIONS_FALSE = @ENABLE_DEPRECATIONS_FALSE@
95
94
ENABLE_DEPRECATIONS_TRUE = @ENABLE_DEPRECATIONS_TRUE@
 
95
ENABLE_NAUTILUS_ACTIONS_FALSE = @ENABLE_NAUTILUS_ACTIONS_FALSE@
 
96
ENABLE_NAUTILUS_ACTIONS_TRUE = @ENABLE_NAUTILUS_ACTIONS_TRUE@
96
97
ENABLE_SK_FALSE = @ENABLE_SK_FALSE@
97
98
ENABLE_SK_TRUE = @ENABLE_SK_TRUE@
98
99
EXEEXT = @EXEEXT@
147
148
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
148
149
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
149
150
LDFLAGS = @LDFLAGS@
150
 
LIBBONOBOUI_REQUIRED = @LIBBONOBOUI_REQUIRED@
151
 
LIBBONOBO_REQUIRED = @LIBBONOBO_REQUIRED@
152
151
LIBGLADE_REQUIRED = @LIBGLADE_REQUIRED@
153
152
LIBGNOMEUI_REQUIRED = @LIBGNOMEUI_REQUIRED@
154
153
LIBGNOME_REQUIRED = @LIBGNOME_REQUIRED@
180
179
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
181
180
PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
182
181
RANLIB = @RANLIB@
183
 
SCHEMAS_INSTALL_FALSE = @SCHEMAS_INSTALL_FALSE@
184
 
SCHEMAS_INSTALL_TRUE = @SCHEMAS_INSTALL_TRUE@
185
182
SET_MAKE = @SET_MAKE@
186
183
SHELL = @SHELL@
187
184
STRIP = @STRIP@
194
191
ac_ct_F77 = @ac_ct_F77@
195
192
ac_ct_RANLIB = @ac_ct_RANLIB@
196
193
ac_ct_STRIP = @ac_ct_STRIP@
 
194
ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
197
195
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
198
196
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
199
197
am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
221
219
libexecdir = @libexecdir@
222
220
localstatedir = @localstatedir@
223
221
mandir = @mandir@
224
 
mkdir_p = @mkdir_p@
225
222
oldincludedir = @oldincludedir@
226
223
prefix = @prefix@
227
224
program_transform_name = @program_transform_name@
246
243
 
247
244
_RNGDOC_C_DOCS = $(foreach rng,$(_RNGDOC_RNGS), C/$(basename $(notdir $(rng))).xml)
248
245
 
249
 
 
250
246
################################################################################
 
247
 
 
248
# FIXME: _XSLDOC_XSLS is getting dupes with relative/absolute in some
 
249
# cases.  Right now, I'm just taking the first, but that's just a bad
 
250
# work-around.  Fix the real problem.
251
251
xsldoc_args = \
252
252
        --stringparam xsldoc.id                                                 \
253
253
        $(shell echo $(basename $(notdir $(1))) | sed -e 's/[^A-Za-z0-9_-]/_/g')\
254
 
        $(_xsldoc) $(filter %/$(basename $(notdir $(1))).xsl,$(_XSLDOC_XSLS))
 
254
        $(_xsldoc)                                                              \
 
255
        $(word 1,$(filter %/$(basename $(notdir $(1))).xsl,$(_XSLDOC_XSLS)))
255
256
 
256
257
 
257
258
_XSLDOC_XSLS = $(sort $(patsubst ./%, %, $(foreach dir,$(XSLDOC_DIRS),          \
597
598
        @rm -f $@.tmp; touch $@.tmp;
598
599
        echo 'const gchar* documentation_credits[] = {' >> $@.tmp
599
600
        for doc in $(DOC_H_DOCS); do \
600
 
          xmlpath="`echo $$doc | sed -e 's/^\(.*\/\).*\|.*/\1/'`:$(srcdir)/`echo $$doc | sed -e 's/^\(.*\/\).*\|.*/\1/'`"; \
 
601
          xmlpath="`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`:$(srcdir)/`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`"; \
601
602
          if ! test -f "$$doc"; then doc="$(srcdir)/$$doc"; fi; \
602
603
          xsltproc --path "$$xmlpath" $(_credits) $$doc; \
603
604
        done | sort | uniq \
607
608
        echo '};' >> $@.tmp
608
609
        echo >> $@.tmp
609
610
        for doc in $(DOC_H_DOCS); do \
610
 
          xmlpath="`echo $$doc | sed -e 's/^\(.*\/\).*\|.*/\1/'`:$(srcdir)/`echo $$doc | sed -e 's/^\(.*\/\).*\|.*/\1/'`"; \
 
611
          xmlpath="`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`:$(srcdir)/`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`"; \
611
612
          if ! test -f "$$doc"; then doc="$(srcdir)/$$doc"; fi; \
612
613
          docid=`echo "$$doc" | sed -e 's/.*\/\([^/]*\)\.xml/\1/' \
613
614
            | sed -e 's/[^a-zA-Z_]/_/g' | tr 'a-z' 'A-Z'`; \
850
851
.PHONY: dist-doc-docs dist-doc-figs dist-doc-omf dist-doc-dsk
851
852
doc-dist-hook:                                  \
852
853
        $(if $(DOC_MODULE),dist-doc-docs)       \
853
 
        $(if $(DOC_FIGURES),dist-doc-figs)      \
 
854
        $(if $(_DOC_C_FIGURES),dist-doc-figs)   \
854
855
        $(if $(_DOC_OMF_IN),dist-doc-omf)
855
856
#       $(if $(_DOC_DSK_IN),dist-doc-dsk)
856
857
 
869
870
        @for fig in $(_DOC_C_FIGURES) $(_DOC_LC_FIGURES); do \
870
871
          if test -f "$$fig"; then d=; else d="$(srcdir)/"; fi; \
871
872
          if test -f "$$d$$fig"; then \
872
 
            figdir=`echo $$fig | sed -e 's/^\(.*\/\).*\|.*/\1/'`; \
 
873
            figdir=`echo $$fig | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \
873
874
            if ! test -d "$(distdir)/$$figdir"; then \
874
875
              echo "$(mkinstalldirs) $(distdir)/$$figdir"; \
875
876
              $(mkinstalldirs) "$(distdir)/$$figdir"; \
944
945
            else \
945
946
              figfile="$(srcdir)/C/$$fig"; \
946
947
            fi; \
947
 
            figdir="$$lc/"`echo $$fig | sed -e 's/^\(.*\/\).*\|.*/\1/'`; \
 
948
            figdir="$$lc/"`echo $$fig | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \
948
949
            figdir="$(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$figdir"; \
949
950
            if ! test -d "$$figdir"; then \
950
951
              echo "$(mkinstalldirs) $$figdir"; \