← Back to branch summary

~ubuntu-branches/ubuntu/hardy/avidemux/hardy

« back to all changes in this revision

Viewing changes to avidemux/ADM_userInterfaces/ADM_GTK/ADM_toolkit_gtk/ADM_gladeSupport.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Matvey Kozhev
  • Date: 2008-01-23 14:24:55 UTC
  • mfrom: (1.1.8 upstream)
  • Revision ID: james.westby@ubuntu.com-20080123142455-wznqmv3teznzpmjb
Tags: 1:2.4.0-0.3ubuntu1
https://launchpad.net/bugs/178845
https://launchpad.net/bugs/180393
https://launchpad.net/bugs/177082
https://launchpad.net/bugs/181389
* Merged new upstream release from debian-multimedia.org
  (LP: #178845, LP: #180393), remaining Ubuntu changes:
  + debian/control:
    - set maintainer fields per Ubuntu policy.
    - removed libamrnb-dev, not in Ubuntu and most likely
      will never be (due to being proprietary software).
    - build against current libx264-dev (LP: #177082).
    - build against current libfaac-dev (LP: #181389).
    - build-depend on chrpath to strip rpath from avidemux2_qt4.
  + debian/rules: strip rpath from avidemux2_qt4.
  + debian/source.lintian-overrides: re-added.

Show diffs side-by-side

added added

removed removed

Lines of Context:
avidemux/ADM_userInterfaces/ADM_GTK/ADM_toolkit_gtk/ADM_gladeSupport.cpp
96
96
        {A_ICON_XPM,"xpm_prevblack.xpm",(void *)        xpm_prevblack},
97
97
        {A_ICON_XPM,"avidemux_icon.xpm",(void *)        avidemux_icon_xpm},
98
98
        {A_ICON_XPM,"xpm_prevblack.xpm",(void *)        xpm_prevblack},
99
 
        {A_ICON_PNG,"gnome-calculator.xpm",(void *)     gnome_calculator},
 
99
        {A_ICON_PNG,"gnome-calculator.png",(void *)     gnome_calculator},
100
100
        {A_ICON_PNG,"gnome-calculator_small.xpm",(void *) gnome_calculator_small},
101
101
        {A_ICON_PNG,"preview.png",(void *) preview},
102
102
        {A_ICON_PNG,"output.png",(void *) output},