← Back to branch summary

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

« back to all changes in this revision

Viewing changes to .pc/97_automake_cleanup.diff/kdeprint/cups/cupsdconf2/Makefile.am

  • 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:
.pc/97_automake_cleanup.diff/kdeprint/cups/cupsdconf2/Makefile.am
 
1
#$Id: Makefile.am 285549 2004-02-06 13:39:51Z dfaure $
 
2
 
 
3
INCLUDES= -I$(top_srcdir) -I$(top_srcdir)/kio -I$(top_srcdir)/kfile $(all_includes)
 
4
 
 
5
bin_PROGRAMS =
 
6
lib_LTLIBRARIES =
 
7
kdeinit_LTLIBRARIES = cupsdconf.la
 
8
 
 
9
# library creation
 
10
cupsdconf_la_SOURCES = cupsdconf.cpp cupsddialog.cpp cupsdpage.cpp cupsdcomment.cpp cupsdsplash.cpp \
 
11
                          cupsdserverpage.cpp cupsdlogpage.cpp cupsdjobspage.cpp cupsdfilterpage.cpp \
 
12
                          qdirlineedit.cpp cupsddirpage.cpp portdialog.cpp cupsdnetworkpage.cpp \
 
13
                          editlist.cpp cupsdbrowsingpage.cpp browsedialog.cpp cupsdsecuritypage.cpp \
 
14
                          locationdialog.cpp addressdialog.cpp cups-util.c \
 
15
                          qdirmultilineedit.cpp sizewidget.cpp main.cpp
 
16
cupsdconf_la_METASOURCES = AUTO
 
17
cupsdconf_la_LDFLAGS = -avoid-version -module $(all_libraries) $(KDE_RPATH)
 
18
cupsdconf_la_LIBADD = $(LIB_KIO) $(LIB_CUPS)
 
19
 
 
20
noinst_HEADERS = cupsdconf.h cupsdpage.h cupsddialog.h cupsdcomment.h cupsdsplash.h \
 
21
                 cupsdserverpage.h cupsdlogpage.h cupsdjobspage.h cupsdfilterpage.h \
 
22
                 qdirlineedit.h cupsddirpage.h portdialog.h cupsdnetworkpage.h \
 
23
                 editlist.h cupsdbrowsingpage.h browsedialog.h cupsdsecuritypage.h \
 
24
                 locationdialog.h addressdialog.h cups-util.h qdirmultilineedit.h \
 
25
                 sizewidget.h
 
26
 
 
27
# Data
 
28
cupsdconfdata_DATA = kde_logo.png cups_logo.png cupsd.conf.template
 
29
cupsdconfdatadir   = $(kde_datadir)/kdeprint
 
30
 
 
31
# Translations
 
32
messages:
 
33
        perl cupsdcomment.pl < cupsd.conf.template > cupsd.conf.template.cpp
 
34
        $(XGETTEXT) *.cpp -o $(podir)/cupsdconf.pot
 
35
        rm -f cupsd.conf.template.cpp