diff --git a/debian/changelog b/debian/changelog index 56b5d8815be62e9c7da62e36f77404b20d2d3664..5dcc3b6d511e8abacf462f4b8a05285d984aead0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -srb2 (2.1.21~1) trusty; urgency=high +srb2 (2.1.21~3) trusty; urgency=high * Pre-release for SRB2 v2.1.21 diff --git a/debian/rules b/debian/rules index 9434a739e19171edc446c6498c6f43fb44b75884..4526a60bfaee9ca06676cc3448891fa3393ace13 100755 --- a/debian/rules +++ b/debian/rules @@ -109,8 +109,8 @@ binary-arch: echo $(DESKTOP_DIR) >> $(DIR)/debian/$(PACKAGE).install echo $(PIXMAPS_DIR) >> $(DIR)/debian/$(PACKAGE).install echo $(DBGDIR) > $(DIR)/debian/$(DBGPKG).install - -binary: binary-arch +# Launchpad only calls binary-arch, so just move everything up +#binary: binary-arch # Generate .desktop specifications echo "`echo '$(MENUFILE1)\\'`" > $(DIR)/debian/menu echo " `echo '$(MENUFILE2)'`" >> $(DIR)/debian/menu @@ -142,6 +142,8 @@ binary: binary-arch dh_md5sums dh_builddeb +binary: binary-arch + clean: $(MAKE) -C $(DIR)/src $(MAKEARGS) clean cleandep $(RM) $(BINDIR)/* @@ -154,4 +156,4 @@ clean: $(RM) $(DIR)/debian/files $(RM) $(DIR)/debian/source/include-binaries -.PHONY: all clean binary binary-arch binary-indep build +.PHONY: all clean binary binary-indep build