Makefile cleanups

Makefile

@@ -61,14 +61,16 @@ install: $(MAIN)-$(VERSION) $(MAIN).1.gz
 # Put this in ~/bin:
 #  http://code.google.com/p/support/source/browse/trunk/scripts/googlecode_upload.py
 
-release: $(MAIN)-$(VERSION) changelog-update wiki-update release-combined
-	googlecode_upload.py -l "Featured,OpSys-All" -s "Version $(VERSION)" -p get-flash-videos $<
+release: release-main deb
 	svn commit -m "Version $(VERSION)" wiki/Installation.wiki wiki/Version.wiki
+
+release-main: $(MAIN)-$(VERSION) changelog-update wiki-update release-combined
+	googlecode_upload.py -l "Featured,OpSys-All" -s "Version $(VERSION)" -p get-flash-videos $<
 	svn commit -m "Version $(VERSION)" debian/changelog
 	svn cp https://get-flash-videos.googlecode.com/svn/trunk https://get-flash-videos.googlecode.com/svn/tags/v$(VERSION)
 
 release-combined: combined-$(MAIN)-$(VERSION)
-	googlecode_upload.py -l "Featured,OpSys-All" -s "Version $(VERSION) -- combined version including some required modules." -p get-flash-videos $^
+	googlecode_upload.py -l "OpSys-All" -s "Version $(VERSION) -- combined version including some required modules." -p get-flash-videos $^
 
 wiki:
 	svn checkout https://get-flash-videos.googlecode.com/svn/wiki/ $@
@@ -83,10 +85,11 @@ wiki-update: wiki
 	@svn diff wiki/Installation.wiki wiki/Version.wiki | grep -q . || (echo "Version already released" && exit 1)
 	@svn diff wiki/Installation.wiki wiki/Version.wiki && echo "OK? (ctrl-c to abort)" && read F
 
-deb:
+deb: release-main
 	mkdir -p /tmp/deb
 	svn co https://get-flash-videos.googlecode.com/svn/tags/v$(VERSION) /tmp/deb/$(VERSION)
 	cd /tmp/deb/$(VERSION) && dpkg-buildpackage
-	googlecode_upload.py -l "Featured" -s "Version $(VERSION) -- Debian package, for Debian and Ubuntu" -p get-flash-videos /tmp/deb/get-flash-videos_$(VERSION)-1_all.deb
+	googlecode_upload.py -l "Type-Package,OpSys-Linux" -s "Version $(VERSION) -- Debian package, for Debian and Ubuntu" -p get-flash-videos /tmp/deb/get-flash-videos_$(VERSION)-1_all.deb
+	rm -rf /tmp/deb/$(VERSION)
 
-.PHONY: all clean release release-combined check wiki-update install deb
+.PHONY: all clean release release-main release-combined check wiki-update install deb