summaryrefslogtreecommitdiffstats
path: root/pkg/linux
diff options
context:
space:
mode:
authorjstebbins <[email protected]>2012-10-05 22:40:03 +0000
committerjstebbins <[email protected]>2012-10-05 22:40:03 +0000
commit13e4fc1725bc45b9f59adcba9228f0554dc90e35 (patch)
tree17b9c8e99e293111a46d135d15badbbbf51d0175 /pkg/linux
parent657a2ce1106c975f15d1bde54dda386c15d51db2 (diff)
LinGui: use more system libs
use system libs for fontconfig, freetype, libxml2, libass, libogg, libvorbis, libtheora, and libsamplerate update build dependencies for ubuntu packages update documentation to reflect new build dependencies fix a problem with hb.h conflict with harfbuzz/hb.h git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@5001 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'pkg/linux')
-rw-r--r--pkg/linux/debian/control.maverick30
-rw-r--r--pkg/linux/debian/control.natty2
-rw-r--r--pkg/linux/debian/control.oneiric2
-rw-r--r--pkg/linux/debian/control.pangolin2
-rw-r--r--pkg/linux/module.rules2
5 files changed, 34 insertions, 4 deletions
diff --git a/pkg/linux/debian/control.maverick b/pkg/linux/debian/control.maverick
new file mode 100644
index 000000000..6d5b53328
--- /dev/null
+++ b/pkg/linux/debian/control.maverick
@@ -0,0 +1,30 @@
+Source: handbrake
+Section: graphics
+Priority: optional
+Maintainer: John Stebbins <[email protected]>
+Build-Depends: debhelper (>= 6), autotools-dev, libtool, libgudev-1.0-dev, intltool, autoconf, yasm (>= 1.1.0), libbz2-dev, zlib1g-dev, libwebkit-dev, libnotify-dev, libgstreamer0.10-dev, libgstreamer-plugins-base0.10-dev, wget, subversion, python (>= 2.6), libfribidi-dev (>= 0.19.0), libxml2-dev, libogg-dev, libtheora-dev, libvorbis-dev, libsamplerate0-dev, libfreetype6-dev, libfontconfig1-dev, libass-dev
+Standards-Version: 3.8.4
+Homepage: http://www.handbrake.fr/
+
+Package: handbrake-cli
+Architecture: i386 amd64
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts: handbrake
+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, MPEG-4, or OGG formatted media. It's particularly useful for making
+ videos that are compatible with portable video devices such as the Apple
+ iPod/iPhone. This package contains the command-line variant,
+ HandBrakeCLI
+
+Package: handbrake-gtk
+Architecture: i386 amd64
+Depends: ${shlibs:Depends}, ${misc:Depends}, libwebkit-1.0-2, libnotify1
+Conflicts: handbrake
+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, MPEG-4, or OGG formatted media. It's particularly useful for making
+ videos that are compatible with portable video devices such as the Apple
+ iPod/iPhone. This package contains the graphical variant, ghb.
+
+
diff --git a/pkg/linux/debian/control.natty b/pkg/linux/debian/control.natty
index 72349334b..b4295ea6c 100644
--- a/pkg/linux/debian/control.natty
+++ b/pkg/linux/debian/control.natty
@@ -2,7 +2,7 @@ Source: handbrake
Section: graphics
Priority: optional
Maintainer: John Stebbins <[email protected]>
-Build-Depends: debhelper (>= 6), autotools-dev, libtool, libgudev-1.0-dev, intltool, autoconf, yasm (>= 0.7.0), libbz2-dev, zlib1g-dev, libwebkitgtk-dev, libnotify-dev, libgstreamer0.10-dev, libgstreamer-plugins-base0.10-dev, wget, subversion, python (>= 2.6), libappindicator-dev, libfribidi-dev (>= 0.19.0)
+Build-Depends: debhelper (>= 6), autotools-dev, libtool, libgudev-1.0-dev, intltool, autoconf, yasm (>= 1.1.0), libbz2-dev, zlib1g-dev, libwebkitgtk-dev, libnotify-dev, libgstreamer0.10-dev, libgstreamer-plugins-base0.10-dev, wget, subversion, python (>= 2.6), libappindicator-dev, libfribidi-dev (>= 0.19.0), libxml2-dev, libogg-dev, libtheora-dev, libvorbis-dev, libsamplerate0-dev, libfreetype6-dev, libfontconfig1-dev, libass-dev
Standards-Version: 3.8.4
Homepage: http://www.handbrake.fr/
diff --git a/pkg/linux/debian/control.oneiric b/pkg/linux/debian/control.oneiric
index f093af699..20894fd04 100644
--- a/pkg/linux/debian/control.oneiric
+++ b/pkg/linux/debian/control.oneiric
@@ -2,7 +2,7 @@ Source: handbrake
Section: graphics
Priority: optional
Maintainer: John Stebbins <[email protected]>
-Build-Depends: debhelper (>= 6), autotools-dev, libtool, libgudev-1.0-dev, intltool, autoconf, yasm (>= 0.7.0), libbz2-dev, zlib1g-dev, libwebkitgtk-dev, libnotify-dev, libgstreamer0.10-dev, libgstreamer-plugins-base0.10-dev, wget, subversion, python (>= 2.6), libappindicator-dev, libfribidi-dev (>= 0.19.0)
+Build-Depends: debhelper (>= 6), autotools-dev, libtool, libgudev-1.0-dev, intltool, autoconf, yasm (>= 1.1.0), libbz2-dev, zlib1g-dev, libwebkitgtk-dev, libnotify-dev, libgstreamer0.10-dev, libgstreamer-plugins-base0.10-dev, wget, subversion, python (>= 2.6), libappindicator-dev, libfribidi-dev (>= 0.19.0), libxml2-dev, libogg-dev, libtheora-dev, libvorbis-dev, libsamplerate0-dev, libfreetype6-dev, libfontconfig1-dev, libass-dev
Standards-Version: 3.8.4
Homepage: http://www.handbrake.fr/
diff --git a/pkg/linux/debian/control.pangolin b/pkg/linux/debian/control.pangolin
index f093af699..20894fd04 100644
--- a/pkg/linux/debian/control.pangolin
+++ b/pkg/linux/debian/control.pangolin
@@ -2,7 +2,7 @@ Source: handbrake
Section: graphics
Priority: optional
Maintainer: John Stebbins <[email protected]>
-Build-Depends: debhelper (>= 6), autotools-dev, libtool, libgudev-1.0-dev, intltool, autoconf, yasm (>= 0.7.0), libbz2-dev, zlib1g-dev, libwebkitgtk-dev, libnotify-dev, libgstreamer0.10-dev, libgstreamer-plugins-base0.10-dev, wget, subversion, python (>= 2.6), libappindicator-dev, libfribidi-dev (>= 0.19.0)
+Build-Depends: debhelper (>= 6), autotools-dev, libtool, libgudev-1.0-dev, intltool, autoconf, yasm (>= 1.1.0), libbz2-dev, zlib1g-dev, libwebkitgtk-dev, libnotify-dev, libgstreamer0.10-dev, libgstreamer-plugins-base0.10-dev, wget, subversion, python (>= 2.6), libappindicator-dev, libfribidi-dev (>= 0.19.0), libxml2-dev, libogg-dev, libtheora-dev, libvorbis-dev, libsamplerate0-dev, libfreetype6-dev, libfontconfig1-dev, libass-dev
Standards-Version: 3.8.4
Homepage: http://www.handbrake.fr/
diff --git a/pkg/linux/module.rules b/pkg/linux/module.rules
index ef10082bf..7a8da7a87 100644
--- a/pkg/linux/module.rules
+++ b/pkg/linux/module.rules
@@ -105,7 +105,7 @@ $(PKG.src.deb.stamp): GNUmakefile
svn co -r$(HB.repo.rev) $(HB.repo.url) $(STAGE.out.src/)maverick/$(PKG.deb.basename)
$(CP.exe) -a $(SRC/)download $(STAGE.out.src/)maverick/$(PKG.deb.basename)
cp -a $(PWD)/$(PKG.debian) $(STAGE.out.src/)maverick/$(PKG.deb.basename)
- $(CP.exe) $(STAGE.out.src/)maverick/$(PKG.deb.basename)/debian/control.karmic $(STAGE.out.src/)maverick/$(PKG.deb.basename)/debian/control
+ $(CP.exe) $(STAGE.out.src/)maverick/$(PKG.deb.basename)/debian/control.maverick $(STAGE.out.src/)maverick/$(PKG.deb.basename)/debian/control
echo "handbrake ($(HB.version)ppa1~maverick1) maverick; urgency=low" > $(STAGE.out.src/)maverick/$(PKG.deb.basename)/debian/changelog
echo " * Snapshot" >> $(STAGE.out.src/)maverick/$(PKG.deb.basename)/debian/changelog
echo " - See timeline at http://trac.handbrake.fr/timeline" >> $(STAGE.out.src/)maverick/$(PKG.deb.basename)/debian/changelog