LinGui: Add oneiric, remove karmic from nightlies

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@4266 b64f7644-9d1e-0410-96f1-a4d463321fa5

2 files changed, 42 insertions, 12 deletions

diff --git a/pkg/linux/debian/control.oneiric b/pkg/linux/debian/control.oneiric
new file mode 100644
index 000000000..1016b778d
--- /dev/null
+++ b/pkg/linux/debian/control.oneiric
@@ -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 (>= 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
+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}, libwebkitgtk-1.0-0, libnotify4
+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/module.rules b/pkg/linux/module.rules
index cbf809e79..41fbc404b 100644
--- a/pkg/linux/module.rules
+++ b/pkg/linux/module.rules
@@ -61,14 +61,25 @@ $(PKG.cli.deb): $(PKG.gui.tmp.deb)
 # Debian source package rules
 #
 pkg.push.src.deb:: $(PKG.src.deb.stamp)
+	(cd $(STAGE.out.src/)oneiric && dput handbrake-snapshots handbrake_$(HB.version)ppa1~oneiric1_source.changes )
 	(cd $(STAGE.out.src/)natty && dput handbrake-snapshots handbrake_$(HB.version)ppa1~natty1_source.changes )
 	(cd $(STAGE.out.src/)maverick && dput handbrake-snapshots handbrake_$(HB.version)ppa1~maverick1_source.changes )
 	(cd $(STAGE.out.src/)lucid && dput handbrake-snapshots handbrake_$(HB.version)ppa1~lucid1_source.changes )
-	(cd $(STAGE.out.src/)karmic && dput handbrake-snapshots handbrake_$(HB.version)ppa1~karmic1_source.changes )
 
 $(PKG.src.deb.stamp): GNUmakefile
 	-$(RM.exe) -rf $(STAGE.out.src/)
 	make contrib.fetch
+	svn co -r$(HB.repo.rev) $(HB.repo.url) $(STAGE.out.src/)oneiric/$(PKG.deb.basename)
+	$(CP.exe) -a $(SRC/)download $(STAGE.out.src/)oneiric/$(PKG.deb.basename)
+	cp -a $(PWD)/$(PKG.debian) $(STAGE.out.src/)oneiric/$(PKG.deb.basename)
+	$(CP.exe) $(STAGE.out.src/)oneiric/$(PKG.deb.basename)/debian/control.oneiric $(STAGE.out.src/)oneiric/$(PKG.deb.basename)/debian/control
+	echo "handbrake ($(HB.version)ppa1~oneiric1) oneiric; urgency=low" > $(STAGE.out.src/)oneiric/$(PKG.deb.basename)/debian/changelog
+	echo "  * Snapshot" >> $(STAGE.out.src/)oneiric/$(PKG.deb.basename)/debian/changelog
+	echo "    - See timeline at http://trac.handbrake.fr/timeline" >> $(STAGE.out.src/)oneiric/$(PKG.deb.basename)/debian/changelog
+	echo "" >> $(STAGE.out.src/)oneiric/$(PKG.deb.basename)/debian/changelog
+	echo " -- John Stebbins <[email protected]>  Sun, 11 Apr 2010 9:51:07 -0800" >> $(STAGE.out.src/)oneiric/$(PKG.deb.basename)/debian/changelog
+	$(TAR.exe) czf $(STAGE.out.src/)oneiric/$(PKG.src.deb.tar) -C $(STAGE.out.src/)oneiric $(PKG.deb.basename)
+	(cd $(STAGE.out.src/)oneiric/$(PKG.deb.basename) && debuild -S -kjstebbins.hb)
 	svn co -r$(HB.repo.rev) $(HB.repo.url) $(STAGE.out.src/)natty/$(PKG.deb.basename)
 	$(CP.exe) -a $(SRC/)download $(STAGE.out.src/)natty/$(PKG.deb.basename)
 	cp -a $(PWD)/$(PKG.debian) $(STAGE.out.src/)natty/$(PKG.deb.basename)
@@ -102,17 +113,6 @@ $(PKG.src.deb.stamp): GNUmakefile
 	echo " -- John Stebbins <[email protected]>  Sun, 11 Apr 2010 9:51:07 -0800" >> $(STAGE.out.src/)lucid/$(PKG.deb.basename)/debian/changelog
 	$(TAR.exe) czf $(STAGE.out.src/)lucid/$(PKG.src.deb.tar) -C $(STAGE.out.src/)lucid $(PKG.deb.basename)
 	(cd $(STAGE.out.src/)lucid/$(PKG.deb.basename) && debuild -S -kjstebbins.hb)
-	svn co -r$(HB.repo.rev) $(HB.repo.url) $(STAGE.out.src/)karmic/$(PKG.deb.basename)
-	$(CP.exe) -a $(SRC/)download $(STAGE.out.src/)karmic/$(PKG.deb.basename)
-	cp -a $(PWD)/$(PKG.debian) $(STAGE.out.src/)karmic/$(PKG.deb.basename)
-	$(CP.exe) $(STAGE.out.src/)karmic/$(PKG.deb.basename)/debian/control.karmic $(STAGE.out.src/)karmic/$(PKG.deb.basename)/debian/control
-	echo "handbrake ($(HB.version)ppa1~karmic1) karmic; urgency=low" > $(STAGE.out.src/)karmic/$(PKG.deb.basename)/debian/changelog
-	echo "  * Snapshot" >> $(STAGE.out.src/)karmic/$(PKG.deb.basename)/debian/changelog
-	echo "    - See timeline at http://trac.handbrake.fr/timeline" >> $(STAGE.out.src/)karmic/$(PKG.deb.basename)/debian/changelog
-	echo "" >> $(STAGE.out.src/)karmic/$(PKG.deb.basename)/debian/changelog
-	echo " -- John Stebbins <[email protected]>  Sun, 11 Apr 2010 9:51:07 -0800" >> $(STAGE.out.src/)karmic/$(PKG.deb.basename)/debian/changelog
-	$(TAR.exe) czf $(STAGE.out.src/)karmic/$(PKG.src.deb.tar) -C $(STAGE.out.src/)karmic $(PKG.deb.basename)
-	(cd $(STAGE.out.src/)karmic/$(PKG.deb.basename) && debuild -S -kjstebbins.hb)
 	$(TOUCH.exe) $(PKG.src.deb.stamp)