~ubuntu-branches/ubuntu/oneiric/kdelibs/oneiric

« back to all changes in this revision

Viewing changes to kio/bookmarks/Makefile.in

  • Committer: Bazaar Package Importer
  • Author(s): Felix Geyer
  • Date: 2010-10-15 19:20:42 UTC
  • mfrom: (1.1.19 sid)
  • Revision ID: james.westby@ubuntu.com-20101015192042-jv1fhj33n4f5b398
Tags: 4:3.5.10.dfsg.1-5ubuntu1
* Merge from Debian unstable. Remaining Ubuntu changes:
  - make sure control and control.in are in sync
  - --with-distribution="Kubuntu (`lsb_release --codename --short`)
    $(DEB_VERSION)"
  - binary-install/kdelibs-data installs aboutkde-kubuntu.png.uu and
    cr*-device-system.png.uu
  - don't build-dep on libgamin-dev, libfam-dev
  - stop kdelibs4-dev depending on gamin/fam
  - don't install .svgz icons, docs or all_languages in kdelibs-data.install
  - rosetta support in rules common-install-prehook-impl:: [and
    common-post-build-arch:: ?] and include debian/kubuntu-desktop-i18n/
  - build-dep on: gettext-kde, kdesdk-scripts, lsb-release, base-files, sudo
  - cdbs build-dep 0.4.41ubuntu2
  - kdelibs4-dev depends on gettext-kde, kdesdk-scripts
  - copy debian/icons over
  - Make kdelibs4c2a depend on launchpad-integration, sudo.  Recommends on
    xdg-user-dirs
  - Remove 19_debianize_useragent.diff (changed to
    kubuntu_19_debianize_useragent.diff) s/Debian/Kubuntu
  - remove kdelibs4c2a depends on menu-xdg
  - include kubuntu_01_kdepot.diff and kde.pot in debian/patches/common
  - use a local copy of kde.mk without the common-install-prehook-impl::
    rule; edit debian-qt-kde.mk to include debian/cdbs/kde.mk
  - build with --with-sudo-kdesu-backend and build-dep on sudo and make
    kdelibs4c2a depend on sudo
  - kdelibs-data.install : Add nzb mimetype
  - Make kdelibs4-dev replace more recent kdelibs4c2a for overlapping files
  - remove /usr/bin/preparetips, arts files and ksvntopng from
    kdelibs4-dev.install
  - Drop the package kdelibs4-doc completely. It contained API documentation
    which is now obsolete, but still available via api.kde.org.
  - make sure control and control.in are in sync
  - in debian/rule remove .pot files outside .po directory
  - 97_automake_cleanup.diff becomes kubuntu_97_automake_cleanup.diff
  - Remove libarts1-dev from build-depends and kdelibs4-dev depends from
    control.in
* Drop kubuntu_98_fix_khc_invocation.diff, replaced by
  68_support_khelpcenter4.diff
* Drop kubuntu_97_automake_cleanup.diff, replaced by 97_automake_cleanup.diff
* Re-add security_05_XMLHttpRequest_vulnerability.diff which has been
  accidentally dropped
* Fix FTBFS, in debian/rules:
  - Add -Wl,--add-needed to LDFLAGS
  - Disable parallel building

Show diffs side-by-side

added added

removed removed

Lines of Context:
136
136
AUTODIRS = @AUTODIRS@
137
137
AUTOHEADER = @AUTOHEADER@
138
138
AUTOMAKE = @AUTOMAKE@
 
139
AVAHI_CFLAGS = @AVAHI_CFLAGS@
 
140
AVAHI_LIBS = @AVAHI_LIBS@
139
141
AWK = @AWK@
140
142
CC = @CC@
141
143
CCDEPMODE = @CCDEPMODE@
157
159
DOXYGEN = @DOXYGEN@
158
160
DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
159
161
DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
 
162
DSYMUTIL = @DSYMUTIL@
160
163
ECHO = @ECHO@
161
164
ECHO_C = @ECHO_C@
162
165
ECHO_N = @ECHO_N@
250
253
LIBXSLT_RPATH = @LIBXSLT_RPATH@
251
254
LIBZ = @LIBZ@
252
255
LIB_CUPS = @LIB_CUPS@
253
 
LIB_DNSSD = @LIB_DNSSD@
254
256
LIB_EXR = @LIB_EXR@
255
257
LIB_IDN = @LIB_IDN@
256
258
LIB_JASPER = @LIB_JASPER@
278
280
LIB_POLL = @LIB_POLL@
279
281
LIB_QPE = @LIB_QPE@
280
282
LIB_QT = @LIB_QT@
 
283
LIB_QT_EXT = @LIB_QT_EXT@
281
284
LIB_SMB = @LIB_SMB@
282
285
LIB_X11 = @LIB_X11@
283
286
LIB_XEXT = @LIB_XEXT@
287
290
LUA = @LUA@
288
291
LUA_INCLUDES = @LUA_INCLUDES@
289
292
LUA_LIBS = @LUA_LIBS@
 
293
MAINT = @MAINT@
290
294
MAKEINFO = @MAKEINFO@
291
295
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
292
296
MCOPIDL = @MCOPIDL@
296
300
MKDIR_P = @MKDIR_P@
297
301
MOC = @MOC@
298
302
MSGFMT = @MSGFMT@
 
303
NMEDIT = @NMEDIT@
299
304
NOOPT_CFLAGS = @NOOPT_CFLAGS@
300
305
NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@
301
306
OBJEXT = @OBJEXT@
315
320
QT_INCLUDES = @QT_INCLUDES@
316
321
QT_LDFLAGS = @QT_LDFLAGS@
317
322
RANLIB = @RANLIB@
 
323
SED = @SED@
318
324
SET_MAKE = @SET_MAKE@
319
325
SHELL = @SHELL@
320
326
SSL_INCLUDES = @SSL_INCLUDES@
365
371
docdir = @docdir@
366
372
dvidir = @dvidir@
367
373
exec_prefix = @exec_prefix@
 
374
have_pkg_config = @have_pkg_config@
368
375
host = @host@
369
376
host_alias = @host_alias@
370
377
host_cpu = @host_cpu@
422
429
target_cpu = @target_cpu@
423
430
target_os = @target_os@
424
431
target_vendor = @target_vendor@
 
432
top_build_prefix = @top_build_prefix@
425
433
top_builddir = @top_builddir@
426
434
top_srcdir = @top_srcdir@
427
435
x_includes = @x_includes@
460
468
 
461
469
.SUFFIXES:
462
470
.SUFFIXES: .cc .lo .o .obj
463
 
$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(top_srcdir)/admin/Doxyfile.am $(am__configure_deps)
 
471
$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/admin/Doxyfile.am $(am__configure_deps)
464
472
#>-     @for dep in $?; do \
465
473
#>-       case '$(am__configure_deps)' in \
466
474
#>-         *$$dep*) \
498
506
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
499
507
        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
500
508
 
501
 
$(top_srcdir)/configure:  $(am__configure_deps)
 
509
$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
502
510
        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
503
 
$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 
511
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
504
512
        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
505
513
 
506
514
clean-noinstLTLIBRARIES: