~ubuntu-branches/ubuntu/precise/gnome-control-center/precise-updates

« back to all changes in this revision

Viewing changes to .pc/revert_git_drop_library.patch/Makefile.am

  • Committer: Package Import Robot
  • Author(s): Sebastien Bacher, Jeremy Bicha, Ken VanDine
  • Date: 2012-02-15 23:16:31 UTC
  • mfrom: (1.1.56)
  • Revision ID: package-import@ubuntu.com-20120215231631-vk7me0mhofpsq0hp
Tags: 1:3.3.5-0ubuntu1
* Upload the new serie, that will bring in quite some fixes, we revert
  some problematic or risky changes as well
* The new version includes those fixes:
  - "Change Password in User Accounts panel focuses "New password" field, 
     skipping "Current password"" (lp: #821759)
  - The dialog to add online accounts should have a title 
    (lp: #822380)
  - "Remove Profile" button clickable in Color panel when 
     no profile selected (lp: #869603)
  - Move Removable Media into System Info (lp: #835880)
  - Sound preferences: mouse scrolling balance only works for right.
    (lp: #918017)
  - gnome-control-center SIGSEGV in actualize_printers_list() 
    (lp: #903009)
  - selecting preffered applications is not an info (lp: #890143)
  - Add a keyboard shortcut by default for take screenshot of a selection"
    (lp: #625518)
* debian/patches/revert_git_datetime_port.patch:
  - revert use of datetimed, we don't use systemd and ubuntu-system-service 
    doesn't support it yet
* debian/patches/revert_git_drop_library.patch:
  - consolidate "01_allow_external_panels.patch", don't drop the library
    we use it from other components on ubuntu, the patch will be improved
    later to not use a copy of files like it does in that version
* debian/patches/revert_git_stop_using_gconf.patch,
  debian/patches/revert_ua_gsettings.patch,
  debian/patches/revert_git_keyboard_gsettings.patch:
  - revert keyboard porting to gsettings, compiz still use gconf and we
    didn't update gnome-shell to the new serie (yet)

[ Jeremy Bicha ]
* New upstream release (Thanks Rico Tzchichholz!)
* debian/control.in:
  - Bump minimum dependency versions and add libwacom dependency
* debian/rules: Build without -Wl,-z,defs
* debian/watch: Watch for unstable releases
* Refreshed patches:
  - 01_allow_external_panels.patch
  - 04_add_theme_selection.patch
  - 50_ubuntu_systemwide_prefs.patch
  - 58_ubuntu_icon_views_redesign.patch
  - 59_install_gcm_components_on_demand.patch
  - 91_configure_cheese.patch
* Dropped upstream patches:
  - 00git_handle_media_dialog_close.patch
  - 03_show_wacom_under_unity.patch
  - 90_git_sound_tab_order.patch
  - 91_git_build_use_fontconfig.patch
  - 92_git_minimal_output_height.patch
  - 93_change_window_role_on_panel_change.patch
  - 94_git_adding_shortcuts.patch
  - 95_git_ctrlw_shortcut.patch
  - git_extra_keywords.patch

[ Ken VanDine ]
* debian/patches/96_sound_nua_panel.patch
  - refreshed with latest changes from ronoc

Show diffs side-by-side

added added

removed removed

Lines of Context:
 
1
ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
 
2
 
 
3
SUBDIRS = po shell panels help
 
4
DIST_SUBDIRS = po help shell panels
 
5
 
 
6
DISTCLEANFILES = \
 
7
        gnome-doc-utils.make
 
8
 
 
9
MAINTAINERCLEANFILES = \
 
10
        $(srcdir)/INSTALL \
 
11
        $(srcdir)/aclocal.m4 \
 
12
        $(srcdir)/autoscan.log \
 
13
        $(srcdir)/compile \
 
14
        $(srcdir)/config.guess \
 
15
        $(srcdir)/config.h.in \
 
16
        $(srcdir)/config.sub \
 
17
        $(srcdir)/configure.scan \
 
18
        $(srcdir)/depcomp \
 
19
        $(srcdir)/install-sh \
 
20
        $(srcdir)/ltmain.sh \
 
21
        $(srcdir)/missing \
 
22
        $(srcdir)/mkinstalldirs \
 
23
        $(srcdir)/omf.make \
 
24
        $(srcdir)/xmldocs.make \
 
25
        $(srcdir)/gtk-doc.make \
 
26
        `find "$(srcdir)" -type f -name Makefile.in -print`
 
27
 
 
28
EXTRA_DIST = \
 
29
        MAINTAINERS \
 
30
        gnome-doc-utils.make
 
31
 
 
32
DISTCHECK_CONFIGURE_FLAGS = --disable-scrollkeeper --disable-update-mimedb --enable-gtk-doc
 
33
 
 
34
GITIGNOREFILES=m4 help/*/*.mo
 
35
 
 
36
-include $(top_srcdir)/git.mk
 
37
 
 
38
dist-hook:
 
39
        @if test -d "$(srcdir)/.git"; \
 
40
        then \
 
41
                echo Creating ChangeLog && \
 
42
                ( cd "$(top_srcdir)" && \
 
43
                  echo '# Generated by Makefile. Do not edit.'; echo; \
 
44
                  $(top_srcdir)/missing --run git log --stat ) > ChangeLog.tmp \
 
45
                && mv -f ChangeLog.tmp $(top_distdir)/ChangeLog \
 
46
                || ( rm -f ChangeLog.tmp ; \
 
47
                     echo Failed to generate ChangeLog >&2 ); \
 
48
        else \
 
49
                echo A git clone is required to generate a ChangeLog >&2; \
 
50
        fi