]> git.proxmox.com Git - pve-jslint.git/commitdiff
move to buildpackage
authorThomas Lamprecht <t.lamprecht@proxmox.com>
Tue, 19 Feb 2019 11:31:18 +0000 (12:31 +0100)
committerThomas Lamprecht <t.lamprecht@proxmox.com>
Tue, 19 Feb 2019 13:21:09 +0000 (14:21 +0100)
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
Makefile
changelog.Debian [deleted file]
control.in [deleted file]
copyright [deleted file]
debian/changelog [new file with mode: 0644]
debian/compat [new file with mode: 0644]
debian/control [new file with mode: 0644]
debian/copyright [new file with mode: 0644]
debian/docs [new file with mode: 0644]
debian/rules [new file with mode: 0755]
debian/source/format [new file with mode: 0644]

index 52b16bff002121272844792f9eddf35a7ecd027d..9522ea48673f5cb94ca73bd7c367854da3323336 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -4,9 +4,16 @@ PACKAGERELEASE=5
 
 PKGREL=${VERSION}-${PACKAGERELEASE}
 DEB=${PACKAGE}_${PKGREL}_all.deb
-GITVERSION:=$(shell cat .git/refs/heads/master)
+GITVERSION:=$(shell git rev-parse HEAD)
 
-all: ${DEB}
+BUILDDIR ?= ${PACKAGE}-${VERSION}
+
+all:
+
+${BUILDDIR}: debian
+       rm -rf ${BUILDDIR}
+       rsync -a * ${BUILDDIR}
+       echo "git clone git://git.proxmox.com/git/pve-jslint.git\\ngit checkout $(GITVERSION)" > ${BUILDDIR}/debian/SOURCE
 
 .PHONY: dinstall
 dinstall: ${DEB}
@@ -14,21 +21,8 @@ dinstall: ${DEB}
 
 .PHONY: deb
 deb: ${DEB}
-${DEB}:
-       make clean
-       rm -rf dest
-       mkdir dest
-       make DESTDIR=`pwd`/dest install
-       mkdir dest/DEBIAN
-       sed -e 's/@PKGREL@/${PKGREL}/' <control.in >dest/DEBIAN/control
-       mkdir -p dest/usr/share/doc/${PACKAGE}
-       echo "git clone git://git.proxmox.com/git/pve-jslint.git\\ngit checkout ${GITVERSION}" > dest/usr/share/doc/${PACKAGE}/SOURCE
-       install -m 0644 copyright dest/usr/share/doc/${PACKAGE}
-       install -m 0644 changelog.Debian dest/usr/share/doc/${PACKAGE}
-       gzip -n --best dest/usr/share/doc/${PACKAGE}/changelog.Debian
-       fakeroot dpkg-deb --build dest
-       mv dest.deb ${DEB}
-       rm -rf dest
+${DEB}: ${BUILDDIR}
+       cd ${BUILDDIR}; dpkg-buildpackage -b -us -uc
        lintian ${DEB}
 
 rhinoed_jslint.js: jslint.js rhino.js
@@ -36,9 +30,9 @@ rhinoed_jslint.js: jslint.js rhino.js
        mv $@.tmp $@
 
 install: rhinoed_jslint.js jslint
-       mkdir -p ${DESTDIR}/usr/share/${PACKAGE}
+       install -d -m 0755 ${DESTDIR}/usr/share/${PACKAGE}
        install -m 0644 rhinoed_jslint.js ${DESTDIR}/usr/share/${PACKAGE}/rhinoed_jslint.js
-       mkdir -p ${DESTDIR}/usr/bin
+       install -d -m 0755 ${DESTDIR}/usr/bin
        install -m 0755 jslint ${DESTDIR}/usr/bin
 
 jslint.js download:
@@ -49,7 +43,7 @@ distclean: clean
 
 .PHONY: clean
 clean:
-       rm -rf *~ dest control rhinoed_jslint.js *.deb
+       rm -rf *~ ${BUILDDIR} rhinoed_jslint.js *.deb *.changes *.buildinfo
 
 .PHONY: upload
 upload: ${DEB}
