From 94fc7a992c7f3e163b491ce8b248f3c1b4ca2702 Mon Sep 17 00:00:00 2001
From: Julian Blake Kongslie <jblake@omgwallhack.org>
Date: Sun, 7 Nov 2010 00:01:16 -0700
Subject: Stop using equivs for the metapackage.

---
 builddebs                 |  6 ++----
 piny.equiv                | 14 --------------
 piny/Makefile             |  5 +++++
 piny/debian/changelog     |  5 +++++
 piny/debian/compat        |  1 +
 piny/debian/control       | 15 +++++++++++++++
 piny/debian/copyright     |  2 ++
 piny/debian/rules         |  4 ++++
 piny/debian/source/format |  1 +
 9 files changed, 35 insertions(+), 18 deletions(-)
 delete mode 100644 piny.equiv
 create mode 100644 piny/Makefile
 create mode 100644 piny/debian/changelog
 create mode 100644 piny/debian/compat
 create mode 100644 piny/debian/control
 create mode 100644 piny/debian/copyright
 create mode 100755 piny/debian/rules
 create mode 100644 piny/debian/source/format

diff --git a/builddebs b/builddebs
index ff24fd1..14343e1 100755
--- a/builddebs
+++ b/builddebs
@@ -11,15 +11,13 @@ if ls *.changes > /dev/null 2> /dev/null; then
   if [ "$PRECLEAN" == "y" ]; then git clean; else exit 1; fi
 fi
 
-for SOURCE in libpiny pinyadmin; do (cd "$SOURCE"; debuild -tc "$@"); done
-
-equivs-build -f piny.equiv
+for SOURCE in libpiny piny pinyadmin; do (cd "$SOURCE"; debuild -tc "$@"); done
 
 echo
 echo -n "Install packages on this machine? (y/N) "
 read -n 1 INSTALL
 echo
-if [ "$INSTALL" == "y" ]; then sudo debi *.changes; fi
+if [ "$INSTALL" == "y" ]; then for CHANGES in *.changes; do sudo debi "$CHANGES"; done; fi
 
 echo
 echo -n "Upload packages to debian? (y/N) "
diff --git a/piny.equiv b/piny.equiv
deleted file mode 100644
index f8eaef4..0000000
--- a/piny.equiv
+++ /dev/null
@@ -1,14 +0,0 @@
-Section: misc
-Priority: optional
-Maintainer: Julian Blake Kongslie <jblake@omgwallhack.org>
-Homepage: http://www.piny.be/piny-code/
-Standards-Version: 3.6.2
-
-Package: piny
-Version: 0.2
-Depends: pinyadmin
-Recommends: apache2, cgit, dvipng, gcc, git-daemon-run, graphviz, ikiwiki, libapache2-mod-auth-pam, libapache2-mod-auth-sys-group, libc6-dev, libcgi-formbuilder-perl, perlmagick, texlive-science
-Description: Metapackage to bring in the piny infrastructure
- This is a virtual package which depends on the essential parts of the piny
- infrastructure, and recommends all the other packages used in a complete piny
- setup.
diff --git a/piny/Makefile b/piny/Makefile
new file mode 100644
index 0000000..c1260ee
--- /dev/null
+++ b/piny/Makefile
@@ -0,0 +1,5 @@
+build:
+
+install:
+
+clean:
diff --git a/piny/debian/changelog b/piny/debian/changelog
new file mode 100644
index 0000000..a2f8a36
--- /dev/null
+++ b/piny/debian/changelog
@@ -0,0 +1,5 @@
+piny (0.3) unstable; urgency=low
+
+  * Initial release of non-equivs version.
+
+ -- Julian Blake Kongslie <jblake@omgwallhack.org>  Sat, 06 Nov 2010 23:59:58 -0700
diff --git a/piny/debian/compat b/piny/debian/compat
new file mode 100644
index 0000000..7f8f011
--- /dev/null
+++ b/piny/debian/compat
@@ -0,0 +1 @@
+7
diff --git a/piny/debian/control b/piny/debian/control
new file mode 100644
index 0000000..90ae99f
--- /dev/null
+++ b/piny/debian/control
@@ -0,0 +1,15 @@
+Source: piny
+Maintainer: Julian Blake Kongslie <jblake@omgwallhack.org>
+Section: admin
+Priority: extra
+Homepage: http://www.piny.be/piny-code/
+Standards-Version: 3.8.4
+
+Package: piny
+Architecture: all
+Depends: pinyadmin
+Recommends: apache2, cgit, dvipng, gcc, git-daemon-run, graphviz, ikiwiki, libapache2-mod-auth-pam, libapache2-mod-auth-sys-group, libc6-dev, libcgi-formbuilder-perl, perlmagick, texlive-science
+Description: Metapackage to bring in the piny infrastructure
+ This is a virtual package which depends on the essential parts of the piny
+ infrastructure, and recommends all the other packages used in a complete piny
+ setup.
diff --git a/piny/debian/copyright b/piny/debian/copyright
new file mode 100644
index 0000000..e4642fb
--- /dev/null
+++ b/piny/debian/copyright
@@ -0,0 +1,2 @@
+Copyright © 2010 Julian Blake Kongslie <jblake@omgwallhack.org>
+Licensed under the MIT license.
diff --git a/piny/debian/rules b/piny/debian/rules
new file mode 100755
index 0000000..2d33f6a
--- /dev/null
+++ b/piny/debian/rules
@@ -0,0 +1,4 @@
+#!/usr/bin/make -f
+
+%:
+	dh $@
diff --git a/piny/debian/source/format b/piny/debian/source/format
new file mode 100644
index 0000000..89ae9db
--- /dev/null
+++ b/piny/debian/source/format
@@ -0,0 +1 @@
+3.0 (native)
-- 
cgit v1.2.3