[SCM] handbrake/master: Rename handbrake-gtk to handbrake.

[fabian-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 651be993c325e90d930cdc0f520a8aaea79ce552
Author: Fabian Greffrath <fabian+debian at greffrath.com>
Date:   Wed Nov 14 14:24:47 2012 +0100

    Rename handbrake-gtk to handbrake.
    
    Keep symlinks to the old binray and manpage name around
    Remove cruft about 'info handbrake' from manpage
    Re-run 'wrap-and-sort -asb'

diff --git a/debian/control b/debian/control
index 231abe0..50addb8 100644
--- a/debian/control
+++ b/debian/control
@@ -49,19 +49,25 @@ Build-Depends:
  wget,
  yasm
 
-Package: handbrake-cli
+Package: handbrake
 Architecture: any-amd64 any-i386 powerpc
 Pre-Depends:
  dpkg (>= 1.15.6~)
 Depends:
  ${misc:Depends},
  ${shlibs:Depends}
+Recommends:
+ gstreamer0.10-ffmpeg,
+ gstreamer0.10-x
+Conflicts:
+ handbrake-gtk
+Replaces:
+ handbrake-gtk
 Breaks:
-# handbrake segfaults with libdvdread4_4.2.0+20120521-2, see #688574
  libdvdread4 (<< 4.2.0+20120521-3)
-Description: versatile DVD ripper and video transcoder (command line)
+Description: versatile DVD ripper and video transcoder (GTK GUI)
  HandBrake is a versatile, easy-to-use tool for converting DVDs and other
- videos into H.264, XViD, or OGG formatted media.  It's particularly useful
+ videos into H.264, XViD, or OGG formatted media. It's particularly useful
  for making videos that are compatible with portable video devices such as
  the Apple iPod/iPhone or Sony PSP.
  .
@@ -69,24 +75,20 @@ Description: versatile DVD ripper and video transcoder (command line)
  It does neither support audio encoding to AAC via faac nor MP4 format
  muxing via libmp4v2, it falls back to the MKV format instead.
  .
- This package contains the command-line variant, HandBrakeCLI.
+ This package contains the graphical variant, ghb.
 
-Package: handbrake-gtk
+Package: handbrake-cli
 Architecture: any-amd64 any-i386 powerpc
 Pre-Depends:
  dpkg (>= 1.15.6~)
 Depends:
  ${misc:Depends},
  ${shlibs:Depends}
-Recommends:
- gstreamer0.10-ffmpeg,
- gstreamer0.10-x
 Breaks:
-# handbrake segfaults with libdvdread4_4.2.0+20120521-2, see #688574
  libdvdread4 (<< 4.2.0+20120521-3)
-Description: versatile DVD ripper and video transcoder (GTK GUI)
+Description: versatile DVD ripper and video transcoder (command line)
  HandBrake is a versatile, easy-to-use tool for converting DVDs and other
- videos into H.264, XViD, or OGG formatted media. It's particularly useful
+ videos into H.264, XViD, or OGG formatted media.  It's particularly useful
  for making videos that are compatible with portable video devices such as
  the Apple iPod/iPhone or Sony PSP.
  .
@@ -94,15 +96,15 @@ Description: versatile DVD ripper and video transcoder (GTK GUI)
  It does neither support audio encoding to AAC via faac nor MP4 format
  muxing via libmp4v2, it falls back to the MKV format instead.
  .
- This package contains the graphical variant, ghb.
+ This package contains the command-line variant, HandBrakeCLI.
 
 Package: handbrake-dbg
 Section: debug
 Priority: extra
 Architecture: any
 Depends:
+ handbrake (= ${binary:Version}),
  handbrake-cli (= ${binary:Version}),
- handbrake-gtk (= ${binary:Version}),
  ${misc:Depends}
 Description: handbrake -- debugging symbols
  HandBrake is a versatile, easy-to-use tool for converting DVDs and other
diff --git a/debian/handbrake-gtk.links b/debian/handbrake-gtk.links
deleted file mode 100644
index 40e48b2..0000000
--- a/debian/handbrake-gtk.links
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/bin/ghb	usr/bin/handbrake-gtk
-usr/share/man/man1/handbrake-gtk.1	usr/share/man/man1/ghb.1
diff --git a/debian/handbrake-gtk.manpages b/debian/handbrake-gtk.manpages
deleted file mode 100644
index c4aaf6d..0000000
--- a/debian/handbrake-gtk.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/handbrake-gtk.1
diff --git a/debian/handbrake-gtk.1 b/debian/handbrake.1
similarity index 82%
rename from debian/handbrake-gtk.1
rename to debian/handbrake.1
index bb15364..bc30f3f 100644
--- a/debian/handbrake-gtk.1
+++ b/debian/handbrake.1
@@ -1,11 +1,11 @@
 .\" This file was generated by help2man 1.40.10 and edited by Dmitry Smirnov <onlyjob at member.fsf.org>
-.TH HANDBRAKE-GTK "1" "October 2012" "handbrake-gtk 0.9.8" "User Commands"
+.TH HANDBRAKE-GTK "1" "October 2012" "handbrake 0.9.8" "User Commands"
 .SH NAME
-handbrake-gtk \- versatile DVD ripper and video transcoder
+handbrake \- versatile DVD ripper and video transcoder
 .SH DESCRIPTION
 .SS "Usage:"
 .IP
-handbrake\-gtk [OPTION...] \- Transcode media formats
+handbrake [OPTION...] \- Transcode media formats
 .SS "Help Options:"
 .TP
 \fB\-h\fR, \fB\-\-help\fR
@@ -93,15 +93,3 @@ Spam a lot
 .TP
 \fB\-\-display\fR=\fIDISPLAY\fR
 X display to use
-.SH "SEE ALSO"
-The full documentation for
-.B handbrake-gtk
-is maintained as a Texinfo manual.  If the
-.B info
-and
-.B handbrake-gtk
-programs are properly installed at your site, the command
-.IP
-.B info handbrake-gtk
-.PP
-should give you access to the complete manual.
diff --git a/debian/handbrake-gtk.install b/debian/handbrake.install
similarity index 100%
rename from debian/handbrake-gtk.install
rename to debian/handbrake.install
diff --git a/debian/handbrake.links b/debian/handbrake.links
new file mode 100644
index 0000000..8d49033
--- /dev/null
+++ b/debian/handbrake.links
@@ -0,0 +1,4 @@
+usr/bin/ghb	usr/bin/handbrake
+usr/bin/ghb	usr/bin/handbrake-gtk
+usr/share/man/man1/handbrake.1	usr/share/man/man1/ghb.1
+usr/share/man/man1/handbrake.1	usr/share/man/man1/handbrake-gtk.1
diff --git a/debian/handbrake.manpages b/debian/handbrake.manpages
new file mode 100644
index 0000000..1c3ae39
--- /dev/null
+++ b/debian/handbrake.manpages
@@ -0,0 +1 @@
+debian/handbrake.1

-- 
handbrake packaging