~ubuntu-branches/ubuntu/oneiric/wayland/oneiric

« back to all changes in this revision

Viewing changes to debian/patches/100_install_demos.patch

  • Committer: Bazaar Package Importer
  • Author(s): Bryce Harrington
  • Date: 2011-07-12 12:41:44 UTC
  • mfrom: (1.1.2 upstream) (0.1.2 experimental)
  • Revision ID: james.westby@ubuntu.com-20110712124144-aojh8cozol62ixly
Tags: 0.1.0~0-1ubuntu1
* Merge with Debian (experimental) packaging.
  - Update to newer snapshot, to 98d8256b from June 10, 2011.
    (LP: #729614, #733889)
  - Splits out demos to separate package
    (LP: #793399)
  - control: Provide client and server libs together in libwayland0
    binary package.  Use shorter dependencies list.  New package
    descriptions.
* Remaining Ubuntu changes:
  - control: Replaces/Conflicts on previous binary names
  - control: Include wayland homepage
  - copyright: dep5 metadata
  - libwayland0.symbols.in: omit blank line (dpkg-gensymbols warning)

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
diff -Nurp -x .git wayland-ubuntu-git//clients/Makefile.am wayland-0.1~git20110214.e4762a6a-patched//clients/Makefile.am
2
 
--- wayland-ubuntu-git//clients/Makefile.am     2011-02-23 18:12:37.000000000 -0800
3
 
+++ wayland-0.1~git20110214.e4762a6a-patched//clients/Makefile.am       2011-03-04 15:17:39.000000000 -0800
4
 
@@ -1,4 +1,4 @@
5
 
-noinst_PROGRAMS =                              \
6
 
+bin_PROGRAMS =                         \
7
 
        gears                                   \
8
 
        flower                                  \
9
 
        screenshot                              \
10
 
diff -Nurp -x .git wayland-ubuntu-git//compositor/Makefile.am wayland-0.1~git20110214.e4762a6a-patched//compositor/Makefile.am
11
 
--- wayland-ubuntu-git//compositor/Makefile.am  2011-02-23 18:12:37.000000000 -0800
12
 
+++ wayland-0.1~git20110214.e4762a6a-patched//compositor/Makefile.am    2011-03-04 15:18:05.000000000 -0800
13
 
@@ -1,4 +1,4 @@
14
 
-noinst_PROGRAMS = compositor
15
 
+bin_PROGRAMS = compositor
16
 
 
17
 
 INCLUDES =                                     \
18
 
        -I$(top_srcdir)/wayland                 \