buildsys: improve DSC target

This avoids a duplicate call to lintian on sbuild target

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>

Makefile

@@ -4,7 +4,6 @@ PACKAGE=libjs-extjs
 
 BUILDDIR ?= $(PACKAGE)-$(DEB_VERSION_UPSTREAM)
 ORIG_SRC_TAR=$(PACKAGE)_$(DEB_VERSION_UPSTREAM).orig.tar.gz
-GITVERSION:=$(shell git rev-parse HEAD)
 
 DEB=$(PACKAGE)_$(DEB_VERSION_UPSTREAM_REVISION)_all.deb
 DSC=$(PACKAGE)_$(DEB_VERSION_UPSTREAM_REVISION).dsc
@@ -15,6 +14,7 @@ $(BUILDDIR): debian extjs
 	rm -rf $@ $@.tmp && mkdir -p $@.tmp/extjs
 	cp -a debian/ $@.tmp/debian
 	cp -a extjs/build/ $@.tmp/extjs/build
+	echo "git clone git://git.proxmox.com/git/extjs.git\\ngit checkout $$(git rev-parse HEAD)" > $@.tmp/debian/SOURCE
 	mv $@.tmp $@
 
 .PHONY: deb
@@ -27,17 +27,20 @@ $(ORIG_SRC_TAR): $(BUILDDIR)
 	tar czf $(ORIG_SRC_TAR) --exclude="$(BUILDDIR)/debian" $(BUILDDIR)
 
 .PHONY: dsc
-dsc: $(DSC)
+dsc: clean
+	$(MAKE) $(DSC)
+	lintian $@
+
 $(DSC): $(ORIG_SRC_TAR) $(BUILDDIR)
 	cd $(BUILDDIR); dpkg-buildpackage -S -us -uc -d
-	lintian $@
 
 sbuild: $(DSC)
 	sbuild $(DSC)
 
 .PHONY: upload
+upload: UPLOAD_DIST ?= $(DEB_DISTRIBUTION)
 upload: $(DEB)
-	tar cf - $(DEB) | ssh repoman@repo.proxmox.com -- upload --product pve,pmg,pbs --dist bookworm
+	tar cf - $(DEB) | ssh repoman@repo.proxmox.com -- upload --product pve,pmg,pbs --dist $(UPLOAD_DIST)
 
 .PHONY: distclean clean
 distclean: clean

debian/control

@@ -2,14 +2,14 @@ Source: libjs-extjs
 Section: web
 Priority: optional
 Maintainer: Proxmox Support Team <support@proxmox.com>
-Build-Depends: debhelper-compat (= 13)
+Build-Depends: debhelper-compat (= 13),
 Standards-Version: 4.6.2
 Homepage: https://www.sencha.com/
 
 Package: libjs-extjs
 Architecture: all
-Depends: ${misc:Depends}
+Depends: ${misc:Depends},
-Breaks: proxmox-widget-toolkit (<< 3.1-1)
+Breaks: proxmox-widget-toolkit (<< 3.1-1),
 Description: cross-browser JavaScript library
  Ext JS is a cross-browser JavaScript library for building rich internet
  applications.

debian/copyright

@@ -15,7 +15,7 @@ http://www.sencha.com/license
 
 Open Source License
 ------------------------------------------------------------------------------------------
-This version of Ext JS 7.0.0.168 is licensed under the terms of the Open Source GPL 3.0 license. 
+This version of Ext JS 7.0.0.168 is licensed under the terms of the Open Source GPL 3.0 license.
 
 http://www.gnu.org/licenses/gpl.html
 
@@ -23,15 +23,15 @@ http://www.gnu.org/licenses/gpl.html
 Alternate Licensing
 ------------------------------------------------------------------------------------------
 Commercial and OEM Licenses are available for an alternate download of Ext JS 7.0.0.168.
-This is the appropriate option if you are creating proprietary applications and you are 
+This is the appropriate option if you are creating proprietary applications and you are
-not prepared to distribute and share the source code of your application under the 
+not prepared to distribute and share the source code of your application under the
 GPL v3 license. Please visit http://www.sencha.com/license for more details.
 
 
 Third Party Content
 ------------------------------------------------------------------------------------------
-The following third party software is distributed with Ext JS 7.0.0.168 and is 
+The following third party software is distributed with Ext JS 7.0.0.168 and is
-provided under other licenses and/or has source available from other locations. 
+provided under other licenses and/or has source available from other locations.
 
 Library: YUI 0.6 (BSD Licensed) for drag-and-drop code.
 Location:<3A>http://developer.yahoo.com/yui
@@ -41,15 +41,15 @@ Library: JSON parser
 Location: http://www.JSON.org/js.html
 License: http://www.json.org/license.html (MIT License)
 
-Library: flexible-js-formatting 
+Library: flexible-js-formatting
 Location:<3A>http://code.google.com/p/flexible-js-formatting/
 License:<3A>http://www.opensource.org/licenses/mit-license.php (MIT License)
 
-Library: sparkline.js 
+Library: sparkline.js
 Location: http://omnipotent.net/jquery.sparkline
 License:  http://omnipotent.net/jquery.sparkline  (BSD 3-Clause License)
 
-Library: DeftJS 
+Library: DeftJS
 Location: http://deftjs.org/
 License: http://www.opensource.org/licenses/mit-license.php (MIT License)
 
@@ -59,7 +59,7 @@ License: http://www.fontsquirrel.com/fonts/open-sans (Apache 2.0 License)
 
 Ext JS 7.0.0.168 Examples:
 
-Library: Silk Icons 
+Library: Silk Icons
 Location: http://www.famfamfam.com/lab/icons/silk/
 License: http://www.famfamfam.com/lab/icons/silk/ (Creative Commons Attribution 2.5 License)
 
@@ -74,4 +74,4 @@ License: https://github.com/google/material-design-icons/blob/master/LICENSE (Ap
 
 --
 
-THIS SOFTWARE IS DISTRIBUTED "AS-IS" WITHOUT ANY WARRANTIES, CONDITIONS AND REPRESENTATIONS WHETHER EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION THE IMPLIED WARRANTIES AND CONDITIONS OF MERCHANTABILITY, MERCHANTABLE QUALITY, FITNESS FOR A PARTICULAR PURPOSE, DURABILITY, NON-INFRINGEMENT, PERFORMANCE AND THOSE ARISING BY STATUTE OR FROM CUSTOM OR USAGE OF TRADE OR COURSE OF DEALING. 
+THIS SOFTWARE IS DISTRIBUTED "AS-IS" WITHOUT ANY WARRANTIES, CONDITIONS AND REPRESENTATIONS WHETHER EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION THE IMPLIED WARRANTIES AND CONDITIONS OF MERCHANTABILITY, MERCHANTABLE QUALITY, FITNESS FOR A PARTICULAR PURPOSE, DURABILITY, NON-INFRINGEMENT, PERFORMANCE AND THOSE ARISING BY STATUTE OR FROM CUSTOM OR USAGE OF TRADE OR COURSE OF DEALING.