Signed-off-by: Dave Reisner --- Since we're moving to cleanup the root dir, this seemed like low hanging fruit. Yes Dan, I ran distcheck and it passed. ChangeLog.proto | 16 ---------- Makefile.am | 6 +++- PKGBUILD-split.proto | 70 -------------------------------------------- PKGBUILD.proto | 47 ----------------------------- proto.install | 37 ----------------------- proto/ChangeLog.proto | 16 ++++++++++ proto/PKGBUILD-split.proto | 70 ++++++++++++++++++++++++++++++++++++++++++++ proto/PKGBUILD.proto | 47 +++++++++++++++++++++++++++++ proto/proto.install | 37 +++++++++++++++++++++++ 9 files changed, 175 insertions(+), 171 deletions(-) delete mode 100644 ChangeLog.proto delete mode 100644 PKGBUILD-split.proto delete mode 100644 PKGBUILD.proto delete mode 100644 proto.install create mode 100644 proto/ChangeLog.proto create mode 100644 proto/PKGBUILD-split.proto create mode 100644 proto/PKGBUILD.proto create mode 100644 proto/proto.install diff --git a/ChangeLog.proto b/ChangeLog.proto deleted file mode 100644 index 87e86e7..0000000 --- a/ChangeLog.proto +++ /dev/null @@ -1,16 +0,0 @@ -2007-12-01 Your Name - - * pkgver-pkgrel : - new upstream release. - Reason we changed stuff. - Another reason we changed stuff. - - * gcc-4.1.patch : - Removed, no longer needed. - -2007-11-01 Your Name - - * 1.0-5 : - added ChangeLog. - the last line should end with just one newline. - you can cat the file to check it displays fine. diff --git a/Makefile.am b/Makefile.am index dddb751..286e6ae 100644 --- a/Makefile.am +++ b/Makefile.am @@ -14,7 +14,11 @@ EXTRA_DIST = HACKING # Sample makepkg prototype files pkgdatadir = ${datadir}/${PACKAGE} -dist_pkgdata_DATA = PKGBUILD.proto PKGBUILD-split.proto proto.install ChangeLog.proto +dist_pkgdata_DATA = \ + proto/PKGBUILD.proto \ + proto/PKGBUILD-split.proto \ + proto/proto.install \ + proto/ChangeLog.proto # run the pactest test suite and vercmp tests check-local: test/pacman test/util src/pacman src/util diff --git a/PKGBUILD-split.proto b/PKGBUILD-split.proto deleted file mode 100644 index 52aacc5..0000000 --- a/PKGBUILD-split.proto +++ /dev/null @@ -1,70 +0,0 @@ -# This is an example of a PKGBUILD for splitting packages. Use this as a -# start to creating your own, and remove these comments. For more information, -# see 'man PKGBUILD'. NOTE: Please fill out the license field for your package! -# If it is unknown, then please put 'unknown'. - -# Maintainer: Your Name -pkgname=('pkg1' 'pkg2') -pkgbase=BASE -pkgver=VERSION -pkgrel=1 -epoch= -pkgdesc="" -arch=() -url="" -license=('GPL') -groups=() -depends=() -makedepends=() -checkdepends=() -provides=() -conflicts=() -replaces=() -backup=() -options=() -install= -changelog= -source=($pkgbase-$pkgver.tar.gz) -noextract=() -md5sums=() #generate with 'makepkg -g' - -build() { - cd "$srcdir/$pkgbase-$pkgver" - ./configure --prefix=/usr - make -} - -check() { - cd "$srcdir/$pkgname-$pkgver" - make -k check -} - -package_pkg1() { - # options and directives that can be overridden - pkgver= - pkgrel= - pkgdesc="" - arch=() - license=() - groups=() - depends=() - optdepends=() - provides=() - conflicts=() - replaces=() - backup=() - options=() - install= - changelog= - - cd "$srcdir/$pkgbase-$pkgver" - make DESTDIR="$pkgdir/" install-pkg1 -} - -package_pkg2() { - # options and directives overrides - pkgdesc="" - - cd "$srcdir/$pkgbase-$pkgver" - make DESTDIR="$pkgdir/" install-pkg2 -} diff --git a/PKGBUILD.proto b/PKGBUILD.proto deleted file mode 100644 index 98172d8..0000000 --- a/PKGBUILD.proto +++ /dev/null @@ -1,47 +0,0 @@ -# This is an example PKGBUILD file. Use this as a start to creating your own, -# and remove these comments. For more information, see 'man PKGBUILD'. -# NOTE: Please fill out the license field for your package! If it is unknown, -# then please put 'unknown'. - -# Maintainer: Your Name -pkgname=NAME -pkgver=VERSION -pkgrel=1 -epoch= -pkgdesc="" -arch=() -url="" -license=('GPL') -groups=() -depends=() -makedepends=() -checkdepends=() -optdepends=() -provides=() -conflicts=() -replaces=() -backup=() -options=() -install= -changelog= -source=($pkgname-$pkgver.tar.gz) -noextract=() -md5sums=() #generate with 'makepkg -g' - -build() { - cd "$srcdir/$pkgname-$pkgver" - ./configure --prefix=/usr - make -} - -check() { - cd "$srcdir/$pkgname-$pkgver" - make -k check -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir/" install -} - -# vim:set ts=2 sw=2 et: diff --git a/proto.install b/proto.install deleted file mode 100644 index 2a8993d..0000000 --- a/proto.install +++ /dev/null @@ -1,37 +0,0 @@ -# This is a default template for a post-install scriptlet. -# Uncomment only required functions and remove any functions -# you don't need (and this header). - -## arg 1: the new package version -#pre_install() { - # do something here -#} - -## arg 1: the new package version -#post_install() { - # do something here -#} - -## arg 1: the new package version -## arg 2: the old package version -#pre_upgrade() { - # do something here -#} - -## arg 1: the new package version -## arg 2: the old package version -#post_upgrade() { - # do something here -#} - -## arg 1: the old package version -#pre_remove() { - # do something here -#} - -## arg 1: the old package version -#post_remove() { - # do something here -#} - -# vim:set ts=2 sw=2 et: diff --git a/proto/ChangeLog.proto b/proto/ChangeLog.proto new file mode 100644 index 0000000..87e86e7 --- /dev/null +++ b/proto/ChangeLog.proto @@ -0,0 +1,16 @@ +2007-12-01 Your Name + + * pkgver-pkgrel : + new upstream release. + Reason we changed stuff. + Another reason we changed stuff. + + * gcc-4.1.patch : + Removed, no longer needed. + +2007-11-01 Your Name + + * 1.0-5 : + added ChangeLog. + the last line should end with just one newline. + you can cat the file to check it displays fine. diff --git a/proto/PKGBUILD-split.proto b/proto/PKGBUILD-split.proto new file mode 100644 index 0000000..52aacc5 --- /dev/null +++ b/proto/PKGBUILD-split.proto @@ -0,0 +1,70 @@ +# This is an example of a PKGBUILD for splitting packages. Use this as a +# start to creating your own, and remove these comments. For more information, +# see 'man PKGBUILD'. NOTE: Please fill out the license field for your package! +# If it is unknown, then please put 'unknown'. + +# Maintainer: Your Name +pkgname=('pkg1' 'pkg2') +pkgbase=BASE +pkgver=VERSION +pkgrel=1 +epoch= +pkgdesc="" +arch=() +url="" +license=('GPL') +groups=() +depends=() +makedepends=() +checkdepends=() +provides=() +conflicts=() +replaces=() +backup=() +options=() +install= +changelog= +source=($pkgbase-$pkgver.tar.gz) +noextract=() +md5sums=() #generate with 'makepkg -g' + +build() { + cd "$srcdir/$pkgbase-$pkgver" + ./configure --prefix=/usr + make +} + +check() { + cd "$srcdir/$pkgname-$pkgver" + make -k check +} + +package_pkg1() { + # options and directives that can be overridden + pkgver= + pkgrel= + pkgdesc="" + arch=() + license=() + groups=() + depends=() + optdepends=() + provides=() + conflicts=() + replaces=() + backup=() + options=() + install= + changelog= + + cd "$srcdir/$pkgbase-$pkgver" + make DESTDIR="$pkgdir/" install-pkg1 +} + +package_pkg2() { + # options and directives overrides + pkgdesc="" + + cd "$srcdir/$pkgbase-$pkgver" + make DESTDIR="$pkgdir/" install-pkg2 +} diff --git a/proto/PKGBUILD.proto b/proto/PKGBUILD.proto new file mode 100644 index 0000000..98172d8 --- /dev/null +++ b/proto/PKGBUILD.proto @@ -0,0 +1,47 @@ +# This is an example PKGBUILD file. Use this as a start to creating your own, +# and remove these comments. For more information, see 'man PKGBUILD'. +# NOTE: Please fill out the license field for your package! If it is unknown, +# then please put 'unknown'. + +# Maintainer: Your Name +pkgname=NAME +pkgver=VERSION +pkgrel=1 +epoch= +pkgdesc="" +arch=() +url="" +license=('GPL') +groups=() +depends=() +makedepends=() +checkdepends=() +optdepends=() +provides=() +conflicts=() +replaces=() +backup=() +options=() +install= +changelog= +source=($pkgname-$pkgver.tar.gz) +noextract=() +md5sums=() #generate with 'makepkg -g' + +build() { + cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=/usr + make +} + +check() { + cd "$srcdir/$pkgname-$pkgver" + make -k check +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir/" install +} + +# vim:set ts=2 sw=2 et: diff --git a/proto/proto.install b/proto/proto.install new file mode 100644 index 0000000..2a8993d --- /dev/null +++ b/proto/proto.install @@ -0,0 +1,37 @@ +# This is a default template for a post-install scriptlet. +# Uncomment only required functions and remove any functions +# you don't need (and this header). + +## arg 1: the new package version +#pre_install() { + # do something here +#} + +## arg 1: the new package version +#post_install() { + # do something here +#} + +## arg 1: the new package version +## arg 2: the old package version +#pre_upgrade() { + # do something here +#} + +## arg 1: the new package version +## arg 2: the old package version +#post_upgrade() { + # do something here +#} + +## arg 1: the old package version +#pre_remove() { + # do something here +#} + +## arg 1: the old package version +#post_remove() { + # do something here +#} + +# vim:set ts=2 sw=2 et: -- 1.7.6