[pkg-wpa-devel] r1445 - in /wireless-regdb/trunk/debian: control install manpages patches/disable_pubkeys.patch rules

[kelmo-guest at users.alioth.debian.org]

Author: kelmo-guest
Date: Sun Nov 22 06:09:48 2009
New Revision: 1445

URL: http://svn.debian.org/wsvn/pkg-wpa/?sc=1&rev=1445
Log:
update disable_pubkeys.patch and adapt debian build.

Added:
    wireless-regdb/trunk/debian/install
    wireless-regdb/trunk/debian/manpages
Modified:
    wireless-regdb/trunk/debian/control
    wireless-regdb/trunk/debian/patches/disable_pubkeys.patch
    wireless-regdb/trunk/debian/rules

Modified: wireless-regdb/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-wpa/wireless-regdb/trunk/debian/control?rev=1445&op=diff
==============================================================================
--- wireless-regdb/trunk/debian/control (original)
+++ wireless-regdb/trunk/debian/control Sun Nov 22 06:09:48 2009
@@ -6,7 +6,7 @@
 Build-Depends: debhelper (>= 7.0.50),
  quilt(>= 0.46-7),
  python
-Standards-Version: 3.8.1
+Standards-Version: 3.8.3
 Vcs-Svn: svn://svn.debian.org/pkg-wpa/wireless-regdb/trunk
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-wpa/wireless-regdb/trunk/
 Homepage: http://wireless.kernel.org/en/developers/Regulatory/#Theregulatorydatabase

Added: wireless-regdb/trunk/debian/install
URL: http://svn.debian.org/wsvn/pkg-wpa/wireless-regdb/trunk/debian/install?rev=1445&op=file
==============================================================================
--- wireless-regdb/trunk/debian/install (added)
+++ wireless-regdb/trunk/debian/install Sun Nov 22 06:09:48 2009
@@ -1,0 +1,1 @@
+regulatory.bin lib/crda

Added: wireless-regdb/trunk/debian/manpages
URL: http://svn.debian.org/wsvn/pkg-wpa/wireless-regdb/trunk/debian/manpages?rev=1445&op=file
==============================================================================
--- wireless-regdb/trunk/debian/manpages (added)
+++ wireless-regdb/trunk/debian/manpages Sun Nov 22 06:09:48 2009
@@ -1,0 +1,1 @@
+regulatory.bin.5

Modified: wireless-regdb/trunk/debian/patches/disable_pubkeys.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wireless-regdb/trunk/debian/patches/disable_pubkeys.patch?rev=1445&op=diff
==============================================================================
--- wireless-regdb/trunk/debian/patches/disable_pubkeys.patch (original)
+++ wireless-regdb/trunk/debian/patches/disable_pubkeys.patch Sun Nov 22 06:09:48 2009
@@ -9,46 +9,13 @@
 ---
 --- a/Makefile
 +++ b/Makefile
-@@ -9,6 +9,7 @@ SHA1SUM ?= /usr/bin/sha1sum
- LSB_RELEASE ?= /usr/bin/lsb_release
- WHOAMI ?= /usr/bin/whoami
+@@ -59,6 +59,9 @@ regulatory.bin: db.txt $(REGDB_PRIVKEY) 
+ 	@echo Generating $@ digitally signed by $(REGDB_AUTHOR)...
+ 	./db2bin.py regulatory.bin db.txt $(REGDB_PRIVKEY)
  
-+ifdef USE_PUBKEYS
- # Distro name: Ubuntu, Debian, Fedora, if not present you get
- # "custom-distro", if your distribution does not have the LSB stuff,
- # then set this variable when calling make if you don't want "custom-distro"
-@@ -77,6 +78,19 @@ endif
- 
- install-distro-key: maintainer-clean $(DISTRO_PRIVKEY)
- 
-+else
++regulatory.bin.unsigned: db.txt
++	./db2bin.py regulatory.bin db.txt
 +
-+.PHONY: all clean install
-+
-+all: regulatory.bin
-+
-+clean:
-+	@rm -f *.pyc *.gz regulatory.bin
-+
-+regulatory.bin: db.txt
-+	./db2bin.py regulatory.bin db.txt
-+endif
-+
- %.gz: %
- 	gzip < $< > $@
- 
-@@ -98,12 +112,14 @@ install-distro-key: maintainer-clean $(D
- #	sudo make install
- install: regulatory.bin.5.gz
- 	install -m 755 -d $(DESTDIR)/$(CRDA_PATH)
-+ifdef USE_PUBKEYS
- 	install -m 755 -d $(DESTDIR)/$(CRDA_KEY_PATH)
- 	if [ -f .custom ]; then \
- 		install -m 644 -t $(DESTDIR)/$(CRDA_KEY_PATH)/ $(shell cat .custom); \
- 	fi
- 	@# In linville we trust
- 	install -m 644 -t $(DESTDIR)/$(CRDA_KEY_PATH)/ $(REGDB_UPSTREAM_PUBKEY)
-+endif
- 	install -m 644 -t $(DESTDIR)/$(CRDA_PATH)/ regulatory.bin
- 	install -m 755 -d $(DESTDIR)/$(MANDIR)/man5/
- 	install -m 644 -t $(DESTDIR)/$(MANDIR)/man5/ regulatory.bin.5.gz
+ $(REGDB_PUBKEY): $(REGDB_PRIVKEY)
+ 	@echo "Generating public key for $(REGDB_AUTHOR)..."
+ 	openssl rsa -in $(REGDB_PRIVKEY) -out $(REGDB_PUBKEY) -pubout -outform PEM

Modified: wireless-regdb/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-wpa/wireless-regdb/trunk/debian/rules?rev=1445&op=diff
==============================================================================
--- wireless-regdb/trunk/debian/rules (original)
+++ wireless-regdb/trunk/debian/rules Sun Nov 22 06:09:48 2009
@@ -1,14 +1,13 @@
 #!/usr/bin/make -f
-
 %:
-	dh --with quilt $@
+	+dh --with quilt $@
 
 override_dh_auto_build:
-	$(RM) regulatory.bin
-	$(MAKE) regulatory.bin LSB_ID=Debian
+	$(MAKE) regulatory.bin.unsigned LSB_ID=Debian
 
 override_dh_auto_install:
-	$(MAKE) install LSB_ID=Debian CRDA_PATH=/lib/crda DESTDIR=debian/wireless-regdb
+	$(info Skip dh_auto_install ...)
 
 override_dh_auto_clean:
 	$(MAKE) clean LSB_ID=Debian
+	$(RM) regulatory.bin