[Gtk2hs-commit] (main branch): use package name rather than version number to differentiate between gtk2 and gtk3

[Daniel W. <dm...@lu...>]

diffing dir...
Thu Jul 11 16:26:18 BST 2013  Daniel Wagner <da...@wa...>
  * use package name rather than version number to differentiate between gtk2 and gtk3
  Ignore-this: e44fda233a3e0a189c42042567c27e03
  
  simultaneously:
  * remove the gtk3 flag from both the gtk and gtk3 packages
  * remove the "deprecated" flag from the gtk3 package, since it applies only to gtk2 functions
  * remove empty modules from each package
  
    hunk ./gtk/gtk.cabal 1
    -Name:           gtk
    -Version:        3.12.4.1
    +Name:           gtk3
    +Version:        0.12.4.1
    hunk ./gtk/gtk.cabal 25
    -                    hierarchy.list
    hunk ./gtk/gtk.cabal 117
    -Flag deprecated
    -  Description:  Include definitions in this library that are considered obsolete.
    -  Default:      True
    -  Manual:       True
    -
    hunk ./gtk/gtk.cabal 125
    -Flag gtk3
    -  Description: Use GTK3 rather than GTK2
    -  Default: True
    -
    hunk ./gtk/gtk.cabal 179
    -          Graphics.UI.Gtk.Embedding.Embedding
    hunk ./gtk/gtk.cabal 193
    -          Graphics.UI.Gtk.Gdk.Drawable
    hunk ./gtk/gtk.cabal 196
    -          Graphics.UI.Gtk.Gdk.GC
    hunk ./gtk/gtk.cabal 200
    -          Graphics.UI.Gtk.Gdk.Pixmap
    -          Graphics.UI.Gtk.Gdk.Region
    hunk ./gtk/gtk.cabal 228
    -          Graphics.UI.Gtk.MenuComboToolbar.Combo
    hunk ./gtk/gtk.cabal 229
    -          Graphics.UI.Gtk.MenuComboToolbar.ComboBoxEntry
    hunk ./gtk/gtk.cabal 235
    -          Graphics.UI.Gtk.MenuComboToolbar.OptionMenu
    hunk ./gtk/gtk.cabal 257
    -          Graphics.UI.Gtk.Misc.Tooltips
    hunk ./gtk/gtk.cabal 315
    -          Graphics.UI.Gtk.Selectors.FileSelection
    hunk ./gtk/gtk.cabal 319
    -          Graphics.UI.Gtk.Special.Ruler
    -          Graphics.UI.Gtk.Special.HRuler
    -          Graphics.UI.Gtk.Special.VRuler
    hunk ./gtk/gtk.cabal 358
    -        if !flag(deprecated)
    -          cpp-options:  -DDISABLE_DEPRECATED
    -        else
    -          x-Types-Tag:  deprecated [_$_]
    +        cpp-options: -DDISABLE_DEPRECATED
    hunk ./gtk/gtk.cabal 362
    -        [_$_]
    +
    hunk ./gtk/gtk.cabal 364
    -        [_$_]
    -        if flag(gtk3)
    -          x-Types-Hierarchy:  hierarchy3.list
    -        else
    -          x-Types-Hierarchy:  hierarchy.list
    -        [_$_]
    +        x-Types-Hierarchy:  hierarchy3.list
    +
    hunk ./gtk/gtk.cabal 372
    -        if flag(gtk3)
    -          pkgconfig-depends: gthread-2.0, gtk+-3.0
    -        else
    -          pkgconfig-depends: gthread-2.0, gtk+-2.0
    +        pkgconfig-depends: gthread-2.0, gtk+-3.0
    hunk ./gtk/gtk.cabal-0 26
    -                    hierarchy3.list
    hunk ./gtk/gtk.cabal-0 130
    -Flag gtk3
    -  Description: Use GTK3 rather than GTK2
    -  Default: False
    -
    hunk ./gtk/gtk.cabal-0 212
    -          Graphics.UI.Gtk.General.CssProvider
    hunk ./gtk/gtk.cabal-0 221
    -          Graphics.UI.Gtk.General.StyleContext
    -          Graphics.UI.Gtk.General.StyleProvider
    hunk ./gtk/gtk.cabal-0 380
    -        [_$_]
    +
    hunk ./gtk/gtk.cabal-0 382
    -        [_$_]
    -        if flag(gtk3)
    -          x-Types-Hierarchy:  hierarchy3.list
    -        else
    -          x-Types-Hierarchy:  hierarchy.list
    -        [_$_]
    +        x-Types-Hierarchy:  hierarchy.list
    +
    hunk ./gtk/gtk.cabal-0 390
    -        if flag(gtk3)
    -          pkgconfig-depends: gthread-2.0, gtk+-3.0
    -        else
    -          pkgconfig-depends: gthread-2.0, gtk+-2.0
    +        pkgconfig-depends: gthread-2.0, gtk+-2.0
    hunk ./gtk/gtk.cabal-3 1
    -Name:           gtk
    -Version:        3.12.4.1
    +Name:           gtk3
    +Version:        0.12.4.1
    hunk ./gtk/gtk.cabal-3 25
    -                    hierarchy.list
    hunk ./gtk/gtk.cabal-3 117
    -Flag deprecated
    -  Description:  Include definitions in this library that are considered obsolete.
    -  Default:      True
    -  Manual:       True
    -
    hunk ./gtk/gtk.cabal-3 125
    -Flag gtk3
    -  Description: Use GTK3 rather than GTK2
    -  Default: True
    -
    hunk ./gtk/gtk.cabal-3 179
    -          Graphics.UI.Gtk.Embedding.Embedding
    hunk ./gtk/gtk.cabal-3 193
    -          Graphics.UI.Gtk.Gdk.Drawable
    hunk ./gtk/gtk.cabal-3 196
    -          Graphics.UI.Gtk.Gdk.GC
    hunk ./gtk/gtk.cabal-3 200
    -          Graphics.UI.Gtk.Gdk.Pixmap
    -          Graphics.UI.Gtk.Gdk.Region
    hunk ./gtk/gtk.cabal-3 228
    -          Graphics.UI.Gtk.MenuComboToolbar.Combo
    hunk ./gtk/gtk.cabal-3 229
    -          Graphics.UI.Gtk.MenuComboToolbar.ComboBoxEntry
    hunk ./gtk/gtk.cabal-3 235
    -          Graphics.UI.Gtk.MenuComboToolbar.OptionMenu
    hunk ./gtk/gtk.cabal-3 257
    -          Graphics.UI.Gtk.Misc.Tooltips
    hunk ./gtk/gtk.cabal-3 315
    -          Graphics.UI.Gtk.Selectors.FileSelection
    hunk ./gtk/gtk.cabal-3 319
    -          Graphics.UI.Gtk.Special.Ruler
    -          Graphics.UI.Gtk.Special.HRuler
    -          Graphics.UI.Gtk.Special.VRuler
    hunk ./gtk/gtk.cabal-3 358
    -        if !flag(deprecated)
    -          cpp-options:  -DDISABLE_DEPRECATED
    -        else
    -          x-Types-Tag:  deprecated [_$_]
    +        cpp-options: -DDISABLE_DEPRECATED
    hunk ./gtk/gtk.cabal-3 362
    -        [_$_]
    +
    hunk ./gtk/gtk.cabal-3 364
    -        [_$_]
    -        if flag(gtk3)
    -          x-Types-Hierarchy:  hierarchy3.list
    -        else
    -          x-Types-Hierarchy:  hierarchy.list
    -        [_$_]
    +        x-Types-Hierarchy:  hierarchy3.list
    +
    hunk ./gtk/gtk.cabal-3 372
    -        if flag(gtk3)
    -          pkgconfig-depends: gthread-2.0, gtk+-3.0
    -        else
    -          pkgconfig-depends: gthread-2.0, gtk+-2.0
    +        pkgconfig-depends: gthread-2.0, gtk+-3.0