diff --git a/changelog.Debian b/changelog.Debian
deleted file mode 100644 (file)
index add2e64..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-pve-jslint (1.0-5) unstable; urgency=medium
-
-  * collect all errors and show them only after checking all files
-
-  * add 'Proxmox' to allowed global variable list
-
- -- Proxmox Support Team <support@proxmox.com>  Tue, 22 May 2018 15:00:41 +0200
-
-pve-jslint (1.0-4) unstable; urgency=low
-
-  * correctly include jslint file
-
- -- Proxmox Support Team <support@proxmox.com>  Fri, 10 Apr 2015 07:08:31 +0200
-
-pve-jslint (1.0-3) unstable; urgency=low
-
-  * add FromData to predefined NS
-
- -- Proxmox Support Team <support@proxmox.com>  Wed, 09 Nov 2011 10:45:24 +0100
-
-pve-jslint (1.0-2) unstable; urgency=low
-
-  * download from http://jslint.com/jslint.js
-  
- -- Proxmox Support Team <support@proxmox.com>  Fri, 08 Jul 2011 08:22:17 +0200
-
-pve-jslint (1.0-1) unstable; urgency=low
-
-  * first try
-
- -- Proxmox Support Team <support@proxmox.com>  Thu, 07 Jul 2011 14:47:58 +0200
-
diff --git a/control.in b/control.in
deleted file mode 100644 (file)
index c89fd20..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-Package: pve-jslint
-Version: @PKGREL@
-Section: devel
-Priority: optional
-Architecture: all
-Depends: rhino
-Maintainer: Proxmox Support Team <support@proxmox.com>
-Description: JSLint for Proxmox Virtual Environment development
- This package contains a version of jslint used to develop the 
- Proxmox Virtual Environment GUI.
diff --git a/copyright b/copyright
deleted file mode 100644 (file)
index 5ccd8dd..0000000
--- a/copyright
+++ /dev/null
@@ -1,29 +0,0 @@
-This package was debianized by the Proxmox Support Team
-<support@proxmox.com> on Mon, 30 Mar 2009 06:55:24 -0400.
-
-It was downloaded from <http://jslint.com/jslint.js>
-
-JSLint Copyright:
-
-Copyright (c) 2002 Douglas Crockford  (www.JSLint.com)
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-The Software shall be used for Good, not Evil.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
diff --git a/debian/changelog b/debian/changelog
new file mode 100644 (file)
index 0000000..add2e64
--- /dev/null
@@ -0,0 +1,32 @@
+pve-jslint (1.0-5) unstable; urgency=medium
+
+  * collect all errors and show them only after checking all files
+
+  * add 'Proxmox' to allowed global variable list
+
+ -- Proxmox Support Team <support@proxmox.com>  Tue, 22 May 2018 15:00:41 +0200
+
+pve-jslint (1.0-4) unstable; urgency=low
+
+  * correctly include jslint file
+
+ -- Proxmox Support Team <support@proxmox.com>  Fri, 10 Apr 2015 07:08:31 +0200
+
+pve-jslint (1.0-3) unstable; urgency=low
+
+  * add FromData to predefined NS
+
+ -- Proxmox Support Team <support@proxmox.com>  Wed, 09 Nov 2011 10:45:24 +0100
+
+pve-jslint (1.0-2) unstable; urgency=low
+
+  * download from http://jslint.com/jslint.js
+  
+ -- Proxmox Support Team <support@proxmox.com>  Fri, 08 Jul 2011 08:22:17 +0200
+
+pve-jslint (1.0-1) unstable; urgency=low
+
+  * first try
+
+ -- Proxmox Support Team <support@proxmox.com>  Thu, 07 Jul 2011 14:47:58 +0200
+
diff --git a/debian/compat b/debian/compat
new file mode 100644 (file)
index 0000000..f599e28
--- /dev/null
@@ -0,0 +1 @@
+10
diff --git a/debian/control b/debian/control
new file mode 100644 (file)
index 0000000..0c70b3e
--- /dev/null
@@ -0,0 +1,12 @@
+Source: pve-jslint
+Section: devel
+Priority: optional
+Maintainer: Proxmox Support Team <support@proxmox.com>
+Standards-Version: 3.9.8
+
+Package: pve-jslint
+Architecture: all
+Depends: rhino
+Description: JSLint for Proxmox Virtual Environment development
+ This package contains a version of jslint used to develop the Proxmox Virtual
+ Environment GUI.
diff --git a/debian/copyright b/debian/copyright
new file mode 100644 (file)
index 0000000..5ccd8dd
--- /dev/null
@@ -0,0 +1,29 @@
+This package was debianized by the Proxmox Support Team
+<support@proxmox.com> on Mon, 30 Mar 2009 06:55:24 -0400.
+
+It was downloaded from <http://jslint.com/jslint.js>
+
+JSLint Copyright:
+
+Copyright (c) 2002 Douglas Crockford  (www.JSLint.com)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+The Software shall be used for Good, not Evil.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
diff --git a/debian/docs b/debian/docs
new file mode 100644 (file)
index 0000000..8696672
--- /dev/null
@@ -0,0 +1 @@
+debian/SOURCE
diff --git a/debian/rules b/debian/rules
new file mode 100755 (executable)
index 0000000..f00dbc2
--- /dev/null
@@ -0,0 +1,7 @@
+#!/usr/bin/make -f
+# See debhelper(7) (uncomment to enable)
+# output every command that modifies files on the build system.
+#export DH_VERBOSE = 1
+
+%:
+       dh $@
diff --git a/debian/source/format b/debian/source/format
new file mode 100644 (file)
index 0000000..d3827e7
--- /dev/null
@@ -0,0 +1 @@
+1.0